diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java
index 41f879f2aa4..697646aa0ae 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/aaa/AAAServiceImpl.java
@@ -91,7 +91,7 @@ private enum Action {
                             module.argMap.get("user-name")
                         ).mput(
                             Authn.InvokeKeys.CREDENTIALS,
-                            getPassword((String)module.argMap.get("password"))
+                            getPassword((String) module.argMap.get("password"))
                         )
                     );
                     log.info(
@@ -113,13 +113,13 @@ private enum Action {
         ),
         CHANGE_CREDENTIALS(
                 module -> {
-                    AAAProfile aaaprofile = module.new AAAProfile((String)module.argMap.get("profile"));
+                    AAAProfile aaaprofile = module.new AAAProfile((String) module.argMap.get("profile"));
                     if ((aaaprofile.getAuthnExtension().getContext().<Long>get(Authn.ContextKeys.CAPABILITIES, 0L) & Authn.Capabilities.CREDENTIALS_CHANGE) == 0 &&
-                            !(Boolean)module.argMap.get("ignore-capabilities")) {
+                            !(Boolean) module.argMap.get("ignore-capabilities")) {
                         throw new IllegalArgumentException("Unsupported operation: CREDENTIALS_CHANGE");
                     }
 
-                    String user = aaaprofile.mapUser((String)module.argMap.get("user-name"));
+                    String user = aaaprofile.mapUser((String) module.argMap.get("user-name"));
                     log.info("API: -->Authn.InvokeCommands.CREDENTIALS_CHANGES profile='{}' user='{}'", aaaprofile.getProfile(), user);
                     ExtMap outMap = aaaprofile.getAuthnExtension().invoke(
                             new ExtMap().mput(
@@ -130,10 +130,10 @@ private enum Action {
                                     user
                             ).mput(
                                     Authn.InvokeKeys.CREDENTIALS,
-                                    getPassword((String)module.argMap.get("password"))
+                                    getPassword((String) module.argMap.get("password"))
                             ).mput(
                                     Authn.InvokeKeys.CREDENTIALS_NEW,
-                                    getPassword((String)module.argMap.get("password-new"), "New password: ")
+                                    getPassword((String) module.argMap.get("password-new"), "New password: ")
                             )
                     );
                     log.info(
@@ -151,8 +151,8 @@ private enum Action {
         ),
         LOGIN_USER(
                 module -> {
-                    AAAProfile aaaprofile = module.new AAAProfile((String)module.argMap.get("profile"));
-                    String user = aaaprofile.mapUser((String)module.argMap.get("user-name"));
+                    AAAProfile aaaprofile = module.new AAAProfile((String) module.argMap.get("profile"));
+                    String user = aaaprofile.mapUser((String) module.argMap.get("user-name"));
                     log.info("API: -->Authn.InvokeCommands.AUTHENTICATE_CREDENTIALS profile='{}' user='{}'", aaaprofile.getProfile(), user);
                     ExtMap outMap = aaaprofile.getAuthnExtension().invoke(
                         new ExtMap().mput(
@@ -163,7 +163,7 @@ private enum Action {
                             user
                         ).mput(
                             Authn.InvokeKeys.CREDENTIALS,
-                            getPassword((String)module.argMap.get("password"))
+                            getPassword((String) module.argMap.get("password"))
                         )
                     );
                     log.info(
@@ -192,7 +192,7 @@ private enum Action {
                         );
                     }
 
-                    if(aaaprofile.getMappingExtension() != null) {
+                    if (aaaprofile.getMappingExtension() != null) {
                         log.info("API: -->Mapping.InvokeCommands.MAP_AUTH_RECORD");
                         Dump.AUTH_RECORD.dump(module, authRecord);
                         authRecord = aaaprofile.getMappingExtension().invoke(
@@ -302,7 +302,7 @@ private enum Action {
         SEARCH(
                 module -> {
                     ExtensionProxy authzExtension = module.getExtensionsManager().getExtensionByName((String) module.argMap.get("extension-name"));
-                    ExtUUID entity = getQueryEntity((String)module.argMap.get("entity"));
+                    ExtUUID entity = getQueryEntity((String) module.argMap.get("entity"));
                     ExtMap filter = createQueryFilter(entity, module.argMap);
                     Dump.QUERY_FILTER_RECORD.dump(module, filter, "");
 
@@ -311,7 +311,7 @@ private enum Action {
                         Collections.<String>emptyList()
                     );
                     if (module.argMap.get("namespace") != null) {
-                        namespaces = (Collection<String>)module.argMap.get("namespace");
+                        namespaces = (Collection<String>) module.argMap.get("namespace");
                     }
 
                     for (String namespace : namespaces) {
@@ -325,7 +325,7 @@ private enum Action {
                                 entity
                             ).mput(
                                 Authz.InvokeKeys.QUERY_FLAGS,
-                                getAuthzFlags((List<String>)module.argMap.get("authz-flag"))
+                                getAuthzFlags((List<String>) module.argMap.get("authz-flag"))
                             ).mput(
                                 Authz.InvokeKeys.QUERY_FILTER,
                                 filter
@@ -395,12 +395,12 @@ Map<String, Object> parse(Map<String, String> substitutions, Properties props, L
             parser.parse(actionArgs);
             Map<String, Object> argMap = parser.getParsedArgs();
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     log.error(t.getMessage());
                 }
                 throw new ExitException("Parsing error", 1);
@@ -492,7 +492,7 @@ private static void dumpRecord(AAAServiceImpl module, ExtMap extMap, Set<ExtKey>
                 Collection<ExtKey> keys = new HashSet<>(extMap.keySet());
                 if (module.argModuleMap.get("key") != null) {
                     Collection<ExtKey> k = new HashSet<>();
-                    for (String uuid : (List<String>)module.argModuleMap.get("key")) {
+                    for (String uuid : (List<String>) module.argModuleMap.get("key")) {
                         k.add(new ExtKey("Unknown", Object.class, uuid));
                     }
                     keys.retainAll(k);
@@ -505,7 +505,7 @@ private static void dumpRecord(AAAServiceImpl module, ExtMap extMap, Set<ExtKey>
                         continue;
                     }
                     module.output(
-                        ((String)module.argModuleMap.get("format")).replace(
+                        ((String) module.argModuleMap.get("format")).replace(
                             "{key}",
                             key.getUuid().getUuid().toString()
                         ).replace(
@@ -540,7 +540,7 @@ private static <T> List<T> safeList(List<T> list) {
     }
 
     private ExtensionsManager getExtensionsManager() {
-        return (ExtensionsManager)context.get(ContextKeys.EXTENSION_MANAGER);
+        return (ExtensionsManager) context.get(ContextKeys.EXTENSION_MANAGER);
     }
 
     private ExtensionProxy getExtensionByProfile(String name) {
@@ -554,7 +554,7 @@ private ExtensionProxy getExtensionByProfile(String name) {
     private ExtensionProxy getExtensionByConfigKey(String key, String value) {
         ExtensionProxy ret = null;
 
-        for(ExtensionProxy proxy : getExtensionsManager().getExtensionsByService(Authn.class.getName())) {
+        for (ExtensionProxy proxy : getExtensionsManager().getExtensionsByService(Authn.class.getName())) {
             if (
                 value.equals(
                     proxy.getContext().<Properties>get(
@@ -591,7 +591,7 @@ private static String getPassword(String what, String prompt) {
         if ("pass".equals(type)) {
             password = value;
         } else if ("file".equals(type)) {
-            try(
+            try (
                 InputStream is = new FileInputStream(value);
                 Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8);
                 BufferedReader breader = new BufferedReader(reader)
@@ -652,12 +652,12 @@ public void parseArguments(List<String> args) throws Exception {
         parser.parse(args);
         argModuleMap = parser.getParsedArgs();
 
-        if((Boolean)argModuleMap.get("help")) {
+        if ((Boolean) argModuleMap.get("help")) {
             System.out.format("Usage: %s", parser.getUsage());
             throw new ExitException("Help", 0);
         }
-        if(!parser.getErrors().isEmpty()) {
-            for(Throwable t : parser.getErrors()) {
+        if (!parser.getErrors().isEmpty()) {
+            for (Throwable t : parser.getErrors()) {
                 log.error(t.getMessage());
             }
             throw new ExitException("Parsing error", 1);
@@ -670,7 +670,7 @@ public void parseArguments(List<String> args) throws Exception {
 
         try {
             action = Action.valueOf(args.get(0).toUpperCase().replace("-", "_"));
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             log.error("Invalid action '{}'", args.get(0));
             throw new ExitException("Invalid action", 1);
         }
@@ -680,7 +680,7 @@ public void parseArguments(List<String> args) throws Exception {
 
     @Override
     public void run() throws Exception {
-        int iterations = (Integer)argModuleMap.get("iterations");
+        int iterations = (Integer) argModuleMap.get("iterations");
         for (int i = 0; i < iterations; i++) {
             log.info("Iteration: {}", i);
             action.execute(this);
@@ -699,7 +699,7 @@ private static ExtMap createQueryFilter(ExtUUID entity, Map<String, Object> argM
             );
         }
 
-        for (String id : safeList((List<String>)argMap.get("entity-id"))) {
+        for (String id : safeList((List<String>) argMap.get("entity-id"))) {
             filter.add(
                 createQueryFilterElement(
                     Authz.QueryEntity.GROUP.equals(entity) ? Authz.GroupRecord.ID : Authz.PrincipalRecord.ID,
@@ -733,7 +733,7 @@ private static ExtMap createQueryFilterElement(ExtKey key, String value) {
         );
     }
 
-    private static ExtUUID getQueryEntity(String entity)  {
+    private static ExtUUID getQueryEntity(String entity) {
         try {
             return (ExtUUID) Authz.QueryEntity.class.getDeclaredField(
                 entity.toUpperCase()
@@ -748,7 +748,7 @@ private static int getAuthzFlags(List<String> flags) {
         for (String f : safeList(flags)) {
             try {
                 ret |= Authz.QueryFlags.class.getDeclaredField(f.toUpperCase().replace("-", "_")).getInt(new Authz.QueryFlags());
-            } catch(NoSuchFieldException | IllegalAccessException ex) {
+            } catch (NoSuchFieldException | IllegalAccessException ex) {
                 log.error("Unknown Authz flag '{}' (ignored)", f);
             }
         }
@@ -842,7 +842,7 @@ public AAAProfile(String profile) {
             this.authnName = this.authnExtension.getContext().get(Base.ContextKeys.INSTANCE_NAME);
 
             this.authzExtension = getExtensionsManager().getExtensionByName(authzName);
-            if(this.mappingName != null) {
+            if (this.mappingName != null) {
                 this.mappingExtension = getExtensionsManager().getExtensionByName(mappingName);
             }
 
@@ -856,7 +856,7 @@ public AAAProfile(String profile) {
         }
 
         public String mapUser(String user) {
-            if(getMappingExtension()!= null) {
+            if (getMappingExtension() != null) {
                 log.info("API: -->Mapping.InvokeCommands.MAP_USER profile='{}' user='{}'", getProfile(), user);
                 user = getMappingExtension().invoke(
                         new ExtMap().mput(
diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java
index 63cada5f859..0f5f32c181f 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ExtensionsToolExecutor.java
@@ -78,15 +78,15 @@ public static void main(String... args) {
 
             log.debug("Version: {}-{} ({})", PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_DISPLAY_NAME);
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
-            } else if((Boolean)argMap.get("version")) {
+            } else if ((Boolean) argMap.get("version")) {
                 System.out.format("%s-%s (%s)%n", PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_DISPLAY_NAME);
                 throw new ExitException("Version", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     log.error(t.getMessage());
                     log.debug(t.getMessage(), t);
                 }
@@ -120,7 +120,7 @@ public static void main(String... args) {
             log.info("========================================================================");
             moduleService.run();
             exitStatus = 0;
-        } catch(ExitException e) {
+        } catch (ExitException e) {
             log.debug(e.getMessage(), e);
             exitStatus = e.getExitCode();
         } catch (Throwable t) {
@@ -168,7 +168,7 @@ private static Path createTemporaryJAASconfiguration() throws IOException {
                 principalName = String.format("principal=\"%s\"", AAA_JAAS_PRINCIPAL_NAME);
             }
 
-            String debug= "";
+            String debug = "";
             if (StringUtils.isNotEmpty(AAA_JAAS_ENABLE_DEBUG)) {
                 debug = String.format("debug=\"%s\"", AAA_JAAS_ENABLE_DEBUG);
             }
@@ -207,8 +207,8 @@ private static void loadExtensions(
         ModuleService moduleService,
         Map<String, Object> argMap
     ) {
-        List<File> files = (List<File>)argMap.get("extension-file");
-        if(files == null) {
+        List<File> files = (List<File>) argMap.get("extension-file");
+        if (files == null) {
             files = listFiles(
                 (String) argMap.get("extensions-dir"),
                 "properties"
@@ -216,7 +216,7 @@ private static void loadExtensions(
         }
 
         List<String> loadedExtensions = new LinkedList<>();
-        for(File f : files) {
+        for (File f : files) {
             log.debug("Loading extension file '{}'", f.getName());
             try {
                 String name = extensionsManager.load(f);
@@ -231,7 +231,7 @@ private static void loadExtensions(
             }
         }
 
-        for(String extension : loadedExtensions) {
+        for (String extension : loadedExtensions) {
             try {
                 extensionsManager.initialize(extension);
                 log.debug("Extension '{}' initialized", extension);
@@ -245,7 +245,7 @@ private static void loadExtensions(
 
     private static Map<String, ModuleService> loadModules(Class cls) {
         Map<String, ModuleService> modules = new HashMap<>();
-        if(cls != null) {
+        if (cls != null) {
             ServiceLoader<ModuleService> loader = ServiceLoader.load(cls);
             for (ModuleService module : loader) {
                 modules.put(module.getName(), module);
@@ -266,14 +266,14 @@ private static void setupLogger() {
 
     private static void setupLogger(Map<String, Object> args) throws IOException {
         Logger log = Logger.getLogger("");
-        String logfile = (String)args.get("log-file");
-        if(logfile != null) {
+        String logfile = (String) args.get("log-file");
+        if (logfile != null) {
             FileHandler fh = new FileHandler(logfile, true);
             fh.setFormatter(new SimpleFormatter());
             log.addHandler(fh);
         }
 
-        OVIRT_LOGGER.setLevel((Level)args.get("log-level"));
+        OVIRT_LOGGER.setLevel((Level) args.get("log-level"));
     }
 
     private static List<File> listFiles(String directory, String suffix) {
@@ -293,7 +293,7 @@ private static List<File> listFiles(String directory, String suffix) {
 
     private static String getModules(Map<String, ModuleService> modules) {
         StringBuilder sb = new StringBuilder();
-        for(Map.Entry<String, ModuleService> entry : new TreeMap<>(modules).entrySet()) {
+        for (Map.Entry<String, ModuleService> entry : new TreeMap<>(modules).entrySet()) {
             sb.append(
                 String.format("  %-10s - %s%n", entry.getKey(), entry.getValue().getDescription())
             );
diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/HelpServiceImpl.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/HelpServiceImpl.java
index 490a222ed4f..f4e972c8b62 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/HelpServiceImpl.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/HelpServiceImpl.java
@@ -33,7 +33,7 @@ public ExtMap getContext() {
     @Override
     public void parseArguments(List<String> args) throws Exception {
         System.out.println("Available modules:");
-        for(Map.Entry<String, ModuleService> entry : new TreeMap<>(getContext().<Map<String, ModuleService>>get(ContextKeys.MODULES)).entrySet()) {
+        for (Map.Entry<String, ModuleService> entry : new TreeMap<>(getContext().<Map<String, ModuleService>>get(ContextKeys.MODULES)).entrySet()) {
             System.out.printf(
                 String.format("  %-10s - %s%n",
                 entry.getKey(),
diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/InfoServiceImpl.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/InfoServiceImpl.java
index 32163517795..de7e30b104e 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/InfoServiceImpl.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/InfoServiceImpl.java
@@ -39,19 +39,19 @@ private interface Logic {
     private enum Action {
         CONFIGURATION(
             module -> {
-                ExtensionProxy extension = module.getExtensionsManager().getExtensionByName((String)module.argMap.get("extension-name"));
+                ExtensionProxy extension = module.getExtensionsManager().getExtensionByName((String) module.argMap.get("extension-name"));
                 Collection<?> sensitive = extension.getContext().get(Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS);
 
 
                 Map<Object, Object> config = extension.getContext().<Properties>get(Base.ContextKeys.CONFIGURATION);
                 Collection<Object> keys = new HashSet<>(config.keySet());
                 if (module.argMap.get("key") != null) {
-                    keys.retainAll((List<String>)module.argMap.get("key"));
+                    keys.retainAll((List<String>) module.argMap.get("key"));
                 }
 
                 for (Object key : keys) {
                     module.output(
-                        ((String)module.argMap.get("format")).replace(
+                        ((String) module.argMap.get("format")).replace(
                             "{key}",
                             String.format("%s", key)
                         ).replace(
@@ -65,11 +65,11 @@ private enum Action {
         ),
         CONTEXT(
             module -> {
-                ExtensionProxy extension = module.getExtensionsManager().getExtensionByName((String)module.argMap.get("extension-name"));
+                ExtensionProxy extension = module.getExtensionsManager().getExtensionByName((String) module.argMap.get("extension-name"));
                 Collection<ExtKey> keys = new HashSet<>(extension.getContext().keySet());
                 if (module.argMap.get("key") != null) {
                     Collection<ExtKey> k = new HashSet<>();
-                    for (String uuid : (List<String>)module.argMap.get("key")) {
+                    for (String uuid : (List<String>) module.argMap.get("key")) {
                         k.add(new ExtKey("Unknown", Object.class, uuid));
                     }
                     keys.retainAll(k);
@@ -83,7 +83,7 @@ private enum Action {
                     }
 
                     module.output(
-                        ((String)module.argMap.get("format")).replace(
+                        ((String) module.argMap.get("format")).replace(
                             "{key}",
                             key.getUuid().getUuid().toString()
                         ).replace(
@@ -103,7 +103,7 @@ private enum Action {
                 for (ExtensionProxy extension : module.getExtensionsManager().getExtensions()) {
                     ExtMap extContext = extension.getContext();
                     module.output(
-                        ((String)module.argMap.get("format")).replace(
+                        ((String) module.argMap.get("format")).replace(
                             "{instance}",
                             extContext.<String>get(Base.ContextKeys.INSTANCE_NAME, "")
                         ).replace(
@@ -137,12 +137,12 @@ Map<String, Object> parse(Map<String, String> substitutions, Properties props, L
             parser.parse(actionArgs);
             Map<String, Object> argMap = parser.getParsedArgs();
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     log.error(t.getMessage());
                 }
                 throw new ExitException("Parsing error", 1);
@@ -166,7 +166,7 @@ void execute(InfoServiceImpl module) {
     private Map<String, Object> argMap;
 
     private ExtensionsManager getExtensionsManager() {
-        return (ExtensionsManager)context.get(ContextKeys.EXTENSION_MANAGER);
+        return (ExtensionsManager) context.get(ContextKeys.EXTENSION_MANAGER);
     }
 
     private void output(String s, String logIndent) {
@@ -214,12 +214,12 @@ public void parseArguments(List<String> args) throws Exception {
         parser.parse(args);
         argModuleMap = parser.getParsedArgs();
 
-        if((Boolean)argModuleMap.get("help")) {
+        if ((Boolean) argModuleMap.get("help")) {
             System.out.format("Usage: %s", parser.getUsage());
             throw new ExitException("Help", 0);
         }
-        if(!parser.getErrors().isEmpty()) {
-            for(Throwable t : parser.getErrors()) {
+        if (!parser.getErrors().isEmpty()) {
+            for (Throwable t : parser.getErrors()) {
                 log.error(t.getMessage());
             }
             throw new ExitException("Parsing error", 1);
@@ -232,7 +232,7 @@ public void parseArguments(List<String> args) throws Exception {
 
         try {
             action = Action.valueOf(args.get(0).toUpperCase().replace("-", "_"));
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             log.error("Invalid action '{}'", args.get(0));
             throw new ExitException("Invalid action", 1);
         }
diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java
index 00465255e75..4b8e2f3163c 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/core/ModuleService.java
@@ -25,6 +25,6 @@ public static class ContextKeys {
 
     public void parseArguments(List<String> args) throws Exception;
 
-    public void run() throws  Exception;
+    public void run() throws Exception;
 
 }
diff --git a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/logger/LoggerServiceImpl.java b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/logger/LoggerServiceImpl.java
index 962e94e41e2..0e6ce043bc0 100644
--- a/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/logger/LoggerServiceImpl.java
+++ b/backend/manager/extensions-tool/src/main/java/org/ovirt/engine/exttool/logger/LoggerServiceImpl.java
@@ -84,12 +84,12 @@ Map<String, Object> parse(Map<String, String> substitutions, Properties props, L
             parser.parse(actionArgs);
             Map<String, Object> argMap = parser.getParsedArgs();
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     log.error(t.getMessage());
                 }
                 throw new ExitException("Parsing error", 1);
@@ -113,7 +113,7 @@ void execute(LoggerServiceImpl module) {
     private Map<String, Object> argMap;
 
     private ExtensionsManager getExtensionsManager() {
-        return (ExtensionsManager)context.get(ContextKeys.EXTENSION_MANAGER);
+        return (ExtensionsManager) context.get(ContextKeys.EXTENSION_MANAGER);
     }
 
     @Override
@@ -154,12 +154,12 @@ public void parseArguments(List<String> args) throws Exception {
         parser.parse(args);
         argModuleMap = parser.getParsedArgs();
 
-        if((Boolean)argModuleMap.get("help")) {
+        if ((Boolean) argModuleMap.get("help")) {
             System.out.format("Usage: %s", parser.getUsage());
             throw new ExitException("Help", 0);
         }
-        if(!parser.getErrors().isEmpty()) {
-            for(Throwable t : parser.getErrors()) {
+        if (!parser.getErrors().isEmpty()) {
+            for (Throwable t : parser.getErrors()) {
                 log.error(t.getMessage());
             }
             throw new ExitException("Parsing error", 1);
@@ -172,7 +172,7 @@ public void parseArguments(List<String> args) throws Exception {
 
         try {
             action = Action.valueOf(args.get(0).toUpperCase().replace("-", "_"));
-        } catch(IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             log.error("Invalid action '{}'", args.get(0));
             throw new ExitException("Invalid action", 1);
         }
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/EnforceAuthFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/EnforceAuthFilter.java
index 00ee523c1f5..c56292c0768 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/EnforceAuthFilter.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/EnforceAuthFilter.java
@@ -35,8 +35,8 @@ public void init(FilterConfig filterConfig) {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
             ServletException {
-        HttpServletRequest req = (HttpServletRequest)request;
-        HttpServletResponse res = (HttpServletResponse)response;
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse res = (HttpServletResponse) response;
 
         if (FiltersHelper.isAuthenticated(req)) {
             chain.doFilter(request, response);
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/FiltersHelper.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/FiltersHelper.java
index 18a905eaa24..ca4f86f94b8 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/FiltersHelper.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/FiltersHelper.java
@@ -41,8 +41,8 @@ public static class Constants {
         public static final String LOGOUT_INPROGRESS = "LOGOUT_INPROGRESS";
     }
 
-    public static final int PREFER_NEW_AUTH = 1<<0;
-    public static final int PREFER_PERSISTENCE_AUTH = 1<<1;
+    public static final int PREFER_NEW_AUTH = 1 << 0;
+    public static final int PREFER_PERSISTENCE_AUTH = 1 << 1;
 
     public static BackendLocal getBackend(Context context) {
 
@@ -137,7 +137,7 @@ public static Map<String, Object> getPayloadForToken(String token) {
     }
 
     public static long copy(final InputStream input, final OutputStream output) throws IOException {
-        final byte[] buffer = new byte[8*1024];
+        final byte[] buffer = new byte[8 * 1024];
         long count = 0;
         int n;
         while ((n = input.read(buffer)) != -1) {
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
index 02794f1b95d..a3488eec9b6 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/NegotiationFilter.java
@@ -91,7 +91,7 @@ private synchronized void cacheNegotiatingProfiles() {
     public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain chain)
             throws IOException, ServletException {
 
-        HttpServletRequest httpreq = (HttpServletRequest)req;
+        HttpServletRequest httpreq = (HttpServletRequest) req;
 
         if (FiltersHelper.isAuthenticated(httpreq) || httpreq.getAttribute(FiltersHelper.Constants.REQUEST_AUTH_RECORD_KEY) != null) {
             chain.doFilter(req, rsp);
@@ -100,7 +100,7 @@ public void doFilter(ServletRequest req, ServletResponse rsp, FilterChain chain)
             HttpSession session = httpreq.getSession(false);
             Deque<AuthenticationProfile> stack = null;
             if (session != null) {
-                stack = (Deque<AuthenticationProfile>)session.getAttribute(STACK_ATTR);
+                stack = (Deque<AuthenticationProfile>) session.getAttribute(STACK_ATTR);
             }
             if (stack == null) {
                 stack = new ArrayDeque<>();
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java
index f852ea89660..6be5831e9f0 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/filters/SessionValidationFilter.java
@@ -29,7 +29,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             ServletException {
         boolean doFilter = false;
         try {
-            String requestEngineSession = (String)request.getAttribute(SessionConstants.HTTP_SESSION_ENGINE_SESSION_ID_KEY);
+            String requestEngineSession = (String) request.getAttribute(SessionConstants.HTTP_SESSION_ENGINE_SESSION_ID_KEY);
             if (requestEngineSession != null) {
                 if (!FiltersHelper.isSessionValid(requestEngineSession)) {
                     request.removeAttribute(SessionConstants.HTTP_SESSION_ENGINE_SESSION_ID_KEY);
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoLogoutServlet.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoLogoutServlet.java
index 53deefcd973..dd1bdbcb5e2 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoLogoutServlet.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoLogoutServlet.java
@@ -65,7 +65,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
             session.setAttribute(FiltersHelper.Constants.LOGOUT_INPROGRESS, true);
         }
 
-        Map<String, Object> revokeResponse =  SsoOAuthServiceUtils.revoke(token);
+        Map<String, Object> revokeResponse = SsoOAuthServiceUtils.revoke(token);
         String error_description = (String) revokeResponse.get("error_description");
         String error = (String) revokeResponse.get("error");
         if (StringUtils.isNotEmpty(error_description)) {
diff --git a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java
index 57ed6d96b2b..707feb9d569 100644
--- a/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java
+++ b/backend/manager/modules/aaa/src/main/java/org/ovirt/engine/core/aaa/servlet/SsoPostLoginServlet.java
@@ -68,11 +68,11 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
         try {
             String error_description = request.getParameter("error_description");
             String error = request.getParameter("error");
-            if (StringUtils.isNotEmpty(error_description) && StringUtils.isNotEmpty(error)){
+            if (StringUtils.isNotEmpty(error_description) && StringUtils.isNotEmpty(error)) {
                 throw new RuntimeException(String.format("%s: %s", error, error_description));
             }
             String code = request.getParameter("code");
-            if (StringUtils.isEmpty(code)){
+            if (StringUtils.isEmpty(code)) {
                 throw new RuntimeException("No authorization code found in request");
             }
             //appUrl not encoded
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractRngDeviceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractRngDeviceCommand.java
index d1f98487148..6af8729f15f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractRngDeviceCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AbstractRngDeviceCommand.java
@@ -24,7 +24,7 @@
 /**
  * Base class for crud for random number generator devices
  */
-public abstract class AbstractRngDeviceCommand<T extends RngDeviceParameters> extends CommandBase<T>  {
+public abstract class AbstractRngDeviceCommand<T extends RngDeviceParameters> extends CommandBase<T> {
 
     @Inject
     private VmStaticDao vmStaticDao;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java
index c18caa999fd..c36a837f2a8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ActivateVdsCommand.java
@@ -78,7 +78,7 @@ protected void executeCommand() {
                 if (vds.getClusterSupportsGlusterService()) {
                     // Check gluster service running status
                     GlusterStatus isGlusterRunning = glusterUtil.isGlusterRunning(vds.getId());
-                    switch(isGlusterRunning) {
+                    switch (isGlusterRunning) {
                     case DOWN:
                         log.info("Gluster service on host '{}' is down, starting it",
                                 vds.getHostName());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java
index d6acd8ab6ad..3346808b58c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalEventCommand.java
@@ -66,7 +66,7 @@ protected void executeCommand() {
         String message =
                 StringUtils.abbreviate(getEvent().getMessage(), Config.getValue(ConfigValues.MaxAuditLogMessageLength));
 
-        switch (getEvent().getSeverity()){
+        switch (getEvent().getSeverity()) {
             case NORMAL:
                 auditLogDirector.log(event, AuditLogType.EXTERNAL_EVENT_NORMAL, message);
                 break;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalJobCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalJobCommand.java
index e6bf5b68f1b..f6cc2308966 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalJobCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalJobCommand.java
@@ -30,7 +30,7 @@ public AuditLogType getAuditLogTypeValue() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         permissionList.add(new PermissionSubject(MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID,
                 VdcObjectType.System,
                 ActionGroup.INJECT_EXTERNAL_TASKS));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalStepCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalStepCommand.java
index 94731d0196f..eb566254828 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalStepCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddExternalStepCommand.java
@@ -10,7 +10,7 @@
 import org.ovirt.engine.core.common.businessentities.ActionGroup;
 import org.ovirt.engine.core.common.errors.EngineMessage;
 
-public class AddExternalStepCommand <T extends AddExternalStepParameters> extends AddStepCommand<T>{
+public class AddExternalStepCommand <T extends AddExternalStepParameters> extends AddStepCommand<T> {
 
 
     public AddExternalStepCommand(T parameters, CommandContext cmdContext) {
@@ -19,7 +19,7 @@ public AddExternalStepCommand(T parameters, CommandContext cmdContext) {
 
     @Override
     protected boolean validate() {
-        boolean retValue=super.validate();
+        boolean retValue = super.validate();
 
         if (job != null) {
             if (!job.isExternal()) {
@@ -37,7 +37,7 @@ protected boolean validate() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         permissionList.add(new PermissionSubject(MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID,
                 VdcObjectType.System,
                 ActionGroup.INJECT_EXTERNAL_TASKS));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalJobCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalJobCommand.java
index aea6afa1186..4a9a4ea805f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalJobCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalJobCommand.java
@@ -40,7 +40,7 @@ protected void executeCommand() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         if (getParameters().getJobEntityType() != null && getParameters().getJobEntityId() != null) {
             permissionList.add(new PermissionSubject(getParameters().getJobEntityId(),
                     getParameters().getJobEntityType(),
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalStepCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalStepCommand.java
index 27405c68c17..796e43af3b4 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalStepCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddInternalStepCommand.java
@@ -11,7 +11,7 @@
  * BLL command to create a Step for Jobs that are internal
  */
 @InternalCommandAttribute
-public class AddInternalStepCommand <T extends AddStepParameters> extends AddStepCommand<T>{
+public class AddInternalStepCommand <T extends AddStepParameters> extends AddStepCommand<T> {
 
     public AddInternalStepCommand(T parameters, CommandContext cmdContext) {
         super(parameters, cmdContext);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java
index 520a72e2a30..d22bb9652ed 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddMacPoolCommand.java
@@ -65,7 +65,7 @@ private MacPool getMacPoolEntity() {
 
     @Override
     protected void executeCommand() {
-        registerRollbackHandler((TransactionRollbackListener)() -> macPoolPerCluster.removePool(getMacPoolId()));
+        registerRollbackHandler((TransactionRollbackListener) () -> macPoolPerCluster.removePool(getMacPoolId()));
 
         getMacPoolEntity().setId(Guid.newGuid());
         macPoolDao.save(getMacPoolEntity());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
index e7bd5b0d358..e402199ba05 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddStepCommand.java
@@ -32,17 +32,17 @@ protected AddStepCommand(T parameters, CommandContext cmdContext) {
 
     @Override
     protected boolean validate() {
-        boolean retValue=true;
+        boolean retValue = true;
         job = jobDao.get(getParameters().getParentId());
         if (job == null) {
             parentStep = stepDao.get(getParameters().getParentId());
         }
         if (job == null && parentStep == null) {
-            retValue=false;
+            retValue = false;
             addValidationMessage(EngineMessage.ACTION_TYPE_NO_PARENT);
         }
         if (StringUtils.isBlank(getParameters().getDescription())) {
-            retValue=false;
+            retValue = false;
             addValidationMessage(EngineMessage.ACTION_TYPE_EMPTY_DESCRIPTION);
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommand.java
index 1f5b7f9bb42..9a28cc543bd 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddUnmanagedVmsCommand.java
@@ -187,7 +187,7 @@ protected void importHostedEngineVm(Map<String, Object> vmStruct) {
             }
             graphicsDevices.forEach(device -> vm.getManagedVmDeviceMap().put(device.getDeviceId(), device));
             VmDevice consoleDevice = vdsBrokerObjectsBuilder.buildConsoleDevice(vmStruct, vm.getId());
-            if(consoleDevice != null){
+            if (consoleDevice != null) {
                 vm.getManagedVmDeviceMap().put(consoleDevice.getDeviceId(), consoleDevice);
             }
             importHostedEngineVm(vm);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
index 4ed32da8cc5..2d53be9b29e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmAndCloneImageCommand.java
@@ -403,7 +403,7 @@ protected void addVmImages() {
                             // Create a disk to reflect the fact the disk existed during snapshot
                             saveIllegalDisk(diskImage);
                         }
-                    } else {// Only legal images can be copied
+                    } else { // Only legal images can be copied
                         switch (diskImage.getDiskStorageType()) {
                             case CINDER:
                                 CinderDisk cinder = (CinderDisk) diskImage;
@@ -482,7 +482,7 @@ protected boolean isDisksVolumeFormatValid() {
 
     protected abstract VM getVmFromConfiguration();
 
-    protected Guid getDestStorageDomain(Guid diskImageID){
+    protected Guid getDestStorageDomain(Guid diskImageID) {
         return diskInfoDestinationMap.get(diskImageID).getStorageIds().get(0);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
index 96a790a9c16..524f63035af 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
@@ -879,7 +879,7 @@ protected MultipleDiskVmElementValidator createMultipleDiskVmElementValidator(
     protected boolean validateSpaceRequirements() {
         // update vm snapshots for storage free space check
         imagesHandler.fillImagesBySnapshots(getVm());
-        List<DiskImage>  disksList =  DisksFilter.filterImageDisks(getVm().getDiskMap().values(), ONLY_NOT_SHAREABLE,
+        List<DiskImage> disksList = DisksFilter.filterImageDisks(getVm().getDiskMap().values(), ONLY_NOT_SHAREABLE,
                 ONLY_ACTIVE);
         List<DiskImage> disksListForStorageChecks = createDiskDummiesForSpaceValidations(disksList);
         MultipleStorageDomainsValidator multipleSdValidator = getStorageDomainsValidator(
@@ -1040,7 +1040,7 @@ private void addTemplateDiskVmElement(Guid newDiskId, Guid oldDiskId) {
         diskVmElementDao.save(newDve);
     }
 
-    private Guid getVmIdFromImageParameters(){
+    private Guid getVmIdFromImageParameters() {
         return getParameters().getMasterVm().getId();
     }
 
@@ -1298,7 +1298,7 @@ private Guid getQuotaIdForDisk(DiskImage diskImage) {
         // If the DiskInfoDestinationMap is available and contains information about the disk
         if (getParameters().getDiskInfoDestinationMap() != null
                 && getParameters().getDiskInfoDestinationMap().get(diskImage.getId()) != null) {
-            return  getParameters().getDiskInfoDestinationMap().get(diskImage.getId()).getQuotaId();
+            return getParameters().getDiskInfoDestinationMap().get(diskImage.getId()).getQuotaId();
         }
         return diskImage.getQuotaId();
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java
index 18e0dbdfc9d..505ecfe7260 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AnsibleCommandBase.java
@@ -40,7 +40,7 @@ public AnsibleCommandBase(T parameters, CommandContext cmdContext) {
     }
 
     @Override
-    protected void init(){
+    protected void init() {
         super.init();
         setVdsId(getParameters().getHostId());
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java
index 420ebeee48b..f099ac4fdd4 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AutoRecoveryManager.java
@@ -203,9 +203,9 @@ <T extends BusinessEntity<Guid>> void check(final AutoRecoverDao<T> dao,
         log.debug("Checking autorecoverable {} done", logMsg);
     }
 
-    private <T extends BusinessEntity<Guid>>  String getHostName(T entity) {
+    private <T extends BusinessEntity<Guid>> String getHostName(T entity) {
         if (entity instanceof VDS) {
-            return ", name : "+((VDS) entity).getName();
+            return ", name : " + ((VDS) entity).getName();
         }
         return "";
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
index ff389d6c2a9..8ddcd295ad4 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/Backend.java
@@ -176,7 +176,7 @@ public void create() {
         checkDBConnectivity();
         try {
             initialize();
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             log.error("Error during initialization", ex);
             throw ex;
         }
@@ -337,7 +337,7 @@ private void initAttestation() {
 
         try {
             AttestThread attestThread = new AttestThread(trustedVdsNames);
-            attestThread.start();//start a thread to attest the hosts
+            attestThread.start(); //start a thread to attest the hosts
         } catch (Exception e) {
             log.error("Failed to initialize attestation cache", e);
         }
@@ -434,7 +434,7 @@ private ActionReturnValue runActionImpl(ActionType actionType,
         return result;
     }
 
-    private boolean isActionExternal(ActionType actionType){
+    private boolean isActionExternal(ActionType actionType) {
         return actionType == ActionType.EndExternalJob || actionType == ActionType.EndExternalStep || actionType == ActionType.ClearExternalJob;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
index 56c6e4fb6d8..65c2d5817b3 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeVDSClusterCommand.java
@@ -246,7 +246,7 @@ protected void executeCommand() {
         });
 
         if (targetStoragePool != null
-                && (getSourceCluster().getStoragePoolId()== null || !targetStoragePool.getId().equals(getSourceCluster().getStoragePoolId()))) {
+                && (getSourceCluster().getStoragePoolId() == null || !targetStoragePool.getId().equals(getSourceCluster().getStoragePoolId()))) {
             VdsActionParameters addVdsSpmIdParams = new VdsActionParameters(getVdsIdRef());
             addVdsSpmIdParams.setSessionId(getParameters().getSessionId());
             addVdsSpmIdParams.setCompensationEnabled(true);
@@ -276,7 +276,7 @@ protected void executeCommand() {
         }
 
         if (getSourceCluster().getStoragePoolId() != null
-                && (targetStoragePool== null || !getSourceCluster().getStoragePoolId().equals(targetStoragePool.getId()))) {
+                && (targetStoragePool == null || !getSourceCluster().getStoragePoolId().equals(targetStoragePool.getId()))) {
             vdsSpmIdMapDao.removeByVdsAndStoragePool(getVds().getId(), getSourceCluster().getStoragePoolId());
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChildCommandsCallbackBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChildCommandsCallbackBase.java
index 3d51a94df6e..080d07f98d8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChildCommandsCallbackBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChildCommandsCallbackBase.java
@@ -80,7 +80,7 @@ public void doPolling(Guid cmdId, List<Guid> childCmdIds) {
         childCommandsExecutionEnded(command, anyFailed, childCmdIds, status, completedChildren);
     }
 
-    private void logChildCommandFailed(Guid cmdId, Guid childCmdId, CommandStatus status){
+    private void logChildCommandFailed(Guid cmdId, Guid childCmdId, CommandStatus status) {
         log.debug("Child command id: '{}' of command id: '{}' status is {}, set as failed.", childCmdId, cmdId, status);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearExternalJobCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearExternalJobCommand.java
index 618ad3d87c3..18315262c16 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearExternalJobCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClearExternalJobCommand.java
@@ -14,7 +14,7 @@
 import org.ovirt.engine.core.common.job.Job;
 import org.ovirt.engine.core.dao.JobDao;
 
-public class ClearExternalJobCommand <T extends ActionParametersBase> extends CommandBase<T>{
+public class ClearExternalJobCommand <T extends ActionParametersBase> extends CommandBase<T> {
 
     @Inject
     private JobDao jobDao;
@@ -58,7 +58,7 @@ protected void executeCommand() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         permissionList.add(new PermissionSubject(MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID,
                 VdcObjectType.System,
                 ActionGroup.INJECT_EXTERNAL_TASKS));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
index a2fbae7e764..dc4fed281c7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CloneVmCommand.java
@@ -665,7 +665,7 @@ protected void updateOriginalTemplate(VmStatic vmStatic) {
     }
 
     @Override
-    protected Guid getDestStorageDomain(Guid diskImageID){
+    protected Guid getDestStorageDomain(Guid diskImageID) {
         return getParameters().getDestStorageDomainId() != null ?
                 getParameters().getDestStorageDomainId() :
                 super.getDestStorageDomain(diskImageID);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClusterOperationCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClusterOperationCommandBase.java
index 310d4d1a36b..1ebdc90b9be 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClusterOperationCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClusterOperationCommandBase.java
@@ -204,7 +204,7 @@ private boolean isX86Architecture(Cluster cluster) {
 
     private ClusterPolicy getClusterPolicy(final Cluster cluster) {
         ClusterPolicy clusterPolicy = null;
-        if (cluster == null){
+        if (cluster == null) {
             return null;
         }
         if (cluster.getClusterPolicyId() != null) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
index 8d49690561e..6a5c494d8ba 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandBase.java
@@ -402,7 +402,7 @@ public ActionReturnValue executeAction() {
         String tempVar = getDescription();
         getReturnValue().setDescription((tempVar != null) ? tempVar : getReturnValue().getDescription());
         setActionMessageParameters();
-        Step validatingStep=null;
+        Step validatingStep = null;
         boolean actionAllowed;
         boolean isExternal = this.getParameters().getJobId() != null || this.getParameters().getStepId() != null;
         if (!isExternal) {
@@ -1315,7 +1315,7 @@ private StringBuilder getPermissionSubjectsAsStringBuilder(List<PermissionSubjec
     }
 
     private void executeActionInTransactionScope() {
-        registerRollbackHandler((TransactionRollbackListener)() -> {
+        registerRollbackHandler((TransactionRollbackListener) () -> {
             log.error("Transaction rolled-back for command '{}'.", getClass().getName());
             try {
                 if (isQuotaDependant()) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandCompensator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandCompensator.java
index d5edcba10c2..9558a400592 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandCompensator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommandCompensator.java
@@ -48,7 +48,7 @@ public void compensate() {
         // get all command snapshot entries
         List<KeyValue> commandSnapshots = businessEntitySnapshotDao.getAllCommands();
         for (KeyValue commandSnapshot : commandSnapshots) {
-            if(skipCompensationOnStartup((Guid) commandSnapshot.getKey())) {
+            if (skipCompensationOnStartup((Guid) commandSnapshot.getKey())) {
                 continue;
             }
             // create an instance of the related command by its class name and command id
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolCommand.java
index 1c48004ddea..43cedc10494 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CommonVmPoolCommand.java
@@ -483,7 +483,7 @@ private void initTargetDomains() {
     private Map<Guid, DiskImage> autoSelectTargetDomainAndVolumeFormat() {
         Map<Guid, DiskImage> destinationMap = new HashMap<>();
         for (Disk disk: templateDisks) {
-            DiskImage diskImage = (DiskImage)disk;
+            DiskImage diskImage = (DiskImage) disk;
             ArrayList<Guid> storageIds = new ArrayList<>();
             Guid storageId = findAvailableStorageDomain(disk.getSize(), diskToStorageIds.get(disk.getId()));
             storageIds.add(storageId);
@@ -618,7 +618,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                         disk.getQuotaId(),
                         QuotaConsumptionParameter.QuotaAction.CONSUME,
                         disk.getStorageIds().get(0),
-                        (double)(disk.getSizeInGigabytes() * getParameters().getVmsCount())))
+                        (double) (disk.getSizeInGigabytes() * getParameters().getVmsCount())))
                 .collect(Collectors.toList());
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
index 6cd44194841..ed3756a4bc9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CpuFlagsManagerHandler.java
@@ -386,7 +386,7 @@ public boolean checkIfCpusSameManufacture(String cpuName1, String cpuName2) {
             }
 
             if (ibmCpuByNameDictionary.containsKey(cpuName1)) {
-                return  ibmCpuByNameDictionary.containsKey(cpuName2);
+                return ibmCpuByNameDictionary.containsKey(cpuName2);
             }
 
             if (s390CpuByNameDictionary.containsKey(cpuName1)) {
@@ -462,13 +462,13 @@ public List<ServerCpu> getSupportedServerCpuList(String maxCpuName) {
                 }
             } else if (ibmCpuByNameDictionary.containsKey(maxCpuName)) {
                     ServerCpu selected = ibmCpuByNameDictionary.get(maxCpuName);
-                    int selectedCpuIndex =ibmCpuList.indexOf(selected);
+                    int selectedCpuIndex = ibmCpuList.indexOf(selected);
                     for (int i = 0; i <= selectedCpuIndex; i++) {
                         supportedCpus.add(ibmCpuList.get(i));
                     }
             } else if (amdCpuByNameDictionary.containsKey(maxCpuName)) {
                 ServerCpu selected = amdCpuByNameDictionary.get(maxCpuName);
-                int selectedCpuIndex =amdCpuList.indexOf(selected);
+                int selectedCpuIndex = amdCpuList.indexOf(selected);
                 for (int i = 0; i <= selectedCpuIndex; i++) {
                     supportedCpus.add(amdCpuList.get(i));
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvaCommand.java
index 16ef44c7352..bd0fae251f9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvaCommand.java
@@ -98,7 +98,7 @@ protected void executeCommand() {
     }
 
     private Pair<String, Version> createOvf(Collection<DiskImage> disks) {
-        switch(getParameters().getEntityType()) {
+        switch (getParameters().getEntityType()) {
         case TEMPLATE:
             VmTemplate template = vmTemplateDao.get(getParameters().getEntityId());
             vmHandler.updateVmInitFromDB(template, true);
@@ -299,7 +299,7 @@ private void teardown() {
 
     @Override
     public boolean performNextOperation(int completedChildCount) {
-        switch(getParameters().getPhase()) {
+        switch (getParameters().getPhase()) {
         case MEASURE:
             getParameters().setPhase(CreateOvaParameters.Phase.PACK_OVA);
             break;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalJobCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalJobCommand.java
index 578592aa99c..a1787ffa966 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalJobCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalJobCommand.java
@@ -18,7 +18,7 @@
 import org.ovirt.engine.core.common.utils.ExecutionMethod;
 import org.ovirt.engine.core.dao.JobDao;
 
-public class EndExternalJobCommand <T extends EndExternalJobParameters> extends CommandBase<T>{
+public class EndExternalJobCommand <T extends EndExternalJobParameters> extends CommandBase<T> {
 
     private Job job;
 
@@ -73,7 +73,7 @@ protected void executeCommand() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         permissionList.add(new PermissionSubject(MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID,
                 VdcObjectType.System,
                 ActionGroup.INJECT_EXTERNAL_TASKS));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalStepCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalStepCommand.java
index b16622519f3..813776eca5e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalStepCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EndExternalStepCommand.java
@@ -74,7 +74,7 @@ protected void executeCommand() {
 
     @Override
     public List<PermissionSubject> getPermissionCheckSubjects() {
-        List<PermissionSubject>  permissionList = new ArrayList<>();
+        List<PermissionSubject> permissionList = new ArrayList<>();
         permissionList.add(new PermissionSubject(MultiLevelAdministrationHandler.SYSTEM_OBJECT_ID,
                 VdcObjectType.System,
                 ActionGroup.INJECT_EXTERNAL_TASKS));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
index 31325217a9c..f54c09d03b9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
@@ -155,7 +155,7 @@ protected boolean validateTag(String tagName) {
     protected static boolean isEmailValid(String email) {
         boolean valid = false;
         try {
-            if (email == null){
+            if (email == null) {
                 throw new AddressException();
             }
             new InternetAddress(email, true);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java
index 393b467fbd8..da1ff80ab53 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ExternalEventCommandBase.java
@@ -17,7 +17,7 @@ public ExternalEventCommandBase(T parameters, CommandContext cmdContext) {
         super(parameters, cmdContext);
     }
 
-    protected List<PermissionSubject> getPermissionList(AuditLog event){
+    protected List<PermissionSubject> getPermissionList(AuditLog event) {
         List<PermissionSubject> permissionList = new ArrayList<>();
         if (event.getStorageDomainId() != null) {
             permissionList.add(new PermissionSubject(new Guid(event.getStorageDomainId().toString()),
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAuditLogByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAuditLogByIdQuery.java
index 8a4616023a4..0fe19cba0c9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAuditLogByIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAuditLogByIdQuery.java
@@ -6,7 +6,7 @@
 import org.ovirt.engine.core.common.queries.GetAuditLogByIdParameters;
 import org.ovirt.engine.core.dao.AuditLogDao;
 
-public class GetAuditLogByIdQuery <P extends GetAuditLogByIdParameters> extends QueriesCommandBase<P>{
+public class GetAuditLogByIdQuery <P extends GetAuditLogByIdParameters> extends QueriesCommandBase<P> {
     @Inject
     private AuditLogDao auditLogDao;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetClusterEditWarningsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetClusterEditWarningsQuery.java
index c6ed87cac68..fc3dec72524 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetClusterEditWarningsQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetClusterEditWarningsQuery.java
@@ -53,7 +53,7 @@ protected void executeQueryCommand() {
         List<ClusterEditWarnings.Warning> hostWarnings = getProblematicEntities(oldCluster, newCluster, hostCheckers,
                 cluster -> vdsDao.getAllForCluster(cluster.getId()));
 
-        List<ClusterEditWarnings.Warning> vmWarnings =  new ArrayList<>();
+        List<ClusterEditWarnings.Warning> vmWarnings = new ArrayList<>();
 
         if (oldCluster.supportsVirtService() && newCluster.supportsVirtService()) {
             vmWarnings = getProblematicEntities(oldCluster, newCluster, vmCheckers,
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetFromOvaQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetFromOvaQuery.java
index ef27fc9a0bf..e33805ef75d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetFromOvaQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetFromOvaQuery.java
@@ -82,7 +82,7 @@ private String runAnsibleQueryOvaInfoPlaybook() {
 
     private Map<String, T> parseOvfs(String stdout) {
         if (stdout.startsWith("{")) {
-            stdout = stdout.substring(1, stdout.length()-1);
+            stdout = stdout.substring(1, stdout.length() - 1);
             return Arrays.stream(stdout.split("::"))
                     .map(this::splitToFileNameAndOvf)
                     .map(arr -> new Object[] { parseOvf(arr[1]), arr[0] })
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsOnBehalfByAdElementIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsOnBehalfByAdElementIdQuery.java
index 116d0901761..2e72243ecad 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsOnBehalfByAdElementIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPermissionsOnBehalfByAdElementIdQuery.java
@@ -42,7 +42,7 @@ public GetPermissionsOnBehalfByAdElementIdQuery(P parameters, EngineContext engi
     protected void executeQueryCommand() {
         QueryReturnValue returnValue = backend.runInternalQuery(QueryType.GetAuthzGroupsByUserId, getParameters());
         Collection<AuthzGroup> authzGroups = returnValue.getReturnValue();
-        List<Guid>  groupsIds = authzGroups.stream()
+        List<Guid> groupsIds = authzGroups.stream()
             .map(g -> dbGroupDao.getByExternalId(g.getAuthz(), g.getId()))
             .filter(Objects::nonNull)
             .map(g -> g.getId())
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQuery.java
index bf59ee5f290..bfd3d025393 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmChangedFieldsForNextRunQuery.java
@@ -14,7 +14,7 @@
 import org.ovirt.engine.core.common.utils.customprop.VmPropertiesUtils;
 
 public class GetVmChangedFieldsForNextRunQuery<P extends GetVmChangedFieldsForNextRunParameters>
-        extends QueriesCommandBase<P>{
+        extends QueriesCommandBase<P> {
 
     @Inject
     private VmHandler vmHandler;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmFromConfigurationQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmFromConfigurationQuery.java
index 1636cb29e18..1acec2f5a73 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmFromConfigurationQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmFromConfigurationQuery.java
@@ -24,7 +24,7 @@ protected void executeQueryCommand() {
             return;
         }
 
-        switch(getParameters().getConfigurationType()) {
+        switch (getParameters().getConfigurationType()) {
         case OVF:
             try {
                 getQueryReturnValue().setReturnValue(ovfHelper.readVmFromOvf(getParameters().getVmConfiguration()).getVm());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateFromConfigurationQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateFromConfigurationQuery.java
index 27d55ae3d2c..8559b783317 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateFromConfigurationQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetVmTemplateFromConfigurationQuery.java
@@ -24,7 +24,7 @@ protected void executeQueryCommand() {
             return;
         }
 
-        switch(getParameters().getConfigurationType()) {
+        switch (getParameters().getConfigurationType()) {
         case OVF:
             try {
                 getQueryReturnValue().setReturnValue(ovfHelper.readVmTemplateFromOvf(getParameters().getVmConfiguration()).getVm());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HaAutoStartVmsRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HaAutoStartVmsRunner.java
index cf70800be32..a24b8ce9f26 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HaAutoStartVmsRunner.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HaAutoStartVmsRunner.java
@@ -76,7 +76,7 @@ protected AuditLogType getExceededMaxNumOfRestartsAuditLogType() {
         return AuditLogType.EXCEEDED_MAXIMUM_NUM_OF_RESTART_HA_VM_ATTEMPTS;
     }
 
-    private static class  HaVmToRestart extends AutoStartVmToRestart {
+    private static class HaVmToRestart extends AutoStartVmToRestart {
         private static final int RETRY_TO_RUN_AUTO_START_VM_LONG_INTERVAL =
                 Config.<Integer> getValue(ConfigValues.RetryToRunAutoStartVmLongIntervalInSeconds);
         private static final long MAXIMUM_TIME_AUTO_START_BLOCKED_ON_PRIORITY =
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsVersionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsVersionCommand.java
index 84ee29fef85..3314eae2c6a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsVersionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HandleVdsVersionCommand.java
@@ -112,6 +112,6 @@ private void reportNonOperationReason(NonOperationalReason reason, Map<String, S
         SetNonOperationalVdsParameters tempVar = new SetNonOperationalVdsParameters(getVdsId(),
                 reason,
                 customLogValues);
-        runInternalAction(ActionType.SetNonOperationalVds, tempVar,  ExecutionHandler.createInternalJobContext(getContext()));
+        runInternalAction(ActionType.SetNonOperationalVds, tempVar, ExecutionHandler.createInternalJobContext(getContext()));
     }
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostedEngineImporter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostedEngineImporter.java
index 7ece2449042..a1848ad49ca 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostedEngineImporter.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/HostedEngineImporter.java
@@ -164,8 +164,8 @@ private ImportVmParameters createImportParams(VM vm, StorageDomain sd) {
 
     private StorageDomain getHEStorageDomain(VM vm, StoragePool storagePool, Guid storageDomainId) {
         StorageDomain storageDomain = storageDomainDao.getForStoragePool(storageDomainId, storagePool.getId());
-        if(storageDomain != null){
-            return  storageDomain;
+        if (storageDomain != null) {
+            return storageDomain;
         }
         StorageDomainManagementParameter importParams = new StorageDomainManagementParameter();
         importParams.setStorageDomainId(storageDomainId);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IconLoader.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IconLoader.java
index e4dc93a23bf..cb95dd51293 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IconLoader.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/IconLoader.java
@@ -46,8 +46,8 @@ public class IconLoader implements BackendService {
 
     private static final Logger log = LoggerFactory.getLogger(IconLoader.class);
     private static final Path ICONS_DIR = EngineLocalConfig.getInstance().getUsrDir().toPath().resolve("icons");
-    private static final Path LARGE_ICON_DIR =ICONS_DIR.resolve("large");
-    private static final Path SMALL_ICON_DIR =ICONS_DIR.resolve("small");
+    private static final Path LARGE_ICON_DIR = ICONS_DIR.resolve("large");
+    private static final Path SMALL_ICON_DIR = ICONS_DIR.resolve("small");
     private final Map<Integer, VmIconIdSizePair> osIdToIconIdMap = new HashMap<>();
     private final int DEFAULT_OS_ID = OsRepository.DEFAULT_X86_OS;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
index a7021a27299..fdcda484ea5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitBackendServicesOnStartupBean.java
@@ -112,7 +112,7 @@ public void create() {
             serviceLoader.load(CommandCallbacksPoller.class);
             serviceLoader.load(CommandEntityCleanupManager.class);
 
-            if(Config.<Boolean> getValue(ConfigValues.AffinityRulesEnforcementManagerEnabled)) {
+            if (Config.<Boolean> getValue(ConfigValues.AffinityRulesEnforcementManagerEnabled)) {
                 serviceLoader.load(AffinityRulesEnforcementManager.class);
             }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitGlusterCommandHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitGlusterCommandHelper.java
index 9d213adbaac..d21043700ea 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitGlusterCommandHelper.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitGlusterCommandHelper.java
@@ -185,7 +185,7 @@ private boolean initGlusterPeerProcess(VDS vds) {
                             // though gluster peer probe succeeds, it takes some time for the host to be
                             // listed as a peer. Return success only when the host is acknowledged as peer
                             // from another upServer.
-                            VDS newUpServer =  getNewUpServer(vds, upServer);
+                            VDS newUpServer = getNewUpServer(vds, upServer);
                             if (newUpServer == null) {
                                 //there's no other up server. so there's no issue with peer status results
                                 return true;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java
index 5a0286e8250..ac62fff5b02 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceNumberOfVdssCommand.java
@@ -280,7 +280,7 @@ protected boolean validate() {
                 continue;
             }
             //TODO make a more efficient call but normally the command just loads one cluster anyway
-            if (!clusters.containsKey(vds.getClusterId())){
+            if (!clusters.containsKey(vds.getClusterId())) {
                 final Cluster cluster = clusterDao.get(vds.getClusterId());
                 clusters.put(cluster.getId(), cluster);
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
index 94afa564781..187ad313e01 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintenanceVdsCommand.java
@@ -289,10 +289,10 @@ public AuditLogType getAuditLogTypeValue() {
                 return AuditLogType.VDS_MAINTENANCE_FAILED;
             }
         } else {
-            if (isSucceededWithReasonGiven()){
+            if (isSucceededWithReasonGiven()) {
                 addCustomValue("Reason", getVds().getMaintenanceReason());
                 return AuditLogType.USER_VDS_MAINTENANCE;
-            } else if(isSucceededWithoutReasonGiven()) {
+            } else if (isSucceededWithoutReasonGiven()) {
                 return AuditLogType.USER_VDS_MAINTENANCE_WITHOUT_REASON;
             } else if (getSucceeded()) {
                 return AuditLogType.USER_VDS_MAINTENANCE_MANUAL_HA;
@@ -328,11 +328,11 @@ private boolean isSucceededWithHA() {
         return getSucceeded() && !haMaintenanceFailed;
     }
 
-    private boolean isSucceededWithReasonGiven(){
+    private boolean isSucceededWithReasonGiven() {
         return isSucceededWithHA() && StringUtils.isNotEmpty(getVds().getMaintenanceReason());
     }
 
-    private boolean isSucceededWithoutReasonGiven(){
+    private boolean isSucceededWithoutReasonGiven() {
         return isSucceededWithHA() && !haMaintenanceFailed && StringUtils.isEmpty(getVds().getMaintenanceReason());
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateMultipleVmsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateMultipleVmsCommand.java
index e5be964b7ab..f6fbf92776c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateMultipleVmsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateMultipleVmsCommand.java
@@ -92,7 +92,7 @@ protected boolean validate() {
             setVms(computeVmAffinityClosure());
 
             // The permissions have to be checked for the new VMs.
-            if(!hasPermissionToMigrateVms(getVms())) {
+            if (!hasPermissionToMigrateVms(getVms())) {
                 return failValidation(EngineMessage.USER_NOT_AUTHORIZED_TO_PERFORM_ACTION);
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
index 2d9d7422515..635a30f712c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java
@@ -233,7 +233,7 @@ protected Optional<Guid> getVdsToRunOn() {
 
     private List<Guid> getDestinationHostList() {
         List<Guid> destinationHostGuidList = new LinkedList<>();
-        if (getDestinationVdsId() != null){
+        if (getDestinationVdsId() != null) {
             destinationHostGuidList.add(getDestinationVdsId());
         }
         return destinationHostGuidList;
@@ -270,7 +270,7 @@ protected boolean perform() {
             getParameters().setTotalMigrationTime(new Date());
             getParameters().resetStartTime();
 
-            BooleanSupplier attachMBSDisks =  () -> managedBlockStorageCommandUtil
+            BooleanSupplier attachMBSDisks = () -> managedBlockStorageCommandUtil
                     .attachManagedBlockStorageDisks(getVm(), vmHandler, getDestinationVds(), true);
             if (unplugPassthroughNics() && connectLunDisks(getDestinationVdsId()) &&
                     attachOrDetachMBSFromDest(attachMBSDisks) &&
@@ -343,7 +343,7 @@ private void plugPassthroughNics() {
                 auditLogDirector.log(this, AuditLogType.VM_MIGRATION_NOT_ALL_VM_NICS_WERE_PLUGGED_BACK);
             }
 
-        } catch(Exception e) {
+        } catch (Exception e) {
             auditLogDirector.log(this, AuditLogType.VM_MIGRATION_PLUGGING_VM_NICS_FAILED);
             log.error("Failed to plug nics back after migration of vm {}: {}", getVmName(), e.getMessage());
             log.debug("Exception: ", e);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java
index ca80a1a421d..ea7e1126651 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MultiLevelAdministrationHandler.java
@@ -84,7 +84,7 @@ public void setIsAdminGUIFlag(Guid userId, boolean hasPermissions) {
      * @return true if role is the last with Super User privileges, otherwise, false
      */
     public boolean isLastSuperUserPermission(Guid roleId) {
-        boolean retValue=false;
+        boolean retValue = false;
         if (PredefinedRoles.SUPER_USER.getId().equals(roleId)) {
             // check that there is at least one super-user left in the system
             List<Permission> permissions = permissionDao.getAllForRole(
@@ -104,15 +104,15 @@ public boolean isLastSuperUserPermission(Guid roleId) {
      * @return true if group is the last with Super User privileges, otherwise, false
      */
     public boolean isLastSuperUserGroup(Guid groupId) {
-        boolean retValue=false;
+        boolean retValue = false;
         // check that there is at least one super-user left in the system
         List<Permission> permissions = permissionDao.getAllForRole(
                 PredefinedRoles.SUPER_USER.getId());
         if (permissions.size() <= 1) {
             // get group role
             permissions = permissionDao.getAllForAdElement(groupId);
-            for (Permission permission : permissions){
-                if (permission.getRoleId().equals(PredefinedRoles.SUPER_USER.getId())){
+            for (Permission permission : permissions) {
+                if (permission.getRoleId().equals(PredefinedRoles.SUPER_USER.getId())) {
                     retValue = true;
                     break;
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunner.java
index 75549a680c9..80b7c164ec8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunner.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunner.java
@@ -126,7 +126,7 @@ private boolean canRunActions(List<ActionReturnValue> returnValues) {
     }
 
     private void freeLockForValidationPassedCommands() {
-        getCommands().stream().filter(command->command.getReturnValue().isValid()).forEach(command->command.freeLock());
+        getCommands().stream().filter(command -> command.getReturnValue().isValid()).forEach(command -> command.freeLock());
     }
 
     /**
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
index a8934edbd3f..080060944d7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveAllVmTemplateImageTemplatesCommand.java
@@ -59,7 +59,7 @@ protected void executeCommand() {
                 ONLY_ACTIVE);
         for (DiskImage template : imageTemplates) {
             // remove this disk in all domain that were sent
-            for (Guid domain : (Collection<Guid>)CollectionUtils.intersection(getParameters().getStorageDomainsList(), template.getStorageIds())) {
+            for (Guid domain : (Collection<Guid>) CollectionUtils.intersection(getParameters().getStorageDomainsList(), template.getStorageIds())) {
                 ImagesContainterParametersBase tempVar = new ImagesContainterParametersBase(template.getImageId(),
                         getVmTemplateId());
                 tempVar.setStorageDomainId(domain);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGraphicsAndVideoDevicesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGraphicsAndVideoDevicesCommand.java
index a7019e852d7..caa85cf27db 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGraphicsAndVideoDevicesCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveGraphicsAndVideoDevicesCommand.java
@@ -38,7 +38,7 @@ protected void executeCommand() {
         if (noGraphicsDevicesLeft()) {
             vmDeviceUtils.removeVideoDevices(getVmBaseId());
             //Since getParameters().isVm() isn't set by REST api, try to set VM and if failed then try to set Template
-            if(!setVmToHeadlessMode()) {
+            if (!setVmToHeadlessMode()) {
                 setTemplateToHeadlessMode();
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java
index 6510ebb50e5..2af6340b007 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveMacPoolCommand.java
@@ -39,7 +39,7 @@ protected void setActionMessageParameters() {
 
     @Override
     protected void executeCommand() {
-        registerRollbackHandler((TransactionRollbackListener)() -> macPoolPerCluster.createPool(getOldMacPool()));
+        registerRollbackHandler((TransactionRollbackListener) () -> macPoolPerCluster.createPool(getOldMacPool()));
 
         macPoolDao.remove(getMacPoolId());
         macPoolPerCluster.removePool(getMacPoolId());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java
index c27e0b40177..02f0c393b90 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java
@@ -64,7 +64,7 @@ protected boolean validate() {
         ) {
             return failValidation(EngineMessage.SYSTEM_PERMISSIONS_CANT_BE_REMOVED_FROM_EVERYONE);
         }
-        if(!Objects.equals(p.getAdElementId(), getParameters().getTargetId())
+        if (!Objects.equals(p.getAdElementId(), getParameters().getTargetId())
             && dbUserDao.get(getParameters().getTargetId()) != null) {
             return failValidation(EngineMessage.INHERITED_PERMISSION_CANT_BE_REMOVED);
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
index 2025fc0f03c..0e0df3623d2 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
@@ -372,11 +372,11 @@ private RemoveAllVmImagesParameters buildRemoveAllVmImagesParameters(List<DiskIm
     @Override
     public AuditLogType getAuditLogTypeValue() {
         if (getSucceeded()) {
-            return isInternalExecution() ? AuditLogType.USER_REMOVE_VM_FINISHED_INTERNAL: AuditLogType.USER_REMOVE_VM_FINISHED;
+            return isInternalExecution() ? AuditLogType.USER_REMOVE_VM_FINISHED_INTERNAL : AuditLogType.USER_REMOVE_VM_FINISHED;
         }
 
         return isInternalExecution() ?
-                AuditLogType.USER_REMOVE_VM_FINISHED_WITH_ILLEGAL_DISKS_INTERNAL:
+                AuditLogType.USER_REMOVE_VM_FINISHED_WITH_ILLEGAL_DISKS_INTERNAL :
                 AuditLogType.USER_REMOVE_VM_FINISHED_WITH_ILLEGAL_DISKS;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
index b08fc1c79e0..037da4421d8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmCommand.java
@@ -303,7 +303,7 @@ vmHandler, getVds())) {
                         markHostDevicesAsUsed();
                     }
                 }
-            } catch(EngineException e) {
+            } catch (EngineException e) {
                 // if the returned exception is such that shoudn't trigger the re-run process,
                 // re-throw it. otherwise, continue (the vm will be down and a re-run will be triggered)
                 switch (e.getErrorCode()) {
@@ -427,7 +427,7 @@ protected RunVmFlow getFlow() {
             return cachedFlow;
         }
 
-        switch(getVm().getStatus()) {
+        switch (getVm().getStatus()) {
         case Paused:
             return setFlow(RunVmFlow.RESUME_PAUSE);
 
@@ -459,7 +459,7 @@ && isStatelessSnapshotExistsForVm()
     }
 
     protected void perform() {
-        switch(getFlow()) {
+        switch (getFlow()) {
         case RESUME_PAUSE:
             resumeVm();
             break;
@@ -646,7 +646,7 @@ protected void updateCurrentCd(String cdPath) {
      * @return the VDS create VM parameters
      */
     protected CreateVDSCommandParameters buildCreateVmParameters() {
-        CreateVDSCommandParameters parameters  = new CreateVDSCommandParameters(getVdsId(), getVm());
+        CreateVDSCommandParameters parameters = new CreateVDSCommandParameters(getVdsId(), getVm());
         parameters.setRunInUnknownStatus(getParameters().isRunInUnknownStatus());
         parameters.setVmPayload(vmPayload);
         if (shouldRestoreMemory()) {
@@ -893,7 +893,7 @@ protected void updateVmInit() {
                     }
                 } else {
                     if (!isPayloadExists(VmDeviceType.CDROM)) {
-                        if(osRepository.isCloudInit(getVm().getVmOsId())) {
+                        if (osRepository.isCloudInit(getVm().getVmOsId())) {
                             initializationType = InitializationType.CloudInit;
                         } else {
                             initializationType = InitializationType.Ignition;
@@ -1045,7 +1045,7 @@ private String guestToolsVersionTreatment(String regex) {
                     .filter(m -> m.getRepoImageName().equals(toolsName))
                     .findFirst()
                     .orElse(null);
-            if (dataDisk != null){
+            if (dataDisk != null) {
                 return dataDisk.getRepoImageId();
             }
             String isoDir = (String) runVdsCommand(VDSCommandType.IsoDirectory,
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
index 7dc4d698f6d..8affb5fe6c0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RunVmOnceCommand.java
@@ -146,7 +146,7 @@ protected void loadPayload() {
     @Override
     protected List<Guid> getPredefinedVdsIdListToRunOn() {
         // destination VDS ID has priority over the dedicated VDS
-        if (getParameters().getDestinationVdsId() != null){
+        if (getParameters().getDestinationVdsId() != null) {
             List<Guid> destIdList = new LinkedList<>();
             destIdList.add(getParameters().getDestinationVdsId());
             return destIdList;
@@ -217,7 +217,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
 
     @Override
     protected List<Guid> getVdsWhiteList() {
-        if (getPredefinedVdsIdListToRunOn().size() > 0){
+        if (getPredefinedVdsIdListToRunOn().size() > 0) {
             return getPredefinedVdsIdListToRunOn();
         }
         return super.getVdsWhiteList();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
index d685773a274..b995af81558 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SearchQuery.java
@@ -409,7 +409,7 @@ private List<Cluster> searchClusters() {
                             retVal.get().compareTo(cluster.getCompatibilityVersion()) > 0)
                     );
         }
-        for(Cluster cluster: clusters) {
+        for (Cluster cluster: clusters) {
             if (cluster.isManaged()) {
                 List<VDS> hostsWithMissingFlags = backend.runInternalQuery(QueryType.GetHostsWithMissingFlagsForCluster,
                         new IdQueryParameters(cluster.getId())).getReturnValue();
@@ -540,7 +540,7 @@ private QueryData initQueryData(boolean useCache) {
             // search text.
             if (!isExistsValue || IsFromYesterday) {
                 log.debug("ResourceManager::searchBusinessObjects(''{}'') - entered", searchText);
-                final char AT='@';
+                final char AT = '@';
                 String queryAuthz = null;
                 String queryNamespace = null;
                 ISyntaxChecker curSyntaxChecker;
@@ -549,7 +549,7 @@ private QueryData initQueryData(boolean useCache) {
                 if (m.matches()) {
                     final String COLON = ":";
                     String prefix = m.group("prefix");
-                    searchText =  m.group("content");
+                    searchText = m.group("content");
                     // get profile
                     List<String> profiles = backend.runInternalQuery(QueryType.GetDomainList,
                             new QueryParametersBase(getParameters().getSessionId())).getReturnValue();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunner.java
index 063ae3577ed..3f82443f202 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunner.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunner.java
@@ -51,7 +51,7 @@ public SequentialMultipleActionsRunner(ActionType actionType,
     @Override
     public ArrayList<ActionReturnValue> execute() {
         for (ActionParametersBase parameter : parameters) {
-            if(!isInternal) {
+            if (!isInternal) {
                 logExecution(log, sessionDataContainer, parameter.getSessionId(), String.format("command %s", actionType));
             }
             CommandBase<?> command =
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SerialChildExecutingCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SerialChildExecutingCommand.java
index 5e7537e4564..68038c689d6 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SerialChildExecutingCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SerialChildExecutingCommand.java
@@ -17,7 +17,7 @@ public interface SerialChildExecutingCommand {
     /**
      * method to handle immediately (before endWithFailure() is called) a failure.
      */
-    default void handleFailure() {};
+    default void handleFailure() { };
 
     /**
      * method to indicate whether on failed execution of child commands the command
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java
index 20803f558b9..127c64833bb 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java
@@ -16,7 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@NonTransactiveCommandAttribute(forceCompensation=true)
+@NonTransactiveCommandAttribute(forceCompensation = true)
 public class ShutdownVmCommand<T extends ShutdownVmParameters> extends StopVmCommandBase<T> {
     private static final Logger log = LoggerFactory.getLogger(ShutdownVmCommand.class);
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshHostRebootCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshHostRebootCommand.java
index 3250276973c..b23c0d303cc 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshHostRebootCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SshHostRebootCommand.java
@@ -34,7 +34,7 @@ protected void executeCommand() {
     }
 
     private VDSStatus getStatusAfterReboot() {
-        switch(getParameters().getPrevVdsStatus()) {
+        switch (getParameters().getPrevVdsStatus()) {
             case Maintenance:
             case Installing:
                 return getParameters().getPrevVdsStatus();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommand.java
index 1adcc3650de..ec1af427442 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommand.java
@@ -8,10 +8,10 @@
 import org.ovirt.engine.core.common.errors.EngineMessage;
 import org.ovirt.engine.core.compat.Guid;
 
-@NonTransactiveCommandAttribute(forceCompensation=true)
+@NonTransactiveCommandAttribute(forceCompensation = true)
 public class StopVmCommand<T extends StopVmParameters> extends StopVmCommandBase<T> {
 
-    public StopVmCommand(T stopVmParams,  CommandContext commandContext) {
+    public StopVmCommand(T stopVmParams, CommandContext commandContext) {
         super(stopVmParams, commandContext);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
index 07a359aeda7..88688a5b66b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
@@ -120,7 +120,7 @@ private VDSReturnValue destroyMigratingVm() {
                 returnValueFromDestination = runVdsCommand(
                         VDSCommandType.DestroyVm,
                         buildDestroyVmVDSCommandParameters(getVm().getMigratingToVds()));
-            } catch(EngineException e) {
+            } catch (EngineException e) {
                 switch (e.getErrorCode()) {
                 case noVM:
                     break;
@@ -134,7 +134,7 @@ private VDSReturnValue destroyMigratingVm() {
                 returnValueFromSource = runVdsCommand(
                         VDSCommandType.DestroyVm,
                         buildDestroyVmVDSCommandParameters(getVdsId()));
-            } catch(EngineException e) {
+            } catch (EngineException e) {
                 switch (e.getErrorCode()) {
                 case noVM:
                     if (returnValueFromDestination == null) {
@@ -242,7 +242,7 @@ public void addQuotaPermissionSubject(List<PermissionSubject> quotaPermissionLis
     }
 
     @Override
-    protected  boolean shouldSkipCommandExecution() {
+    protected boolean shouldSkipCommandExecution() {
         return getVm() != null && getVm().getStatus() == VMStatus.Down;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
index bfb027c3c4e..40747971447 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java
@@ -86,7 +86,7 @@
 
 @NonTransactiveCommandAttribute(forceCompensation = true)
 public class UpdateClusterCommand<T extends ClusterOperationParameters> extends
-        ClusterOperationCommandBase<T> implements RenamedEntityInfoProvider{
+        ClusterOperationCommandBase<T> implements RenamedEntityInfoProvider {
 
     @Inject
     private ClusterFeatureDao clusterFeatureDao;
@@ -258,7 +258,7 @@ private void reDetectDefaultsForDeprecatedCPUs() {
             ServerCpu sc = cpuFlagsManagerHandler.findMaxServerCpuByFlags(vds.getCpuFlags(),
                     getParameters().getCluster().getCompatibilityVersion());
 
-            if (vds.getStatus() == VDSStatus.Up && sc != null  &&
+            if (vds.getStatus() == VDSStatus.Up && sc != null &&
                     (scMin == null || scMin.getLevel() > sc.getLevel()) &&
                     (!oldCpuExisted || oldCpuManufacturer.equals(cpuFlagsManagerHandler.
                             getVendorByCpuName(sc.getCpuName(), getParameters().getCluster().getCompatibilityVersion())))) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateMacPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateMacPoolCommand.java
index c6f7fbc2ce7..a1fea651aff 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateMacPoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateMacPoolCommand.java
@@ -74,7 +74,7 @@ public String getMacPoolName() {
 
     @Override
     protected void executeCommand() {
-        registerRollbackHandler((TransactionRollbackListener)() ->
+        registerRollbackHandler((TransactionRollbackListener) () ->
             TransactionSupport.executeInNewTransaction(
                 (TransactionMethod<Void>) () -> {
                     // if the update failed before the removal of the pool need to
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateUserProfilePropertyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateUserProfilePropertyCommand.java
index 861822bc65f..043cc046dac 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateUserProfilePropertyCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateUserProfilePropertyCommand.java
@@ -56,7 +56,7 @@ protected void setActionMessageParameters() {
     @Override
     protected boolean validate() {
         UserProfileProperty propertyToUpdate = getParameters().getUserProfileProperty();
-        if(!propertyToUpdate.getUserId().equals(getUserId())){
+        if (!propertyToUpdate.getUserId().equals(getUserId())) {
             addCustomValue(PROFILE_USER, buildUserName(userDao, propertyToUpdate.getUserId()));
         }
         addCustomValue(PROFILE_PROPERTY, propertyToUpdate.getName());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
index 24680ec322b..4d0ae30b0ab 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
@@ -132,7 +132,7 @@
 import org.ovirt.engine.core.vdsbroker.vdsbroker.CloudInitHandler;
 
 public class UpdateVmCommand<T extends VmManagementParametersBase> extends VmManagementCommandBase<T>
-        implements QuotaVdsDependent, RenamedEntityInfoProvider{
+        implements QuotaVdsDependent, RenamedEntityInfoProvider {
 
     private static final Base64 BASE_64 = new Base64(0, null);
     private static final String AUDIT_LOG_MEMORY_HOT_UNPLUG_OPTIONS = "memoryHotUnplugOptions";
@@ -201,7 +201,7 @@ public class UpdateVmCommand<T extends VmManagementParametersBase> extends VmMan
     private boolean isUpdateVmTemplateVersion = false;
     private String mdevType; // the value of the deprecated custom property mdev_type, if specified
 
-    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> {};
+    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> { };
 
     public UpdateVmCommand(T parameters, CommandContext commandContext) {
         super(parameters, commandContext);
@@ -444,7 +444,7 @@ private boolean updateVmLease() {
         return true;
     }
 
-    private void liveUpdateCpuProfile(){
+    private void liveUpdateCpuProfile() {
         if (getVm().getStatus().isQualifiedForQosChange() &&
                 !Objects.equals(oldVm.getCpuProfileId(), newVmStatic.getCpuProfileId())) {
             vmSlaPolicyUtils.refreshCpuQosOfRunningVm(getVm());
@@ -733,7 +733,7 @@ private void hotPlugMemory(int memoryHotPlugSize) {
 
     private boolean requiresSpecialBlock(int minimalHotPlugDeviceSizeMb) {
         if (!osRepository.requiresHotPlugSpecialBlock(getParameters().getVmStaticData().getOsId(),
-                getEffectiveCompatibilityVersion())){
+                getEffectiveCompatibilityVersion())) {
             return false;
         }
         final List<VmDevice> memoryDevices = getVmDeviceUtils().getMemoryDevices(getVmId());
@@ -813,7 +813,7 @@ private void updateWatchdog() {
                 parameters.setAction(getParameters().getWatchdog().getAction());
                 parameters.setModel(getParameters().getWatchdog().getModel());
 
-                if(watchdogs.isEmpty()) {
+                if (watchdogs.isEmpty()) {
                     runInternalAction(ActionType.AddWatchdog, parameters, cloneContextAndDetachFromParent());
                 } else {
                     // there is a watchdog in the vm, we have to update.
@@ -1040,7 +1040,7 @@ protected boolean validate() {
             } else if (vmFromDB.getVmPoolId() != null) {
                 isUpdateVmTemplateVersion = true;
                 return true; // no more tests are needed because no more changes are allowed in this state
-            } else {// template id can be changed for pool VMs only
+            } else { // template id can be changed for pool VMs only
                 return failValidation(EngineMessage.ACTION_TYPE_FAILED_TEMPLATE_ID_CANT_BE_CHANGED);
             }
         }
@@ -1247,7 +1247,7 @@ protected boolean validate() {
             }
         }
 
-        if (isVirtioScsiEnabled())  {
+      if (isVirtioScsiEnabled()) {
             // Verify OS compatibility
             if (!validate(vmHandler.isOsTypeSupportedForVirtioScsi
                     (vmFromParams.getOs(), getEffectiveCompatibilityVersion()))) {
@@ -1258,7 +1258,7 @@ protected boolean validate() {
         VmValidator vmValidator = createVmValidator(vmFromParams);
 
         // A pinned VM, must run on one of its hosts
-        if (!validate(vmValidator.isPinnedVmRunningOnDedicatedHost(vmFromDB, vmFromParams.getStaticData()))){
+        if (!validate(vmValidator.isPinnedVmRunningOnDedicatedHost(vmFromDB, vmFromParams.getStaticData()))) {
             return false;
         }
 
@@ -1409,7 +1409,7 @@ && isHotSetEnabled()
             return false;
         }
 
-        if (!isIsoPathExists(vmFromParams.getStaticData(), getVm().getStoragePoolId())){
+        if (!isIsoPathExists(vmFromParams.getStaticData(), getVm().getStoragePoolId())) {
             return failValidation(EngineMessage.ERROR_CANNOT_FIND_ISO_IMAGE_PATH);
         }
         if (!validate(vmHandler.validateCpuPinningPolicy(getParameters().getVmStaticData(),
@@ -1433,7 +1433,7 @@ private boolean validateCPUHotplug(VmStatic vmStaticData) {
         boolean countThreadsAsCores = getCluster().getCountThreadsAsCores();
         int availableCpus = SlaValidator.getEffectiveCpuCores(getVds(), countThreadsAsCores) -
                 vdsCpuUnitPinningHelper.countUnavailableCpus(
-                        getVdsManager(getVdsId()).getCpuTopology(),  countThreadsAsCores);
+                        getVdsManager(getVdsId()).getCpuTopology(), countThreadsAsCores);
         if (vmStaticData.getNumOfCpus(false) > availableCpus) {
             return false;
         }
@@ -1577,14 +1577,14 @@ public List<PermissionSubject> getPermissionCheckSubjects() {
     private boolean isDedicatedVmForVdsChanged() {
         List<Guid> paramList = getParameters().getVmStaticData().getDedicatedVmForVdsList();
         List<Guid> vmList = getVm().getDedicatedVmForVdsList();
-        if (vmList == null && paramList == null){
+        if (vmList == null && paramList == null) {
             return false;
         }
-        if (vmList == null || paramList == null){
+        if (vmList == null || paramList == null) {
             return true;
         }
         //  vmList.equals(paramList) not good enough, the lists order could change
-        if (vmList.size() != paramList.size()){
+        if (vmList.size() != paramList.size()) {
             return true;
         }
         return !paramList.containsAll(vmList);
@@ -1603,7 +1603,7 @@ private boolean isEmulatedMachineChanged() {
     private boolean isChipsetChanged() {
         BiosType newBiosType = getParameters().getVmStaticData().getBiosType();
         BiosType oldBiosType = getVm().getBiosType();
-        return  newBiosType.getChipsetType() != oldBiosType.getChipsetType();
+        return newBiosType.getChipsetType() != oldBiosType.getChipsetType();
     }
 
     @Override
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
index fbd6686f91c..4dcd14055b3 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
@@ -61,7 +61,7 @@
 import org.ovirt.engine.core.vdsbroker.vdsbroker.CloudInitHandler;
 
 public class UpdateVmTemplateCommand<T extends UpdateVmTemplateParameters> extends VmTemplateManagementCommand<T>
-        implements QuotaVdsDependent, RenamedEntityInfoProvider{
+        implements QuotaVdsDependent, RenamedEntityInfoProvider {
 
     @Inject
     private AuditLogDirector auditLogDirector;
@@ -100,7 +100,7 @@ protected void init() {
         setVmTemplate(getParameters().getVmTemplateData());
         setVmTemplateId(getVmTemplate().getId());
         setClusterId(getVmTemplate().getClusterId());
-        oldTemplate =  vmTemplateDao.get(getVmTemplate().getId());
+        oldTemplate = vmTemplateDao.get(getVmTemplate().getId());
 
         if (getCluster() != null) {
             setStoragePoolId(getCluster().getStoragePoolId() != null ? getCluster().getStoragePoolId()
@@ -180,7 +180,7 @@ protected boolean validate() {
             return false;
         }
 
-        if(!setAndValidateCpuProfile()) {
+        if (!setAndValidateCpuProfile()) {
             return false;
         }
 
@@ -644,6 +644,6 @@ private boolean isChipsetChanged() {
         if (newEffectiveBiosType == null || oldEffectiveBiosType == null) {
             return false;
         }
-        return  newEffectiveBiosType.getChipsetType() != oldEffectiveBiosType.getChipsetType();
+        return newEffectiveBiosType.getChipsetType() != oldEffectiveBiosType.getChipsetType();
     }
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
index bda93366e6d..d270509a496 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VdsEventListener.java
@@ -532,7 +532,7 @@ public void updateSlaPolicies(final List<Guid> vmIds, final Guid vdsId) {
                     Guid diskProfileId = diskImage.getDiskProfileId();
                     StorageQos storageQos = storageQosMap.get(diskProfileId);
 
-                    if(storageQos != null) {
+                    if (storageQos != null) {
                         params.getStorageQos().put(diskImage, storageQos);
                     }
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
index fc0541d944c..e550bdcc579 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmHandler.java
@@ -319,7 +319,7 @@ private void performToolsVersionCheck() {
                     refreshVmsToolsVersion(storagePoolId, Set.of());
                 }
             }
-        } catch (Throwable t){
+        } catch (Throwable t) {
             log.error("Exception while checking guest tools version: {}", ExceptionUtils.getRootCauseMessage(t));
             log.debug("Exception", t);
         }
@@ -1010,7 +1010,7 @@ private boolean addDeviceUpdateOnNextRun(Guid vmId, VmDeviceGeneralType generalT
         } else if (value instanceof VmWatchdog) {
             VmDevice watchdogDevice = ((VmWatchdog) value).createVmDevice();
             if (vmDeviceUtils.vmDeviceChanged(vmId, generalType, typeName, watchdogDevice)) {
-                updates.add(new VmDeviceUpdate(generalType, type, readOnly, name,  watchdogDevice));
+                updates.add(new VmDeviceUpdate(generalType, type, readOnly, name, watchdogDevice));
             }
         } else {
             log.warn("addDeviceUpdateOnNextRun: Unsupported value type: " +
@@ -1037,7 +1037,7 @@ public ValidationResult isCpuSupported(int osId, Version version, String cpuName
         return ValidationResult.VALID;
     }
 
-    public void updateNumaNodesFromDb(VM vm){
+    public void updateNumaNodesFromDb(VM vm) {
         List<VmNumaNode> nodes = vmNumaNodeDao.getAllVmNumaNodeByVmId(vm.getId());
 
         vm.setvNumaNodeList(nodes);
@@ -1084,7 +1084,7 @@ public Set<GraphicsType> getResultingVmGraphics(List<GraphicsType> srcEntityGrap
             }
         }
 
-        if (result.isEmpty()) {// if graphics are set in params, do not use template graphics
+        if (result.isEmpty()) { // if graphics are set in params, do not use template graphics
             for (GraphicsType type : GraphicsType.values()) {
                 if (srcEntityGraphics.contains(type) && !graphicsResetInParams(type, graphicsDevices)) { // graphics is in template and is not nulled in params
                     result.add(type);
@@ -1202,7 +1202,7 @@ private void maybeUpdateOvirtGuestAgentStatus(String latestVersion, VM vm) {
     }
 
     public String currentOvirtGuestAgentVersion(VM vm) {
-        if (vm.getAppList() != null){
+        if (vm.getAppList() != null) {
             if (!FeatureSupported.isWindowsGuestToolsSupported(vm.getCompatibilityVersion())) {
                 if (vm.getAppList().toLowerCase().contains("qemu-guest-agent")) {
                     Matcher m = QEMU_GA_PATTERN_VER.matcher(vm.getAppList().toLowerCase());
@@ -1449,7 +1449,7 @@ public void autoSelectDefaultDisplayType(Guid srcEntityId,
         }
 
         if (defaultDisplayType == null) {
-            if (!displayGraphicsSupport.isEmpty()) {// when not found otherwise, let's take osinfo's record as the default
+            if (!displayGraphicsSupport.isEmpty()) { // when not found otherwise, let's take osinfo's record as the default
                 for (Map.Entry<DisplayType, Set<GraphicsType>> entry : displayGraphicsSupport.entrySet()) {
                     if (defaultDisplayType == null) {
                         // prioritize first display type based on osinfo
@@ -1461,7 +1461,7 @@ public void autoSelectDefaultDisplayType(Guid srcEntityId,
                         break;
                     }
                 }
-            } else {// no osinfo record
+            } else { // no osinfo record
                 defaultDisplayType = DisplayType.vga;
             }
         }
@@ -1494,7 +1494,7 @@ public void autoSelectGraphicsDevice(Guid srcEntityId,
                 }
 
                 if (defaultGraphicsType != null) {
-                    for (GraphicsType graphicsType : GraphicsType.values()) {// reset graphics devices
+                    for (GraphicsType graphicsType : GraphicsType.values()) { // reset graphics devices
                         graphicsDevices.put(graphicsType, null);
                     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmSlaPolicyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmSlaPolicyCommand.java
index 1b6f49788ab..6dfede49f03 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmSlaPolicyCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmSlaPolicyCommand.java
@@ -76,7 +76,7 @@ public AuditLogType getAuditLogTypeValue() {
         int logId = 0;
         if (getParameters().getCpuQos() != null) {
             Integer limit = getParameters().getCpuQos().getCpuLimit();
-            addCustomValue(LOGABLE_FIELD_CPU_LIMIT, (limit != null) ? String.valueOf(limit): "unlimited");
+            addCustomValue(LOGABLE_FIELD_CPU_LIMIT, (limit != null) ? String.valueOf(limit) : "unlimited");
             logId += 1;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java
index 82d2faaaaae..1aca07f2554 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DirectoryUtils.java
@@ -36,7 +36,7 @@ public class DirectoryUtils {
     public DbUser mapPrincipalRecordToDbUser(String authz, ExtMap principal) {
         principal = principal.clone();
         flatGroups(principal);
-        DbUser dbUser = dbUserDao.getByExternalId(authz,  principal.get(PrincipalRecord.ID));
+        DbUser dbUser = dbUserDao.getByExternalId(authz, principal.get(PrincipalRecord.ID));
         Guid userId = dbUser != null ? dbUser.getId() : Guid.newGuid();
         dbUser = new DbUser(mapPrincipalRecordToDirectoryUser(authz, principal));
         dbUser.setId(userId);
@@ -105,7 +105,7 @@ private DirectoryGroup mapGroupRecordToDirectoryGroup(
             for (ExtMap memberOf : group.<Collection<ExtMap>> get(
                     Authz.GroupRecord.GROUPS,
                     Collections.<ExtMap>emptyList())) {
-                if(!loopPrevention.contains(memberOf.<String>get(GroupRecord.ID))) {
+                if (!loopPrevention.contains(memberOf.<String>get(GroupRecord.ID))) {
                     directoryGroup.getGroups().add(mapGroupRecordToDirectoryGroup(authzName, memberOf, loopPrevention));
                 }
             }
@@ -121,7 +121,7 @@ public void flatGroups(ExtMap principal) {
 
     private void flatGroups(ExtMap entity, ExtKey key, Map<String, ExtMap> accumulator) {
         for (ExtMap group : entity.<Collection<ExtMap>>get(key, Collections.<ExtMap> emptyList())) {
-            if(!accumulator.containsKey(group.<String>get(GroupRecord.ID))) {
+            if (!accumulator.containsKey(group.<String>get(GroupRecord.ID))) {
                 accumulator.put(group.get(GroupRecord.ID), group);
                 flatGroups(group, GroupRecord.GROUPS, accumulator);
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginOnBehalfCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginOnBehalfCommand.java
index e44a982a5ad..ed119caddeb 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginOnBehalfCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginOnBehalfCommand.java
@@ -106,7 +106,7 @@ private DbUser getDbUserForPrincipalName(String principalName, String authzName)
             throw new EngineException(EngineError.PRINCIPAL_NOT_FOUND,
                     String.format("%s in domain '%s", principalName, authzName));
         }
-        DbUser user =  new DbUser(directoryUtils.mapPrincipalRecordToDirectoryUser(authzName, principalRecord));
+        DbUser user = new DbUser(directoryUtils.mapPrincipalRecordToDirectoryUser(authzName, principalRecord));
         user.setId(Guid.newGuid());
         return user;
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java
index b7120c266b6..bf0ccb196c7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/RemoveGroupCommand.java
@@ -58,7 +58,7 @@ protected void executeCommand() {
 
     @Override
     public AuditLogType getAuditLogTypeValue() {
-        return getSucceeded()? AuditLogType.USER_REMOVE_AD_GROUP : AuditLogType.USER_REMOVE_AD_GROUP_FAILED;
+        return getSucceeded() ? AuditLogType.USER_REMOVE_AD_GROUP : AuditLogType.USER_REMOVE_AD_GROUP_FAILED;
     }
 
     @Override
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
index acee521c66c..86090d2975b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SessionDataContainer.java
@@ -228,7 +228,7 @@ public final void cleanExpiredUsersSessions() {
 
     public final void cleanExpiredUsersSessionsImpl() {
         Date now = new Date();
-        Iterator<Entry<String, SessionInfo>>  iter = sessionInfoMap.entrySet().iterator();
+        Iterator<Entry<String, SessionInfo>> iter = sessionInfoMap.entrySet().iterator();
         Set<String> tokens = sessionInfoMap.values().stream()
                 .map(sessionInfo -> (String) sessionInfo.contentOfSession.get(SSO_ACCESS_TOKEN_PARAMETER_NAME))
                 .collect(Collectors.toSet());
@@ -402,7 +402,7 @@ public void setSsoOvirtAppApiScope(String engineSessionId, String scope) {
 
     public boolean isSsoOvirtAppApiScope(String engineSessionId) {
         return isSessionExists(engineSessionId) ?
-                (boolean) getData(engineSessionId, SSO_IS_OVIRT_APP_API_SCOPE_PARAMETER_NAME, false):
+                (boolean) getData(engineSessionId, SSO_IS_OVIRT_APP_API_SCOPE_PARAMETER_NAME, false) :
                 false;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/attestationbroker/AttestThread.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/attestationbroker/AttestThread.java
index 1ec99cca42f..3e61baab93e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/attestationbroker/AttestThread.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/attestationbroker/AttestThread.java
@@ -40,7 +40,7 @@ public void run() {
         if (trustedHostsNames.size() > FIRST_STAGE_QUERY_SIZE) {
             values = AttestationService.INSTANCE.attestHosts(trustedHostsNames.subList(0, FIRST_STAGE_QUERY_SIZE));
             handleValues(values);
-            for (int from = FIRST_STAGE_QUERY_SIZE; from < trustedHostsNames.size(); from+= SECOND_STAGE_QUERY_SIZE) {
+            for (int from = FIRST_STAGE_QUERY_SIZE; from < trustedHostsNames.size(); from += SECOND_STAGE_QUERY_SIZE) {
                 int to = (from + SECOND_STAGE_QUERY_SIZE < trustedHostsNames.size()) ?
                         from + SECOND_STAGE_QUERY_SIZE : trustedHostsNames.size();
                 values = AttestationService.INSTANCE. attestHosts(trustedHostsNames.subList(from, to));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/CompensationContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/CompensationContext.java
index dd554524ca8..887fc3ae9c8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/CompensationContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/CompensationContext.java
@@ -76,7 +76,7 @@ public interface CompensationContext {
      * @param status
      *            The status to snapshot.
      */
-    <T extends Enum<?>> void  snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status);
+    <T extends Enum<?>> void snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status);
 
     /**
      * Snapshot the entity status only, so that in case of compensation for the entity, the status will be updated to
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/DefaultCompensationContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/DefaultCompensationContext.java
index e4d7d9ec4f3..4a9bb5ad125 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/DefaultCompensationContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/DefaultCompensationContext.java
@@ -113,7 +113,7 @@ public void snapshotNewEntity(BusinessEntity<?> entity) {
     }
 
     @Override
-    public <T extends Enum<?>> void  snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status) {
+    public <T extends Enum<?>> void snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status) {
         EntityStatusSnapshot snapshot = new EntityStatusSnapshot();
         snapshot.setId(entity.getId());
         snapshot.setStatus(status);
@@ -168,7 +168,7 @@ private BusinessEntitySnapshot createBusinessEntitySnapshot(BusinessEntity<?> en
     }
 
     private void checkEntityForRollback(BusinessEntity<?> entity) {
-        if(entity == null) {
+        if (entity == null) {
             throw new IllegalArgumentException("Can not create snapshot from a null entity");
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/NoOpCompensationContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/NoOpCompensationContext.java
index 933421284f4..be9f2eaabc5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/NoOpCompensationContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/context/NoOpCompensationContext.java
@@ -31,7 +31,7 @@ public void snapshotNewEntity(BusinessEntity<?> entity) {
     }
 
     @Override
-    public <T extends Enum<?>> void  snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status) {
+    public <T extends Enum<?>> void snapshotEntityStatus(BusinessEntityWithStatus<?, T> entity, T status) {
     }
 
     @Override
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportOvaCommand.java
index fb12c52990e..073ef15f972 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportOvaCommand.java
@@ -51,7 +51,7 @@ protected void init() {
         }
         String path = getParameters().getDirectory();
         if (path != null && path.endsWith("/")) {
-            getParameters().setDirectory(path.substring(0, path.length()-1));
+            getParameters().setDirectory(path.substring(0, path.length() - 1));
         }
         if (StringUtils.isEmpty(getParameters().getName())) {
             getParameters().setName(String.format("%s.ova", getEntity().getName()));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmCommand.java
index 48e48d2a8ea..8f5a1b99633 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmCommand.java
@@ -558,7 +558,7 @@ private void endCopyCollapseOperations(VM vm) {
             updateCopyVmInSpm(getVm().getStoragePoolId(),
                     vm, getParameters()
                             .getStorageDomainId());
-        } catch(EngineException e) {
+        } catch (EngineException e) {
             log.error("Updating VM OVF in export domain failed.", e);
             auditLogDirector.log(this, AuditLogType.IMPORTEXPORT_IMPORT_VM_FAILED_UPDATING_OVF);
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmToOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmToOvaCommand.java
index a32252eeb25..8e32704894b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmToOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExportVmToOvaCommand.java
@@ -195,7 +195,7 @@ public CommandCallback getCallback() {
 
     @Override
     public boolean performNextOperation(int completedChildCount) {
-        switch(getParameters().getPhase()) {
+        switch (getParameters().getPhase()) {
         case CREATE_SNAPSHOT:
             getParameters().setPhase(Phase.CREATE_OVA);
             break;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
index 95a604efdc8..8b32640c6f5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ExtractOvaCommand.java
@@ -94,7 +94,7 @@ protected void executeVmCommand() {
             }
             storeExternalData(runAnsibleOvaExternalDataPlaybook());
             setSucceeded(true);
-        } catch(EngineException e) {
+        } catch (EngineException e) {
             log.error("Failed to extract OVA file", e);
             setCommandStatus(CommandStatus.FAILED);
         }
@@ -135,7 +135,7 @@ private boolean runAnsibleImportOvaPlaybook(String disksPathToFormat) {
                 .playAction("Import OVA")
                 .playbook(AnsibleConstants.IMPORT_OVA_PLAYBOOK);
 
-        AnsibleReturnValue ansibleReturnValue  = ansibleExecutor.runCommand(commandConfig);
+        AnsibleReturnValue ansibleReturnValue = ansibleExecutor.runCommand(commandConfig);
         boolean succeeded = ansibleReturnValue.getAnsibleReturnCode() == AnsibleReturnCode.OK;
         if (!succeeded) {
             log.error("Failed to extract OVA. Please check logs for more details: {}", ansibleReturnValue.getLogFile());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandBase.java
index 0da170ae38f..9ce3dedd43f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandBase.java
@@ -129,7 +129,7 @@ public abstract class ImportVmCommandBase<T extends ImportVmParameters> extends
     private static VmStatic vmStaticForDefaultValues = new VmStatic();
     private MacPool macPool;
 
-    private Runnable logOnExecuteEndMethod = () -> {};
+    private Runnable logOnExecuteEndMethod = () -> { };
 
     ImportVmCommandBase(T parameters, CommandContext commandContext) {
         super(parameters, commandContext);
@@ -418,7 +418,7 @@ private void logOnExecuteEnd(Runnable method) {
      */
     protected void generateNewDiskId(List<DiskImage> diskImagesList, DiskImage disk) {
         Guid generatedGuid = generateNewDiskId(disk);
-        diskImagesList.forEach(diskImage ->  diskImage.setId(generatedGuid));
+        diskImagesList.forEach(diskImage -> diskImage.setId(generatedGuid));
     }
 
     /**
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromExternalProviderCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromExternalProviderCommand.java
index edcaa320c2c..b159cb40a7f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromExternalProviderCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmFromExternalProviderCommand.java
@@ -301,7 +301,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                     diskImage.getQuotaId(),
                     QuotaConsumptionParameter.QuotaAction.CONSUME,
                     getStorageDomainId(),
-                    (double)diskImage.getSizeInGigabytes()));
+                    (double) diskImage.getSizeInGigabytes()));
         }
         return list;
     }
@@ -522,7 +522,7 @@ public CommandCallback getCallback() {
 
     @Override
     public boolean performNextOperation(int completedChildCount) {
-        switch(getParameters().getImportPhase()) {
+        switch (getParameters().getImportPhase()) {
         case CREATE_DISKS:
             getParameters().setImportPhase(Phase.CONVERT);
             if (getParameters().getProxyHostId() == null) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandBase.java
index a10b70c4de3..5568263aaa5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateCommandBase.java
@@ -76,7 +76,7 @@ public abstract class ImportVmTemplateCommandBase<T extends ImportVmTemplatePara
 
     private Guid sourceTemplateId;
 
-    private Runnable logOnExecuteEndMethod = () -> {};
+    private Runnable logOnExecuteEndMethod = () -> { };
 
     public ImportVmTemplateCommandBase(T parameters, CommandContext commandContext) {
         super(parameters, commandContext);
@@ -387,7 +387,7 @@ private void addVmTemplateToDb() {
         getVmTemplate().setClusterId(getParameters().getClusterId());
 
         // if "run on host" field points to a non existent vds (in the current cluster) -> remove field and continue
-        if(!vmHandler.validateDedicatedVdsExistOnSameCluster(getVmTemplate()).isValid()) {
+        if (!vmHandler.validateDedicatedVdsExistOnSameCluster(getVmTemplate()).isValid()) {
             getVmTemplate().setDedicatedVmForVdsList(Collections.emptyList());
             getVmTemplate().setCpuPinning(null);
         }
@@ -503,7 +503,7 @@ public VmTemplate getVmTemplate() {
 
     @Override
     protected List<Class<?>> getValidationGroups() {
-        if(getParameters().isImportAsNewEntity()){
+        if (getParameters().isImportAsNewEntity()) {
             return addValidationGroup(ImportClonedEntity.class);
         }
         return addValidationGroup(ImportEntity.class);
@@ -512,7 +512,7 @@ protected List<Class<?>> getValidationGroups() {
     @Override
     public Map<String, String> getJobMessageProperties() {
         if (jobProperties == null) {
-            jobProperties =  super.getJobMessageProperties();
+            jobProperties = super.getJobMessageProperties();
             jobProperties.put(VdcObjectType.VmTemplate.name().toLowerCase(),
                     (getVmTemplateName() == null) ? "" : getVmTemplateName());
             jobProperties.put(VdcObjectType.Cluster.name().toLowerCase(), getClusterName());
@@ -549,7 +549,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                     disk.getQuotaId(),
                     QuotaConsumptionParameter.QuotaAction.CONSUME,
                     imageToDestinationDomainMap.get(disk.getId()),
-                    (double)disk.getSizeInGigabytes()));
+                    (double) disk.getSizeInGigabytes()));
         }
         return list;
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateFromOvaCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateFromOvaCommand.java
index e09382a720d..7f3fc3780f7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateFromOvaCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/ImportVmTemplateFromOvaCommand.java
@@ -113,7 +113,7 @@ protected AddDiskParameters buildAddDiskParameters(DiskImage image) {
 
     @Override
     public boolean performNextOperation(int completedChildCount) {
-        switch(getParameters().getImportPhase()) {
+        switch (getParameters().getImportPhase()) {
         case CREATE_DISKS:
             getParameters().setImportPhase(Phase.CONVERT);
             if (getParameters().getProxyHostId() == null) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmCommand.java
index f371de77ba7..546604a05fd 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmCommand.java
@@ -39,7 +39,7 @@ protected void setUnregisteredEntityAndImages() throws OvfReaderException {
     }
 
     @Override
-    protected boolean isUnregisteredEntityExists(){
+    protected boolean isUnregisteredEntityExists() {
         return vmFromConfiguration != null;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmTemplateCommand.java
index 8f875dc9e68..5ccc2dc12ce 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmTemplateCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveUnregisteredVmTemplateCommand.java
@@ -39,7 +39,7 @@ protected void setUnregisteredEntityAndImages() throws OvfReaderException {
     }
 
     @Override
-    protected boolean isUnregisteredEntityExists(){
+    protected boolean isUnregisteredEntityExists() {
         return vmTemplateFromConfiguration != null;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveVmFromImportExportCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveVmFromImportExportCommand.java
index d98b54527a1..b0315a45e11 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveVmFromImportExportCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/RemoveVmFromImportExportCommand.java
@@ -47,7 +47,7 @@
 import org.ovirt.engine.core.dao.VmDao;
 
 @NonTransactiveCommandAttribute
-public class RemoveVmFromImportExportCommand<T extends RemoveVmFromImportExportParameters> extends RemoveVmCommand<T>{
+public class RemoveVmFromImportExportCommand<T extends RemoveVmFromImportExportParameters> extends RemoveVmCommand<T> {
 
 
     @Inject
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicContext.java
index d08132e9989..5c6f6e2cbc0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicContext.java
@@ -85,7 +85,7 @@ public Class<Handler> getLastHandler() {
      * @return the last outcome of the flow
      */
     public HandlerOutcome getLastOutcome() {
-        return  (HandlerOutcome) flowTrace.peek().get(0);
+        return (HandlerOutcome) flowTrace.peek().get(0);
     }
 
     public boolean isSuccessful() {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicHandlers.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicHandlers.java
index 45fcf6a9f39..33c5dab9823 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicHandlers.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicHandlers.java
@@ -103,7 +103,7 @@ public static class ProfileMappingSpecified extends AbstractHandler<MapVnicConte
 
         @Override
         public HandlerOutcome handle(MapVnicContext ctx) {
-            if(ctx.getProfileMapping() != null) {
+            if (ctx.getProfileMapping() != null) {
                 ctx.trace(SUCCESS, ProfileMappingSpecified.class);
                 return SUCCESS;
             }
@@ -172,7 +172,7 @@ public static class TargetIdSpecified extends AbstractHandler<MapVnicContext> {
 
         @Override
         public HandlerOutcome handle(MapVnicContext ctx) {
-            if(ctx.getProfileMapping().hasTargetId()) {
+            if (ctx.getProfileMapping().hasTargetId()) {
                 ctx.trace(SUCCESS, TargetIdSpecified.class);
                 return SUCCESS;
             }
@@ -215,7 +215,7 @@ public static class TargetNamesAreEmptyString extends AbstractHandler<MapVnicCon
 
         @Override
         public HandlerOutcome handle(MapVnicContext ctx) {
-            if(ctx.getProfileMapping().targetNamesAreEmptyString()) {
+            if (ctx.getProfileMapping().targetNamesAreEmptyString()) {
                 ctx.trace(SUCCESS, TargetNamesAreEmptyString.class);
                 return SUCCESS;
             }
@@ -228,7 +228,7 @@ public static class TargetNamesSpecified extends AbstractHandler<MapVnicContext>
 
         @Override
         public HandlerOutcome handle(MapVnicContext ctx) {
-            if(ctx.getProfileMapping().hasTargetNames()) {
+            if (ctx.getProfileMapping().hasTargetNames()) {
                 ctx.trace(SUCCESS, TargetNamesSpecified.class);
                 return SUCCESS;
             }
@@ -263,7 +263,7 @@ public static class TargetProfileSpecified extends AbstractHandler<MapVnicContex
 
         @Override
         public HandlerOutcome handle(MapVnicContext ctx) {
-            if(ctx.getProfileMapping().hasTarget()) {
+            if (ctx.getProfileMapping().hasTarget()) {
                 ctx.trace(SUCCESS, TargetProfileSpecified.class);
                 return SUCCESS;
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsHandlers.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsHandlers.java
index 225396ee10e..07b2e5e644c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsHandlers.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsHandlers.java
@@ -147,7 +147,7 @@ public HandlerOutcome handle(MapVnicsContext vnicsContext) {
                 vnicsContext.trace(NEUTRAL, RunContextPerMatchedMapping.class);
                 return NEUTRAL;
             }
-            vnicsContext.getContexts().forEach(ctx ->  {
+            vnicsContext.getContexts().forEach(ctx -> {
                 ctx.getFlow().getHead().process(ctx);
                 vnicsContext.trace(SUCCESS, RunContextPerMatchedMapping.class, ctx);
             });
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java
index ce59249bcd3..ebaa3c03ae5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommand.java
@@ -348,8 +348,8 @@ private void addGlusterVolumeBricksInDb(List<GlusterBrickEntity> newBricks, int
             int brickCount = volumeBricks.get(volumeBricks.size() - 1).getBrickOrder();
 
             //If the volume is an arbiter volume then make every third brick as arbiter brick.
-            if(volume.getIsArbiter()){
-                for(int i=2;i<newBricks.size();i+=3){
+            if (volume.getIsArbiter()) {
+                for (int i = 2; i < newBricks.size(); i += 3) {
                     newBricks.get(i).setIsArbiter(true);
                 }
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterWebhookInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterWebhookInternalCommand.java
index 45c90e7ed9e..1f4b269b056 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterWebhookInternalCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/AddGlusterWebhookInternalCommand.java
@@ -61,7 +61,7 @@ protected void executeCommand() {
         VDSReturnValue returnValue = runVdsCommand(VDSCommandType.AddGlusterWebhook,
                                         new GlusterWebhookVDSParameters(upServer.getId(), webhookUrl, null));
         setSucceeded(returnValue.getSucceeded());
-        if(!getSucceeded()) {
+        if (!getSucceeded()) {
             handleVdsError(AuditLogType.GLUSTER_WEBHOOK_ADD_FAILED, returnValue.getVdsError().getMessage());
             return;
         }
@@ -77,7 +77,7 @@ private String getWebhookUrl() {
                 servletUrl = config.getExternalHttpUrl(WEBHOOK_SERVLET_PATH);
             }
             return servletUrl.toExternalForm();
-        } catch(MalformedURLException exception) {
+        } catch (MalformedURLException exception) {
             log.debug("Failed to get engine webhook url", exception);
             return null;
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java
index bcd7285f938..231e8de7553 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateBrickCommand.java
@@ -153,7 +153,7 @@ private void runAnsibleCreateBrickPlaybook() throws IOException, InterruptedExce
         if (totalSize < MIN_VG_SIZE) {
             poolmetadatsize = MIN_METADATA_PERCENT * totalSize;
         } else {
-            poolmetadatsize =  Double.valueOf(DEFAULT_METADATA_SIZE_MB);
+            poolmetadatsize = Double.valueOf(DEFAULT_METADATA_SIZE_MB);
         }
         totalSize = totalSize - poolmetadatsize;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
index 21b39723bd3..8adeb556f34 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommand.java
@@ -124,8 +124,8 @@ protected boolean validate() {
             return false;
         }
 
-        if (getVolume().getIsArbiter()){
-            if(!getVolume().getVolumeType().isReplicatedType() || getVolume().getReplicaCount() != 3){
+        if (getVolume().getIsArbiter()) {
+            if (!getVolume().getVolumeType().isReplicatedType() || getVolume().getReplicaCount() != 3) {
                 return failValidation(EngineMessage.ACTION_TYPE_FAILED_GLUSTER_ARBITER_VOLUME_SHOULD_BE_REPLICA_3_VOLUME);
             }
         }
@@ -146,7 +146,7 @@ protected void executeCommand() {
         // set the gluster volume name for audit purpose
         setGlusterVolumeName(getVolume().getName());
 
-        if(getVolume().getTransportTypes() == null || getVolume().getTransportTypes().isEmpty()) {
+        if (getVolume().getTransportTypes() == null || getVolume().getTransportTypes().isEmpty()) {
             getVolume().addTransportType(TransportType.TCP);
         }
 
@@ -168,7 +168,7 @@ protected void executeCommand() {
                                 getParameters().isForce()));
         setSucceeded(returnValue.getSucceeded());
 
-        if(!getSucceeded()) {
+        if (!getSucceeded()) {
             handleVdsError(AuditLogType.GLUSTER_VOLUME_CREATE_FAILED, returnValue.getVdsError().getMessage());
             return;
         }
@@ -177,7 +177,7 @@ protected void executeCommand() {
         GlusterVolumeEntity createdVolume = (GlusterVolumeEntity) returnValue.getReturnValue();
         setVolumeType(createdVolume);
         setBrickOrder(createdVolume.getBricks());
-        if(createdVolume.getIsArbiter()){
+        if (createdVolume.getIsArbiter()) {
             setArbiterFlag(createdVolume);
         }
         addVolumeToDb(createdVolume);
@@ -200,7 +200,7 @@ protected void executeCommand() {
      * Sets every third brick as arbiter brick if GlusterVolume is an arbiter volume
      */
     private void setArbiterFlag(GlusterVolumeEntity volume) {
-       for(int i=2;i<volume.getBricks().size();i+=3){
+       for (int i = 2; i < volume.getBricks().size(); i += 3) {
            volume.getBricks().get(i).setIsArbiter(volume.getIsArbiter());
        }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
index 829494c2d89..35b4e4940d9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GeoRepSessionCommandBase.java
@@ -49,7 +49,7 @@ protected boolean validate() {
 
     protected GlusterGeoRepSession getGeoRepSession() {
         if (geoRepSession == null) {
-            if(getParameters().getGeoRepSessionId() != null) {
+            if (getParameters().getGeoRepSessionId() != null) {
                 geoRepSession = glusterGeoRepDao.getById(getParameters().getGeoRepSessionId());
             } else {
                 geoRepSession =
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetAddedGlusterServersQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetAddedGlusterServersQuery.java
index a8749837c88..4f21c885d21 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetAddedGlusterServersQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetAddedGlusterServersQuery.java
@@ -41,7 +41,7 @@ protected void executeQueryCommand() {
         Map<String, String> glusterServers = new HashMap<>();
         VDS upServer = glusterUtil.getUpServer(getParameters().getClusterId());
 
-        if(upServer != null ) {
+        if (upServer != null ) {
             VDSReturnValue returnValue = runVdsCommand(VDSCommandType.GlusterServersList,
                     new VdsIdVDSCommandParametersBase(upServer.getId()));
             glusterServers = getAddedGlusterServers((List<GlusterServerInfo>) returnValue.getReturnValue());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGeoRepSessionsForStorageDomainQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGeoRepSessionsForStorageDomainQuery.java
index 4b58f26d67c..e0a90887fbe 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGeoRepSessionsForStorageDomainQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGeoRepSessionsForStorageDomainQuery.java
@@ -59,7 +59,7 @@ protected void executeQueryCommand() {
             //retrieve the gluster volume associated with path
             String path = connection.getConnection();
             String[] pathElements = path.split(StorageConstants.GLUSTER_VOL_SEPARATOR);
-            if (pathElements.length !=2 ) {
+            if (pathElements.length != 2 ) {
                // return empty as volume name could not be determined
                 log.info("Volume name could not be determined from storage connection '{}' ", path);
                 getQueryReturnValue().setSucceeded(false);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterClusterServiceByClusterIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterClusterServiceByClusterIdQuery.java
index 1d584469307..a2d93679ea0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterClusterServiceByClusterIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterClusterServiceByClusterIdQuery.java
@@ -17,7 +17,7 @@ public GetGlusterClusterServiceByClusterIdQuery(P parameters, EngineContext engi
     protected void executeQueryCommand() {
         List<GlusterClusterService> serviceList = null;
 
-        if(getParameters().getServiceType() == null) {
+        if (getParameters().getServiceType() == null) {
             serviceList = glusterClusterServiceDao.getByClusterId(getParameters().getId());
         } else {
             serviceList = new ArrayList<>();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterGeoReplicationEligibleVolumesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterGeoReplicationEligibleVolumesQuery.java
index da838e5667b..ba8d79b8202 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterGeoReplicationEligibleVolumesQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterGeoReplicationEligibleVolumesQuery.java
@@ -35,7 +35,7 @@ protected void executeQueryCommand() {
     public List<GlusterVolumeEntity> getEligibleVolumes(GlusterVolumeEntity masterVolume) {
         List<GlusterVolumeEntity> possiblyEligibleVolumes = getAllGlusterVolumesWithMasterCompatibleVersion(masterVolume.getId());
         Map<GlusterGeoRepNonEligibilityReason, Predicate<GlusterVolumeEntity>> eligibilityPredicateMap = getGeoRepUtilInstance().getEligibilityPredicates(masterVolume);
-        Predicate<GlusterVolumeEntity> andPredicate = eligibilityPredicateMap.values().stream().reduce(Predicate::and).orElse(t->true);
+        Predicate<GlusterVolumeEntity> andPredicate = eligibilityPredicateMap.values().stream().reduce(Predicate::and).orElse(t -> true);
         return possiblyEligibleVolumes.stream().filter(andPredicate).collect(Collectors.toList());
     }
 
@@ -44,9 +44,9 @@ protected List<GlusterVolumeEntity> getAllGlusterVolumesWithMasterCompatibleVers
         Cluster masterCluster = clusterDao.get(masterVolume.getClusterId());
         List<Cluster> clusters = clusterDao.getClustersByServiceAndCompatibilityVersion(true, false, masterCluster.getCompatibilityVersion().getValue());
         List<GlusterVolumeEntity> volumes = new ArrayList<>();
-        if(clusters != null) {
-            for(Cluster currentCluster : clusters) {
-                if(!currentCluster.getId().equals(masterCluster.getId())) {
+        if (clusters != null) {
+            for (Cluster currentCluster : clusters) {
+                if (!currentCluster.getId().equals(masterCluster.getId())) {
                     volumes.addAll(glusterVolumeDao.getByClusterId(currentCluster.getId()));
                 }
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByClusterIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByClusterIdQuery.java
index 23af861bd03..805b22fb08e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByClusterIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByClusterIdQuery.java
@@ -16,7 +16,7 @@ public GetGlusterServerServicesByClusterIdQuery(P parameters, EngineContext engi
     protected void executeQueryCommand() {
         List<GlusterServerService> serviceList = null;
 
-        if(getParameters().getServiceType() == null) {
+        if (getParameters().getServiceType() == null) {
             serviceList = glusterServerServiceDao.getByClusterId(getParameters().getId());
         } else {
             serviceList = glusterServerServiceDao.getByClusterIdAndServiceType(getParameters().getId(), getParameters().getServiceType());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByServerIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByServerIdQuery.java
index 9527e66a1cd..064c910786b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByServerIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterServerServicesByServerIdQuery.java
@@ -16,7 +16,7 @@ public GetGlusterServerServicesByServerIdQuery(P parameters, EngineContext engin
     protected void executeQueryCommand() {
         List<GlusterServerService> serviceList = null;
 
-        if(getParameters().getServiceType() == null) {
+        if (getParameters().getServiceType() == null) {
             serviceList = glusterServerServiceDao.getByServerId(getParameters().getId());
         } else {
             serviceList = glusterServerServiceDao.getByServerIdAndServiceType(getParameters().getId(), getParameters().getServiceType());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java
index 8c6d73f3aa2..a0d5c16638e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterStorageDevicesQuery.java
@@ -54,7 +54,7 @@ private String getMountPointsFilterPattern() {
         // Mounts to be ignored can be exact mount point or a regular expression which should be with the starting part
         // of the mount point. So create a regex which can match against any given pattern in the list.
         StringBuilder pattern = new StringBuilder();
-        for(String mointPoint:mountPointsToIgnore){
+        for (String mointPoint:mountPointsToIgnore) {
             pattern.append("^");
             pattern.append(mointPoint);
             pattern.append("$");
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java
index e84823eb8f0..98c7741a892 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeAdvancedDetailsQuery.java
@@ -177,7 +177,7 @@ private GlusterVolumeAdvancedDetails fetchAdvancedDetails(String volumeName) {
                 }
             });
         }
-        return  advancedDetails;
+        return advancedDetails;
     }
 
     private GlusterVolumeEntity getReplicateVolume(Guid clusterId) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionByIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionByIdQuery.java
index fb95a2948f7..e610fbfbf92 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionByIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionByIdQuery.java
@@ -4,7 +4,7 @@
 import org.ovirt.engine.core.common.businessentities.gluster.GlusterGeoRepSession;
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 
-public class GetGlusterVolumeGeoRepSessionByIdQuery<P extends IdQueryParameters> extends GlusterQueriesCommandBase<P>{
+public class GetGlusterVolumeGeoRepSessionByIdQuery<P extends IdQueryParameters> extends GlusterQueriesCommandBase<P> {
 
     public GetGlusterVolumeGeoRepSessionByIdQuery(P parameters, EngineContext engineContext) {
         super(parameters, engineContext);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQuery.java
index 7fa2a694619..cddd99431a3 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQuery.java
@@ -10,7 +10,7 @@
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.compat.Guid;
 
-public class GetGlusterVolumeGeoRepSessionsQuery<P extends IdQueryParameters> extends GlusterQueriesCommandBase<P>{
+public class GetGlusterVolumeGeoRepSessionsQuery<P extends IdQueryParameters> extends GlusterQueriesCommandBase<P> {
 
     public GetGlusterVolumeGeoRepSessionsQuery(P parameters, EngineContext engineContext) {
         super(parameters, engineContext);
@@ -30,7 +30,7 @@ protected void executeQueryCommand() {
                  * Session details could be null, if they are not yet synced. possible if session detail command failed for some unexpected reason
                  * such as network failure even though the sessions in the cluster are synced(sessionListCommand)
                  */
-                if(geoRepSessionDetails == null) {
+                if (geoRepSessionDetails == null) {
                     continue;
                 }
                 /*
@@ -38,11 +38,11 @@ protected void executeQueryCommand() {
                  * as obtained by using masterbrickId
                  */
                 for (GlusterGeoRepSessionDetails currentDetail : geoRepSessionDetails) {
-                    if(currentDetail == null) {
+                    if (currentDetail == null) {
                         continue;
                     }
                     Guid currentMasterBrickId = currentDetail.getMasterBrickId();
-                    if(currentMasterBrickId == null) {
+                    if (currentMasterBrickId == null) {
                         continue;
                     }
                     GlusterBrickEntity currentBrick = glusterBrickDao.getById(currentMasterBrickId);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java
index bcf0b1f4465..67556e0697e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeProfileInfoQuery.java
@@ -39,8 +39,8 @@ protected void executeQueryCommand() {
     }
 
     protected GlusterVolumeProfileInfo populateBrickNames(GlusterVolumeProfileInfo profileInfo) {
-        List<BrickProfileDetails> brickProfiles= profileInfo.getBrickProfileDetails();
-        for(BrickProfileDetails brickProfileDetails : brickProfiles) {
+        List<BrickProfileDetails> brickProfiles = profileInfo.getBrickProfileDetails();
+        for (BrickProfileDetails brickProfileDetails : brickProfiles) {
             brickProfileDetails.setIdentity(glusterBrickDao.getById(brickProfileDetails.getBrickId()).getQualifiedName());
         }
         return profileInfo;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java
index 6111d1bb7d3..5fd76f27d0f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeRemoveBricksStatusQuery.java
@@ -24,7 +24,7 @@ protected GlusterVolumeTaskStatusEntity fetchTaskStatusDetails() {
                                 getParameters().getBricks(),
                                 volume.getReplicaCount()));
 
-        GlusterVolumeTaskStatusEntity entity = (GlusterVolumeTaskStatusEntity)returnValue.getReturnValue();
+        GlusterVolumeTaskStatusEntity entity = (GlusterVolumeTaskStatusEntity) returnValue.getReturnValue();
 
         // Update the latest status details
         GlusterAsyncTask asyncTask = volume.getAsyncTask();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetNonEligibilityReasonsOfVolumeForGeoRepSessionQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetNonEligibilityReasonsOfVolumeForGeoRepSessionQuery.java
index c67f9abbdd5..ec28b752781 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetNonEligibilityReasonsOfVolumeForGeoRepSessionQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GetNonEligibilityReasonsOfVolumeForGeoRepSessionQuery.java
@@ -28,8 +28,8 @@ protected void executeQueryCommand() {
     protected List<GlusterGeoRepNonEligibilityReason> getNonEligibilityReasons(GlusterVolumeEntity masterVolume, GlusterVolumeEntity slaveVolume) {
         List<GlusterGeoRepNonEligibilityReason> nonEligibilityreasons = new ArrayList<>();
         Map<GlusterGeoRepNonEligibilityReason, Predicate<GlusterVolumeEntity>> eligibilityPredicateMap = getGeoRepUtilInstance().getEligibilityPredicates(masterVolume);
-        for(Map.Entry<GlusterGeoRepNonEligibilityReason, Predicate<GlusterVolumeEntity>> eligibilityPredicateMapEntries : eligibilityPredicateMap.entrySet()) {
-            if(!eligibilityPredicateMapEntries.getValue().test(slaveVolume)) {
+        for (Map.Entry<GlusterGeoRepNonEligibilityReason, Predicate<GlusterVolumeEntity>> eligibilityPredicateMapEntries : eligibilityPredicateMap.entrySet()) {
+            if (!eligibilityPredicateMapEntries.getValue().test(slaveVolume)) {
                 nonEligibilityreasons.add(eligibilityPredicateMapEntries.getKey());
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java
index dd8c09da23b..02fcc702863 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJob.java
@@ -75,7 +75,7 @@ public void refreshHooksInCluster(Cluster cluster, boolean throwError) {
         List<Callable<Pair<VDS, VDSReturnValue>>> taskList = new ArrayList<>();
         for (final VDS upServer : upServers) {
             taskList.add(() -> {
-                VDSReturnValue returnValue =runVdsCommand(VDSCommandType.GlusterHooksList,
+                VDSReturnValue returnValue = runVdsCommand(VDSCommandType.GlusterHooksList,
                         new VdsIdVDSCommandParametersBase(upServer.getId()));
                 return new Pair<>(upServer, returnValue);
             });
@@ -91,7 +91,7 @@ public void refreshHooksInCluster(Cluster cluster, boolean throwError) {
         }
     }
 
-    private void addOrUpdateHooks(Guid clusterId,  List<Pair<VDS, VDSReturnValue>> pairResults ) {
+    private void addOrUpdateHooks(Guid clusterId, List<Pair<VDS, VDSReturnValue>> pairResults ) {
 
         try {
             List<GlusterHookEntity> existingHooks = hooksDao.getByClusterId(clusterId);
@@ -130,7 +130,7 @@ private void addOrUpdateHooks(Guid clusterId,  List<Pair<VDS, VDSReturnValue>> p
                 List<GlusterHookEntity> fetchedHooks = (List<GlusterHookEntity>) pairResult.getSecond().getReturnValue();
 
                 for (GlusterHookEntity fetchedHook : fetchedHooks) {
-                    String key= fetchedHook.getHookKey();
+                    String key = fetchedHook.getHookKey();
                     fetchedHookKeyList.add(key);
 
                     GlusterHookEntity existingHook = existingHookMap.get(key);
@@ -145,7 +145,7 @@ private void addOrUpdateHooks(Guid clusterId,  List<Pair<VDS, VDSReturnValue>> p
                         existingHook.setConflictStatus(conflictStatus | existingHookMap.get(key).getConflictStatus());
 
 
-                        if (conflictStatus!=0) {
+                        if (conflictStatus != 0) {
                             //there is a conflict. we need to either add or update entry in server hook
                             if (serverHook == null) {
                                 newServerHooks.add(buildServerHook(server.getId(), existingHook.getId(), fetchedHook));
@@ -241,7 +241,7 @@ private void saveHookContent(List<Callable<Pair<GlusterHookEntity, VDSReturnValu
                 logMessage(hook.getClusterId(), hook.getHookKey(), AuditLogType.GLUSTER_HOOK_GETCONTENT_FAILED);
                 continue;
             }
-            final String content = (String)pairResult.getSecond().getReturnValue();
+            final String content = (String) pairResult.getSecond().getReturnValue();
             hooksDao.updateGlusterHookContent(hook.getId(), hook.getChecksum(), content);
         }
 
@@ -305,7 +305,7 @@ private void updateContentTasksList(List<Callable<Pair<GlusterHookEntity, VDSRet
     private void updateHookServerMap(Map<Guid, Set<VDS>> existingHookServersMap,
             Guid hookId,
             VDS server) {
-        Set<VDS> hookServers =  existingHookServersMap.get(hookId);
+        Set<VDS> hookServers = existingHookServersMap.get(hookId);
         hookServers.add(server);
         existingHookServersMap.put(hookId, hookServers);
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHostValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHostValidator.java
index 7c6f5b78a0c..a83fe84b3db 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHostValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterHostValidator.java
@@ -26,7 +26,7 @@ public class GlusterHostValidator {
     private final GlusterVolumeDao volumeDao;
 
     @Inject
-    public GlusterHostValidator(GlusterVolumeDao volumeDao, GlusterBrickDao brickDao){
+    public GlusterHostValidator(GlusterVolumeDao volumeDao, GlusterBrickDao brickDao) {
         Validate.notNull(volumeDao, "volumeDao can not be null");
         Validate.notNull(brickDao, "brickDao can not be null");
         this.volumeDao = volumeDao;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJobsManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJobsManager.java
index e63bddfefdc..29fee25165e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJobsManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterJobsManager.java
@@ -33,7 +33,7 @@ public void init() {
 
         log.debug("Initializing Gluster Jobs Manager");
 
-        jobs.forEach(j-> j.schedule());
+        jobs.forEach(j -> j.schedule());
         cronJobs.scheduleAllJobs();
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java
index 54e9bed6deb..20fa8234632 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterSyncJob.java
@@ -159,7 +159,7 @@ private void refreshServerData(Cluster cluster, VDS upServer, List<VDS> existing
             if (fetchedServers != null) {
                 syncServers(cluster, existingServers, fetchedServers);
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Error while refreshing server data for cluster '{}' from database: {}",
                     cluster.getName(),
                     e.getMessage());
@@ -863,8 +863,8 @@ public void updateVolumeProperties(GlusterVolumeEntity existingVolume, final Glu
         boolean changed = false;
         boolean volumeTypeUnSupported = false;
         if (existingVolume.getVolumeType() != fetchedVolume.getVolumeType()) {
-            if(existingVolume.getVolumeType().isSupported() && !fetchedVolume.getVolumeType().isSupported()){
-                volumeTypeUnSupported= true;
+            if (existingVolume.getVolumeType().isSupported() && !fetchedVolume.getVolumeType().isSupported()) {
+                volumeTypeUnSupported = true;
             }
             existingVolume.setVolumeType(fetchedVolume.getVolumeType());
             changed = true;
@@ -1057,12 +1057,12 @@ private void logBrickStatusChange(GlusterVolumeEntity volume, final GlusterBrick
                 null,
                 AuditLogType.GLUSTER_BRICK_STATUS_CHANGED,
                 customValues);
-        if(fetchedStatus == GlusterStatus.DOWN){
+        if (fetchedStatus == GlusterStatus.DOWN) {
             logUtil.logAuditMessage(volume,
                     AuditLogType.GLUSTER_BRICK_STATUS_DOWN,
                     brick.getId(),
                     brick.getQualifiedName());
-        }else if(fetchedStatus == GlusterStatus.UP){
+        } else if (fetchedStatus == GlusterStatus.UP) {
             alertDirector.removeAlertsByBrickIdLogType(brick.getId(), AuditLogType.GLUSTER_BRICK_STATUS_DOWN);
         }
     }
@@ -1199,9 +1199,9 @@ private Map<Guid, Integer> getGlusterVolumeHealInfo(VDS upServer, String volumeN
         VDSReturnValue result = runVdsCommand(VDSCommandType.GetGlusterVolumeHealInfo,
                 new GlusterVolumeVDSParameters(upServer.getId(), volumeName));
 
-        if(result.getSucceeded()){
+        if (result.getSucceeded()) {
             return (Map<Guid, Integer>) result.getReturnValue();
-        }else{
+        } else {
             return Collections.emptyMap();
         }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java
index 01c68c8ca15..1e26c6757c8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJob.java
@@ -51,7 +51,7 @@
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class GlusterTasksSyncJob extends GlusterJob  {
+public class GlusterTasksSyncJob extends GlusterJob {
     private static final Logger log = LoggerFactory.getLogger(GlusterTasksSyncJob.class);
 
     @Inject
@@ -101,9 +101,9 @@ public void updateGlusterAsyncTasks() {
 
     private void updateTasksInCluster(final Cluster cluster, final Map<Guid, GlusterAsyncTask> runningTasks) {
 
-        for  (Entry<Guid, GlusterAsyncTask> entry :  runningTasks.entrySet()) {
+        for (Entry<Guid, GlusterAsyncTask> entry : runningTasks.entrySet()) {
             Guid taskId = entry.getKey();
-            final GlusterAsyncTask task =  entry.getValue();
+            final GlusterAsyncTask task = entry.getValue();
 
             List<Step> steps = stepDao.getStepsByExternalId(taskId);
 
@@ -311,7 +311,7 @@ private void cleanUpOrphanTasks(Map<Guid, Set<Guid>> runningTasksInClusterMap) {
         log.debug("Tasks to be cleaned up in db '{}'", tasksNotRunning);
 
         for (Guid taskId: tasksNotRunning) {
-            GlusterVolumeEntity vol= volumeDao.getVolumeByGlusterTask(taskId);
+            GlusterVolumeEntity vol = volumeDao.getVolumeByGlusterTask(taskId);
             if (vol != null
                     && (vol.getStatus() != GlusterStatus.UP || !runningTasksInClusterMap.keySet()
                             .contains(vol.getClusterId()))) {
@@ -325,7 +325,7 @@ private void cleanUpOrphanTasks(Map<Guid, Set<Guid>> runningTasksInClusterMap) {
             //will mark job ended with status unknown.
             List<Step> steps = stepDao.getStepsByExternalId(taskId);
             Map<String, String> values = new HashMap<>();
-            values.put(GlusterConstants.CLUSTER, vol == null ? "" :vol.getClusterName());
+            values.put(GlusterConstants.CLUSTER, vol == null ? "" : vol.getClusterName());
             values.put(GlusterConstants.VOLUME, vol == null ? "" : vol.getName());
             values.put(GlusterConstants.JOB_STATUS, JobExecutionStatus.UNKNOWN.toString());
             values.put(GlusterConstants.JOB_INFO, " ");
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterThinDeviceService.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterThinDeviceService.java
index 990a0379eb7..2acbe0811d6 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterThinDeviceService.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/GlusterThinDeviceService.java
@@ -175,7 +175,7 @@ private <T, R> R calculateConfirmedVolume(GlusterVolumeEntity volume, Function<B
                 while (!bricks.isEmpty()) {
                     int replicaCounter = 0;
                     List<GlusterBrickEntity> set = new ArrayList<>();
-                    while(replicaCounter < volume.getReplicaCount() && !bricks.isEmpty()) {
+                    while (replicaCounter < volume.getReplicaCount() && !bricks.isEmpty()) {
                         set.add(bricks.get(0));
                         bricks.remove(0);
                         replicaCounter++;
@@ -199,7 +199,7 @@ private Function<List<Stream<Double>>, Long> reduceBricksToSize(GlusterVolumeEnt
                     return data.stream()
                             .map(b -> b.map(v -> v * SizeConverter.BYTES_IN_MB).map(Double::longValue).min(Long::compare).orElse(null))
                             .filter(Objects::nonNull)
-                            .mapToLong(s-> s)
+                            .mapToLong(s -> s)
                             .sum();
                 case DISTRIBUTE:
                 case STRIPE:
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommand.java
index 9bc8792add9..904cc1fab95 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ManageGlusterServiceCommand.java
@@ -203,7 +203,7 @@ private void performActionForServicesOfServer() {
                 glusterServerDao.updatePeerStatus(getParameters().getServerId(), PeerStatus.CONNECTED);
                 //only if cluster supports only gluster service
                 if (!getCluster().supportsVirtService()) {
-                    runVdsCommand(VDSCommandType.SetVdsStatus,  new SetVdsStatusVDSCommandParameters(getVdsId(), VDSStatus.Initializing));
+                    runVdsCommand(VDSCommandType.SetVdsStatus, new SetVdsStatusVDSCommandParameters(getVdsId(), VDSStatus.Initializing));
                 }
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommand.java
index 6a3870619ba..343bbcdfee4 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommand.java
@@ -41,7 +41,7 @@ protected boolean validate() {
             return false;
         }
 
-        if(!super.validate()) {
+        if (!super.validate()) {
             return false;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommand.java
index 512e11926da..3b7f7929c84 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommand.java
@@ -32,7 +32,7 @@ protected void setActionMessageParameters() {
 
     @Override
     protected boolean validate() {
-        if(!super.validate()) {
+        if (!super.validate()) {
             return false;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java
index 4c189721199..214b7cb0728 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/RemoveGlusterHookCommand.java
@@ -115,7 +115,7 @@ protected void executeCommand() {
 
         if (errors.size() > 0) {
             setSucceeded(false);
-            errorType =  AuditLogType.GLUSTER_HOOK_REMOVE_FAILED;
+            errorType = AuditLogType.GLUSTER_HOOK_REMOVE_FAILED;
             handleVdsErrors(getAuditLogTypeValue(), errors);
             addCustomValue(GlusterConstants.FAILURE_MESSAGE , StringUtils.join(errors, System.lineSeparator()));
         } else {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
index 5f4e70b3233..9cd3514b03e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeOptionsCommand.java
@@ -48,7 +48,7 @@ protected void executeCommand() {
             if (getParameters().getVolumeOption() != null && !getParameters().getVolumeOption().getKey().isEmpty()) {
                 GlusterVolumeOptionEntity entity = getGlusterVolume().getOption(getParameters().getVolumeOption().getKey());
                 isResetAllOptions = false;
-                if(entity != null) {
+                if (entity != null) {
                     removeOptionInDb(entity);
                     String optionValue = entity.getValue();
                     getParameters().getVolumeOption().setValue(optionValue != null ? optionValue : "");
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
index 1b7d0f733bf..4d5ac4bd1ff 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommand.java
@@ -10,7 +10,7 @@
 import org.ovirt.engine.core.common.vdscommands.VDSReturnValue;
 import org.ovirt.engine.core.common.vdscommands.gluster.GlusterVolumeGeoRepSessionVDSParameters;
 
-public class ResumeGeoRepSessionCommand extends GeoRepSessionCommandBase<GlusterVolumeGeoRepSessionParameters>{
+public class ResumeGeoRepSessionCommand extends GeoRepSessionCommandBase<GlusterVolumeGeoRepSessionParameters> {
 
     private GlusterVolumeGeoRepSessionParameters parameters;
 
@@ -57,7 +57,7 @@ protected void executeCommand() {
 
     @Override
     public AuditLogType getAuditLogTypeValue() {
-        if(getSucceeded()) {
+        if (getSucceeded()) {
             return AuditLogType.GLUSTER_VOLUME_GEO_REP_RESUME;
         } else {
             return AuditLogType.GLUSTER_VOLUME_GEO_REP_RESUME_FAILED;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
index 06ba1f63e33..12c1a9ea8dc 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGeoRepConfigCommand.java
@@ -62,7 +62,7 @@ protected void executeCommand() {
             geoRepSessionConfig.setValue(configValue);
             geoRepSessionConfig.setKey(configKey);
             geoRepSessionConfig.setId(session.getId());
-            if(glusterGeoRepDao.getGeoRepSessionConfigByKey(session.getId(), configKey) == null) {
+            if (glusterGeoRepDao.getGeoRepSessionConfigByKey(session.getId(), configKey) == null) {
                 glusterGeoRepDao.saveConfig(geoRepSessionConfig);
             } else {
                 glusterGeoRepDao.updateConfig(geoRepSessionConfig);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGlusterVolumeOptionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGlusterVolumeOptionCommand.java
index f94ec588198..e3ee417ff15 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGlusterVolumeOptionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetGlusterVolumeOptionCommand.java
@@ -67,7 +67,7 @@ private void updateOptionInDb(final GlusterVolumeOptionEntity option) {
         // update the option value if it exists, else add it
         GlusterVolumeOptionEntity existingOption = getGlusterVolume().getOption(option.getKey());
         if (existingOption != null) {
-            if(option.getValue().equalsIgnoreCase(existingOption.getValue())) {
+            if (option.getValue().equalsIgnoreCase(existingOption.getValue())) {
                 return;
             }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetUpPasswordLessSSHInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetUpPasswordLessSSHInternalCommand.java
index 665675afae9..3280efb1b00 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetUpPasswordLessSSHInternalCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SetUpPasswordLessSSHInternalCommand.java
@@ -72,7 +72,7 @@ protected void executeCommand() {
         if (canProceed) {
             List<String> errors = new ArrayList<>();
             List<ActionReturnValue> updateKeyReturnValues = updatePubKeysToRemoteHosts(pubKeys, getParameters().getDestinationHostIds(), getParameters().getUserName());
-            for(ActionReturnValue currentReturnValue : updateKeyReturnValues) {
+            for (ActionReturnValue currentReturnValue : updateKeyReturnValues) {
                 if (!currentReturnValue.getSucceeded()) {
                     errors.addAll(currentReturnValue.getExecuteFailedMessages());
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java
index fa1fbcaaee8..139bd1f0eef 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeCommand.java
@@ -42,7 +42,7 @@ protected void setActionMessageParameters() {
 
     @Override
     protected boolean validate() {
-        if(! super.validate()) {
+        if (! super.validate()) {
             return false;
         }
 
@@ -63,7 +63,7 @@ protected void executeCommand() {
                                         new GlusterVolumeActionVDSParameters(upServer.getId(),
                                                 getGlusterVolumeName(), getParameters().isForceAction()));
         setSucceeded(returnValue.getSucceeded());
-        if(getSucceeded()) {
+        if (getSucceeded()) {
             glusterDBUtils.updateVolumeStatus(getParameters().getVolumeId(), GlusterStatus.UP);
             /* Refresh volume details once the volume is started.
              * A specific requirement for this was user might create a volume for the sake of using it for geo-replication.
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
index 9ece5b1f15e..6d2af52e797 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StartGlusterVolumeGeoRepCommand.java
@@ -56,7 +56,7 @@ protected boolean validate() {
 
     @Override
     public AuditLogType getAuditLogTypeValue() {
-        if(getSucceeded()) {
+        if (getSucceeded()) {
             return AuditLogType.GLUSTER_VOLUME_GEO_REP_START;
         } else {
             return errorType == null ? AuditLogType.GLUSTER_VOLUME_GEO_REP_START_FAILED_EXCEPTION : errorType;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java
index a8cda64be3b..8c7239bdb57 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/StopGlusterVolumeCommand.java
@@ -45,7 +45,7 @@ protected void setActionMessageParameters() {
 
     @Override
     protected boolean validate() {
-        if(! super.validate()) {
+        if (! super.validate()) {
             return false;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncHealClusterVolumesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncHealClusterVolumesCommand.java
index cf364238283..1b3d11dbd57 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncHealClusterVolumesCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncHealClusterVolumesCommand.java
@@ -52,7 +52,7 @@ protected void executeCommand() {
 
     @Override
     protected boolean validate() {
-        if(cluster == null) {
+        if (cluster == null) {
             return failValidation(EngineMessage.VDS_CLUSTER_IS_NOT_VALID);
         }
         if (!cluster.supportsGlusterService()) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java
index 98a7f0aef54..49fdba9a61a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/SyncStorageDevicesCommand.java
@@ -42,7 +42,7 @@ protected boolean validate() {
 
         //Host status will not checked in case of force. Storage devices will be synced as part of host install/activation
         //and host status will not be up during host activation. So BLL will be called with force in this case.
-        if(!getParameters().isForceAction()){
+        if (!getParameters().isForceAction()) {
             HostValidator validator = HostValidator.createInstance(getVds());
             return validate(validator.isUp());
         }
@@ -62,7 +62,7 @@ protected void setActionMessageParameters() {
     protected void executeCommand() {
         VDSReturnValue returnValue =
                 runVdsCommand(VDSCommandType.GetStorageDeviceList, new VdsIdVDSCommandParametersBase(getVds().getId()));
-        if (returnValue.getSucceeded()){
+        if (returnValue.getSucceeded()) {
             List<StorageDevice> storageDevices = (List<StorageDevice>) returnValue.getReturnValue();
             getStorageDeviceSyncJobInstance().updateStorageDevices(getVds(), storageDevices);
             setSucceeded(true);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java
index 30e35e50ef3..48a9bf4eede 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommand.java
@@ -181,7 +181,7 @@ protected void executeCommand() {
 
         if (errors.size() > 0) {
             setSucceeded(false);
-            errorType =  AuditLogType.GLUSTER_HOOK_UPDATE_FAILED;
+            errorType = AuditLogType.GLUSTER_HOOK_UPDATE_FAILED;
             handleVdsErrors(getAuditLogTypeValue(), errors);
             addCustomValue(GlusterConstants.FAILURE_MESSAGE , StringUtils.join(errors, System.lineSeparator()));
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessor.java
index 4213788c453..52b520c88c6 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessor.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessor.java
@@ -23,7 +23,7 @@ public class GlusterEventsProcessor {
 
     private ConcurrentMap<String, GlusterEventSubscriber> subscribers = new ConcurrentHashMap<>();
 
-    public GlusterEventsProcessor(){
+    public GlusterEventsProcessor() {
         subscribers.put("EVENT_GEOREP_.*", Injector.injectMembers(new GeorepEventSubscriber()));
         subscribers.put("BRICK.*", Injector.injectMembers(new GlusterBrickEventSubscriber()));
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
index 834a96eff3d..4d1a2421019 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTaskUtils.java
@@ -210,16 +210,16 @@ public void updateSteps(Cluster cluster, GlusterAsyncTask task, List<Step> steps
 
     public void logEventMessage(GlusterAsyncTask task, JobExecutionStatus oldStatus, Cluster cluster) {
         GlusterVolumeEntity volume = volumeDao.getVolumeByGlusterTask(task.getTaskId());
-        if ( volume == null){
-            if(task.getTaskParameters() != null) {
+        if ( volume == null) {
+            if (task.getTaskParameters() != null) {
                 String volName = task.getTaskParameters().getVolumeName();
                 volume = volumeDao.getByName(cluster.getId(), volName);
             } else {
                 return;
             }
         }
-        if (JobExecutionStatus.ABORTED == task.getStatus() || JobExecutionStatus.FINISHED == task.getStatus() || JobExecutionStatus.FAILED == task.getStatus()){
-            if(oldStatus != task.getStatus()){
+        if (JobExecutionStatus.ABORTED == task.getStatus() || JobExecutionStatus.FINISHED == task.getStatus() || JobExecutionStatus.FAILED == task.getStatus()) {
+            if (oldStatus != task.getStatus()) {
                 logMessage(cluster.getId(), volume , taskTypeStrMap.get(task.getType()), task.getStatus().name().toLowerCase(), taskTypeAuditMsg.get(task.getType()));
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTasksService.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTasksService.java
index 55011e97f32..171811f7a83 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTasksService.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/gluster/tasks/GlusterTasksService.java
@@ -42,10 +42,10 @@ public Map<Guid, GlusterAsyncTask> getTaskListForCluster(Guid id) {
             log.info("No up server in cluster");
             return null;
         }
-        VDSReturnValue returnValue =runVdsCommand(VDSCommandType.GlusterTasksList,
+        VDSReturnValue returnValue = runVdsCommand(VDSCommandType.GlusterTasksList,
                 new VdsIdVDSCommandParametersBase(upServer.getId()));
         if (returnValue.getSucceeded()) {
-            List<GlusterAsyncTask> tasks = (List<GlusterAsyncTask>)returnValue.getReturnValue();
+            List<GlusterAsyncTask> tasks = (List<GlusterAsyncTask>) returnValue.getReturnValue();
             Map<Guid, GlusterAsyncTask> tasksMap = new HashMap<>();
             for (GlusterAsyncTask task: tasks) {
                 tasksMap.put(task.getTaskId(), task);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/KatelloProvider.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/KatelloProvider.java
index 51c4c80f81c..69d6f2ab8b7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/KatelloProvider.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/KatelloProvider.java
@@ -25,7 +25,7 @@
 /**
  * A base class for Katello providers
  */
-public abstract class KatelloProvider  implements ContentHostProvider {
+public abstract class KatelloProvider implements ContentHostProvider {
 
     private static final Logger log = LoggerFactory.getLogger(KatelloProvider.class);
     protected static final Integer UNLIMITED_PAGE_SIZE = 999999;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
index ee79a8c5bb9..df6def7f314 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/AddVdsCommand.java
@@ -101,7 +101,7 @@ public class AddVdsCommand<T extends AddVdsActionParameters> extends VdsCommand<
     @Inject
     private AffinityValidator affinityValidator;
 
-    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> {};
+    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> { };
     /**
      * Constructor for command creation when compensation is applied on startup
      */
@@ -434,7 +434,7 @@ private String getInstalledVdsIdIfExists(SSHClient client) {
             ByteArrayOutputStream out = new ConstraintByteArrayOutputStream(256);
             client.executeCommand(Config.getValue(ConfigValues.GetVdsmIdByVdsmToolCommand), null, out, err);
             return new String(out.toByteArray(), StandardCharsets.UTF_8).trim();
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.warn(
                     "Failed to initiate vdsm-id request on host: {} with error: {}",
                     e.getMessage(),
@@ -512,8 +512,8 @@ private boolean isValidGlusterPeer(SSHClient sshclient, Guid clusterId) {
                 // Must not allow adding a server that already is part of another gluster cluster
                 Set<String> peers = glusterUtil.getPeers(sshclient);
                 if (peers.size() > 0) {
-                    for(String peer : peers) {
-                        if(glusterDBUtils.serverExists(clusterId, peer)) {
+                    for (String peer : peers) {
+                        if (glusterDBUtils.serverExists(clusterId, peer)) {
                             // peer present in cluster. so server being added is valid.
                             return true;
                         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
index a9df0fa0da7..26207c31527 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/InstallVdsInternalCommand.java
@@ -154,8 +154,8 @@ protected void executeCommand() {
 
             runAnsibleHostDeployPlaybook();
             List<VDS> hostlist = vdsDao.getAllForCluster(getClusterId());
-            hostlist =  getOnlyActiveHosts(hostlist);
-            if(getVds().getClusterSupportsGlusterService() && getParameters().getReplaceHostConfiguration()!=null && getParameters().
+            hostlist = getOnlyActiveHosts(hostlist);
+            if (getVds().getClusterSupportsGlusterService() && getParameters().getReplaceHostConfiguration() != null && getParameters().
                     getReplaceHostConfiguration().getDeployAction() != ReplaceHostConfiguration.Action.NONE && hostlist.size() >= 2) {
 
                 String firstGlusterClusterNode = hostlist.get(0).getName();
@@ -167,14 +167,14 @@ protected void executeCommand() {
                 Map<VDS, String> map = glusterUtil.getGlusterIpaddressAsMap(stringNetworkMap,
                         getVds(), hostlist);
 
-                if(map != null){
+                if (map != null) {
 
                     oldGlusterClusterNode = map.get(getVds());
                     firstGlusterClusterNode = map.get(hostlist.get(0));
                     secondGlusterClusterNode = map.get(hostlist.get(1));
                 }
 
-                if(getParameters().getReplaceHostConfiguration().getDeployAction() == ReplaceHostConfiguration.Action.DIFFERENTFQDN) {
+                if (getParameters().getReplaceHostConfiguration().getDeployAction() == ReplaceHostConfiguration.Action.DIFFERENTFQDN) {
 
                     newGlusterClusterNode = getParameters().getFqdnBox(); //put the editor value here
 
@@ -186,12 +186,12 @@ protected void executeCommand() {
                 runAnsibleReconfigureGluster(oldGlusterClusterNode, firstGlusterClusterNode,
                     secondGlusterClusterNode, newGlusterClusterNode, maintenanceVds);
             } else {
-                if(getParameters().getReplaceHostConfiguration()!=null && getParameters().getReplaceHostConfiguration().getDeployAction() ==
-                        ReplaceHostConfiguration.Action.NONE){
+                if (getParameters().getReplaceHostConfiguration() != null && getParameters().getReplaceHostConfiguration().getDeployAction() ==
+                        ReplaceHostConfiguration.Action.NONE) {
                     log.info("Replace host is disabled");
-                } else if(!getVds().getClusterSupportsGlusterService()) {
+                } else if (!getVds().getClusterSupportsGlusterService()) {
                     log.info("Skipping Replace host since cluster does not support gluster");
-                } else if(vdsDao.getAllForCluster(getClusterId()).size()<3) {
+                } else if (vdsDao.getAllForCluster(getClusterId()).size() < 3) {
                     log.info("Skipping Replace host  since minimum of three hosts are required in the same cluster");
                 }
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommand.java
index 3ee363527c7..1f2d62316de 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostdeploy/UpdateVdsCommand.java
@@ -55,7 +55,7 @@
 import org.ovirt.engine.core.vdsbroker.ResourceManager;
 
 @NonTransactiveCommandAttribute(forceCompensation = true)
-public class UpdateVdsCommand<T extends UpdateVdsActionParameters>  extends VdsCommand<T>  implements RenamedEntityInfoProvider{
+public class UpdateVdsCommand<T extends UpdateVdsActionParameters> extends VdsCommand<T> implements RenamedEntityInfoProvider {
 
     @Inject
     private AuditLogDirector auditLogDirector;
@@ -99,7 +99,7 @@ public class UpdateVdsCommand<T extends UpdateVdsActionParameters>  extends VdsC
     @Inject
     private LabelDao labelDao;
 
-    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> {};
+    private BiConsumer<AuditLogable, AuditLogDirector> affinityGroupLoggingMethod = (a, b) -> { };
 
     public UpdateVdsCommand(T parameters, CommandContext cmdContext) {
         this(parameters, cmdContext, ActionType.InstallVdsInternal);
@@ -125,7 +125,7 @@ protected boolean validate() {
         // if fence agents list is null, try to fill it from database
         // so we can enable changing other host attributes from API
         // without failing validation or removing the persisted fence agents
-        boolean validateAgents=true;
+        boolean validateAgents = true;
         if (getParameters().getFenceAgents() == null) {
             getParameters().setFenceAgents(fenceAgentDao.getFenceAgentsForHost(getVdsId()));
             validateAgents = false;
@@ -183,7 +183,7 @@ protected void executeCommand() {
             InstallVdsParameters tempVar = new InstallVdsParameters(getVdsId(), getParameters().getPassword());
             tempVar.setIsReinstallOrUpgrade(getParameters().isReinstallOrUpgrade());
             tempVar.setoVirtIsoFile(getParameters().getoVirtIsoFile());
-            if (vdsDynamicDao.get(getVdsId()).getStatus() ==  VDSStatus.InstallingOS) {
+            if (vdsDynamicDao.get(getVdsId()).getStatus() == VDSStatus.InstallingOS) {
                 // TODO: remove hack when reinstall api will provider override-firewall parameter.
                 // https://bugzilla.redhat.com/show_bug.cgi?id=1177126 - for now we override firewall
                 // configurations on each deploy for provisioned host to avoid wrong deployment.
@@ -266,7 +266,7 @@ private void updateVdsData() {
             public Void runInTransaction() {
                 getCompensationContext().snapshotEntity(getVds().getStaticData());
                 vdsStaticDao.update(getParameters().getVdsStaticData());
-                updateFenceAgents();// TODO: what compensation needed for fencing?
+                updateFenceAgents(); // TODO: what compensation needed for fencing?
                 getCompensationContext().stateChanged();
                 return null;
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java
index 7944c17f75e..3f87110a42c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/hostedengine/HostedEngineHelper.java
@@ -78,17 +78,17 @@ public StorageDomainStatic getStorageDomain() {
         return storageDomainStatic;
     }
 
-    private void initHostedEngineStorageDomain(){
-        if(hostedEngineVm == null){
+    private void initHostedEngineStorageDomain() {
+        if (hostedEngineVm == null) {
             return;
         }
         List<DiskImage> diskList = hostedEngineVm.getDiskList();
-        if(diskList == null || diskList.isEmpty()){
+        if (diskList == null || diskList.isEmpty()) {
             return;
         }
         DiskImage disk = diskList.get(0);
         List<StorageDomain> allStorageDomainsByImageId = storageDomainDao.getAllStorageDomainsByImageId(disk.getImageId());
-        if(allStorageDomainsByImageId == null || allStorageDomainsByImageId.isEmpty()){
+        if (allStorageDomainsByImageId == null || allStorageDomainsByImageId.isEmpty()) {
             return;
         }
         StorageDomain storageDomain = allStorageDomainsByImageId.get(0);
@@ -120,7 +120,7 @@ public Guid getRunningHostId() {
         return hostedEngineVm.getRunOnVds();
     }
 
-    public boolean updateHaLocalMaintenanceMode(VDS vds, boolean localMaintenance){
+    public boolean updateHaLocalMaintenanceMode(VDS vds, boolean localMaintenance) {
         SetHaMaintenanceModeVDSCommandParameters param
                 = new SetHaMaintenanceModeVDSCommandParameters(vds, HaMaintenanceMode.LOCAL, localMaintenance);
         return vdsBroker.runVdsCommand(VDSCommandType.SetHaMaintenanceMode, param).getSucceeded();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionContext.java
index 69aed38d03c..a7fc1c1c436 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionContext.java
@@ -19,7 +19,7 @@
  * <li>stepsList will contain a selective list of Steps to be printed. Should be used with isMonitored = null.</li>
  * </ul>
  */
-public class ExecutionContext implements Serializable{
+public class ExecutionContext implements Serializable {
 
     /**
      * Automatic generated serial version ID
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java
index 34a64c1ab1a..c74ee9106a0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java
@@ -412,7 +412,7 @@ public void removeMessage(String message) {
 
         @Override
         public String toString() {
-            if(exclusive) {
+            if (exclusive) {
                 return "The lock is exclusive";
             }
             return "The lock is shared and a number of shared locks is " + count;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ManageNetworksParametersBuilderImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ManageNetworksParametersBuilderImpl.java
index 77299e9bbc4..46314c77c97 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ManageNetworksParametersBuilderImpl.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/ManageNetworksParametersBuilderImpl.java
@@ -58,7 +58,7 @@ public PersistentHostSetupNetworksParameters buildParameters(Guid vdsId,
                         .map(networkIdToAttachmentMap::get)
                         .collect(Collectors.toList());
 
-        updatedNetworkAttachments.forEach(networkAttachment->networkAttachment.setOverrideConfiguration(true));
+        updatedNetworkAttachments.forEach(networkAttachment -> networkAttachment.setOverrideConfiguration(true));
         updatedNetworksParams.getNetworkAttachments().addAll(updatedNetworkAttachments);
 
         final PersistentHostSetupNetworksParameters combinedParams =
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/transformer/NetworkClustersToSetupNetworksParametersTransformerImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/transformer/NetworkClustersToSetupNetworksParametersTransformerImpl.java
index 6b4c5b8aa21..943a67697b0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/transformer/NetworkClustersToSetupNetworksParametersTransformerImpl.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/cluster/transformer/NetworkClustersToSetupNetworksParametersTransformerImpl.java
@@ -133,7 +133,7 @@ private Map<Guid, List<Network>> getUpdatedNetworksByHost(Collection<NetworkClus
         for (Guid clusterId : updatesByClusterId.keySet()) {
             Map<String, Network> clusterNetworksByName = networkDao.getAllForCluster(clusterId)
                     .stream()
-                    .filter(network->idsOfUpdatedNetworks.contains(network.getId()))
+                    .filter(network -> idsOfUpdatedNetworks.contains(network.getId()))
                     .collect(Collectors.toMap(Network::getName, Function.identity()));
 
             List<VdsNetworkInterface> interfacesOfCluster = interfaceDao.getAllInterfacesByClusterId(clusterId);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java
index a020e40a9d8..655376072da 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/RemoveNetworkCommand.java
@@ -110,7 +110,7 @@ private Provider<?> getProvider() {
     }
 
     private Guid getProviderId() {
-        return (getNetwork()==null || !getNetwork().isExternal()) ?
+        return (getNetwork() == null || !getNetwork().isExternal()) ?
                 null : getNetwork().getProvidedBy().getProviderId();
     }
 
@@ -190,7 +190,7 @@ && validate(getRemoveExternalNetworkValidationResult())
 
     private ValidationResult getRemoveExternalNetworkValidationResult() {
         ProviderNetwork providerNetwork = getNetwork().getProvidedBy();
-        if (providerNetwork == null || !getParameters().isRemoveFromNetworkProvider()){
+        if (providerNetwork == null || !getParameters().isRemoveFromNetworkProvider()) {
             return ValidationResult.VALID;
         }
         ProviderValidator providerValidator = new ProviderValidator(getProvider());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
index 95ee3074dfd..84eea8b0042 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/dc/UpdateNetworkCommand.java
@@ -576,7 +576,7 @@ private static boolean labelRenamed(Network network, Network oldNetwork) {
     }
 
     private Guid getProviderId() {
-        return (getNetwork()==null || !getNetwork().isExternal()) ?
+        return (getNetwork() == null || !getNetwork().isExternal()) ?
                 null : getNetwork().getProvidedBy().getProviderId();
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
index 6832be2a1d1..7a801b8357d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksCommand.java
@@ -382,7 +382,7 @@ private void removeUnchangedBonds(List<VdsNetworkInterface> existingNics) {
 
         List<CreateOrUpdateBond> createOrUpdateBonds = getParameters().getCreateOrUpdateBonds();
         for (Iterator<CreateOrUpdateBond> iterator = createOrUpdateBonds.iterator(); iterator.hasNext();) {
-            CreateOrUpdateBond bondFromRequest =  iterator.next();
+            CreateOrUpdateBond bondFromRequest = iterator.next();
             Guid idOfBondFromRequest = bondFromRequest.getId();
 
             boolean bondFromRequestIsNewBond = idOfBondFromRequest == null;
@@ -417,7 +417,7 @@ private void removeUnchangedAttachments() {
         Map<Guid, NetworkAttachment> existingAttachmentsById = Entities.businessEntitiesById(getExistingAttachments());
 
         for (Iterator<NetworkAttachment> iterator = getParameters().getNetworkAttachments().iterator(); iterator.hasNext();) {
-            NetworkAttachment attachmentFromRequest =  iterator.next();
+            NetworkAttachment attachmentFromRequest = iterator.next();
             Guid idOfAttachmentFromRequest = attachmentFromRequest.getId();
 
             boolean attachmentFromRequestIsNewAttachment = idOfAttachmentFromRequest == null;
@@ -988,12 +988,12 @@ private List<Network> getClusterNetworks() {
         return clusterNetworks;
     }
 
-    private boolean isManagementNetworkChanged(List<HostNetwork> networksToConfigure){
+    private boolean isManagementNetworkChanged(List<HostNetwork> networksToConfigure) {
         Network managementNetwork = managementNetworkUtil.getManagementNetwork(getClusterNetworks(), getClusterId());
 
         String managementNetworkName = managementNetwork.getName();
         for (HostNetwork network : networksToConfigure) {
-            if (managementNetworkName.equals(network.getNetworkName())){
+            if (managementNetworkName.equals(network.getNetworkName())) {
                 return true;
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
index 1de7ffb21d7..2fa7a113876 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidator.java
@@ -181,15 +181,15 @@ protected ValidationResult validateBondModeVsNetworksAttachedToIt(
         Map<String, VdsNetworkInterface> hostInterfacesByNetworkName =
                 NetworkUtils.hostInterfacesByNetworkName(existingInterfaces);
 
-        for (NetworkAttachment attachment : attachmentsToConfigure){
-            if (!mustAttachementBeCheckedForBondMode(attachment, hostInterfacesByNetworkName)){
+        for (NetworkAttachment attachment : attachmentsToConfigure) {
+            if (!mustAttachementBeCheckedForBondMode(attachment, hostInterfacesByNetworkName)) {
                 continue;
             }
             CreateOrUpdateBond bondToCheck = createOrUpdateBondBusinessEntityMap.get(attachment.getNicName());
 
-            if (bondToCheck == null){
+            if (bondToCheck == null) {
                 VdsNetworkInterface existingNetworkInterfaceForAttachement = existingInterfacesMap.get(attachment.getNicName());
-                if(existingNetworkInterfaceForAttachement == null || !existingNetworkInterfaceForAttachement.isBond()){
+                if (existingNetworkInterfaceForAttachement == null || !existingNetworkInterfaceForAttachement.isBond()) {
                     continue;
                 }
                 bondToCheck = CreateOrUpdateBond.fromBond((Bond) existingNetworkInterfaceForAttachement);
@@ -197,7 +197,7 @@ protected ValidationResult validateBondModeVsNetworksAttachedToIt(
 
             String networkLabel = networkBusinessEntityMap.get(attachment.getNetworkName()).getLabel();
             ValidationResult validationResult = checkBondMode(bondToCheck, networkLabel, attachment.getNetworkName());
-            if (!validationResult.isValid()){
+            if (!validationResult.isValid()) {
                 return validationResult;
             }
         }
@@ -205,11 +205,11 @@ protected ValidationResult validateBondModeVsNetworksAttachedToIt(
     }
 
     private ValidationResult checkBondMode(CreateOrUpdateBond createOrUpdateBond, String networkLabel, String networkName) {
-        if (BondMode.isBondModeValidForVmNetwork(createOrUpdateBond.getBondOptions())){
+        if (BondMode.isBondModeValidForVmNetwork(createOrUpdateBond.getBondOptions())) {
             return ValidationResult.VALID;
         }
 
-        if (networkLabel != null && isNicToConfigureContainTheLabel(createOrUpdateBond.getName(), networkLabel)){
+        if (networkLabel != null && isNicToConfigureContainTheLabel(createOrUpdateBond.getName(), networkLabel)) {
             return new ValidationResult(EngineMessage.INVALID_BOND_MODE_FOR_BOND_WITH_LABELED_VM_NETWORK,
                     ReplacementUtils.createSetVariableString(VAR_BOND_NAME, createOrUpdateBond.getName()),
                     ReplacementUtils.createSetVariableString(VAR_LABEL, networkLabel),
@@ -222,14 +222,14 @@ private ValidationResult checkBondMode(CreateOrUpdateBond createOrUpdateBond, St
     }
 
     private boolean mustAttachementBeCheckedForBondMode(NetworkAttachment attachment,
-            Map<String, VdsNetworkInterface> hostInterfacesByNetworkName){
+            Map<String, VdsNetworkInterface> hostInterfacesByNetworkName) {
         Network network = networkBusinessEntityMap.get(attachment.getNetworkName());
         String networkName = attachment.getNetworkName();
-        if (!network.isVmNetwork()){
+        if (!network.isVmNetwork()) {
             return false;
         }
         VdsNetworkInterface nic = hostInterfacesByNetworkName.get(networkName);
-        if (nic == null){
+        if (nic == null) {
             return true;
         }
         NetworkImplementationDetails networkImplementationDetails = nic.getNetworkImplementationDetails();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/InterfaceConfigurationMapper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/InterfaceConfigurationMapper.java
index 6ba55c94eaf..be80d5dd018 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/InterfaceConfigurationMapper.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/InterfaceConfigurationMapper.java
@@ -90,7 +90,7 @@ private void calcBondsByName() {
     }
 
     private List<Nic> filterNicsWithoutManagement(List<VdsNetworkInterface> vdsNetworkInterfaces) {
-        return  filterInterfacesWithoutManagment(vdsNetworkInterfaces)
+        return filterInterfacesWithoutManagment(vdsNetworkInterfaces)
                 .stream()
                 .filter(noBondAndVlanPredicate())
                 .map(nic -> (Nic) nic)
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SyncAllClusterNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SyncAllClusterNetworksCommand.java
index e77d24dbfc4..77e7d24d2c1 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SyncAllClusterNetworksCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SyncAllClusterNetworksCommand.java
@@ -76,9 +76,9 @@ protected void executeCommand() {
     public AuditLogType getAuditLogTypeValue() {
         switch (getActionState()) {
             case EXECUTE:
-                if (!getSucceeded()){
+                if (!getSucceeded()) {
                     return CLUSTER_SYNC_ALL_NETWORKS_START_ERROR;
-                } else if (!outOfSyncHostsExist()){
+                } else if (!outOfSyncHostsExist()) {
                     return CLUSTER_SYNC_NOTHING_TO_DO;
                 } else {
                     return CLUSTER_SYNC_ALL_NETWORKS_STARTED;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidator.java
index 10f73acf19a..6141ab60377 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidator.java
@@ -46,7 +46,7 @@ public UnmanagedNetworkValidator() {
 
     public ValidationResult validate(HostSetupNetworksParameters params,
             List<VdsNetworkInterface> existingInterfaces,
-            BusinessEntityMap<Network> networkBusinessEntityMap){
+            BusinessEntityMap<Network> networkBusinessEntityMap) {
 
         ValidationResult result = validateRemovedUnmanagedNetworks(params.getRemovedUnmanagedNetworks(), existingInterfaces, networkBusinessEntityMap);
         if (!result.isValid()) {
@@ -55,7 +55,7 @@ public ValidationResult validate(HostSetupNetworksParameters params,
 
         Set<String> nicsWithUnmanagedNetworks = filterNicsWithUnmanagedNetworks(
                 existingInterfaces, params.getRemovedUnmanagedNetworks());
-        for (String nicWithUnmanagedNetwork : nicsWithUnmanagedNetworks){
+        for (String nicWithUnmanagedNetwork : nicsWithUnmanagedNetworks) {
             result = validateLabels(nicWithUnmanagedNetwork, params.getLabels());
             if (!result.isValid()) {
                 return result;
@@ -74,16 +74,16 @@ protected ValidationResult validateRemovedUnmanagedNetworks(
             Collection<VdsNetworkInterface> existingInterfaces,
             BusinessEntityMap<Network> networkBusinessEntityMap) {
 
-       for (String removedUnmanagedNetworkName : removedUnmanagedNetworks){
+       for (String removedUnmanagedNetworkName : removedUnmanagedNetworks) {
 
             Network network = networkBusinessEntityMap.get(removedUnmanagedNetworkName);
-            if (network != null){
+            if (network != null) {
                 EngineMessage engineMessage = EngineMessage.REMOVED_UNMANAGED_NETWORK_IS_A_CLUSTER_NETWORK;
                 return new ValidationResult(engineMessage,
                         ReplacementUtils.createSetVariableString(NETWORK, removedUnmanagedNetworkName));
             }
             ValidationResult result = validateNetworkIsAnUnmanagedNetworkOnHost(removedUnmanagedNetworkName, existingInterfaces);
-            if (!result.isValid()){
+            if (!result.isValid()) {
                 return result;
             }
         }
@@ -95,10 +95,10 @@ private ValidationResult validateNetworkIsAnUnmanagedNetworkOnHost(
             String removedUnmanagedNetworkName,
             Collection<VdsNetworkInterface> existingInterfaces) {
 
-        for (VdsNetworkInterface existingInterface : existingInterfaces){
+        for (VdsNetworkInterface existingInterface : existingInterfaces) {
             if (removedUnmanagedNetworkName.equals(existingInterface.getNetworkName()) &&
                 existingInterface.getNetworkImplementationDetails() != null &&
-                !existingInterface.getNetworkImplementationDetails().isManaged()){
+                !existingInterface.getNetworkImplementationDetails().isManaged()) {
                 return ValidationResult.VALID;
             }
         }
@@ -107,7 +107,7 @@ private ValidationResult validateNetworkIsAnUnmanagedNetworkOnHost(
     }
 
     ValidationResult validateLabels(String nicWithUnmanagedNetwork, Collection<NicLabel> labels) {
-        for (NicLabel label : labels){
+        for (NicLabel label : labels) {
             if (label.getNicName().equals(nicWithUnmanagedNetwork)) {
                 return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_HOST_NETWORK_LABEL_ON_UNMANAGED_NETWORK,
                         ReplacementUtils.createSetVariableString(LABEL, label.getName()),
@@ -118,7 +118,7 @@ ValidationResult validateLabels(String nicWithUnmanagedNetwork, Collection<NicLa
     }
 
     ValidationResult validateAttachements(String nicWithUnmanagedNetwork, List<NetworkAttachment> networkAttachments) {
-        for (NetworkAttachment attachement:networkAttachments){
+        for (NetworkAttachment attachement:networkAttachments) {
             if (attachement.getNicName().equals(nicWithUnmanagedNetwork)) {
                 return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_HOST_NETWORK_ATTACHEMENT_ON_UNMANAGED_NETWORK,
                         ReplacementUtils.createSetVariableString(NETWORK, attachement.getNetworkName()),
@@ -128,10 +128,10 @@ ValidationResult validateAttachements(String nicWithUnmanagedNetwork, List<Netwo
         return ValidationResult.VALID;
     }
 
-    Set<String> filterNicsWithUnmanagedNetworks( List<VdsNetworkInterface> existingInterfaces, Collection<String> removedUnmanagedNetworks){
+    Set<String> filterNicsWithUnmanagedNetworks( List<VdsNetworkInterface> existingInterfaces, Collection<String> removedUnmanagedNetworks) {
         Set<String> nicsWithUnmanagedNetworks = new HashSet<>();
-        for(VdsNetworkInterface nic : existingInterfaces){
-            if(nic.getNetworkImplementationDetails() != null && !nic.getNetworkImplementationDetails().isManaged()) {
+        for (VdsNetworkInterface nic : existingInterfaces) {
+            if (nic.getNetworkImplementationDetails() != null && !nic.getNetworkImplementationDetails().isManaged()) {
                 if (!removedUnmanagedNetworks.contains(nic.getNetworkName())) {
                     nicsWithUnmanagedNetworks.add(NetworkCommonUtils.stripVlan(nic));
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacsStorage.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacsStorage.java
index 0a40554f7f6..1d1e48821bb 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacsStorage.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/MacsStorage.java
@@ -125,7 +125,7 @@ Range getRangeWithAvailableMac() {
 
     private Range findRangeWithAvailableMac(int startIndex,
             int endIndex, int numberOfRanges) {
-        for(int i = startIndex; i < endIndex; i++) {
+        for (int i = startIndex; i < endIndex; i++) {
             Range range = ranges.get(i);
             boolean hasAvailableMacs = range.getAvailableCount() > 0;
             if (hasAvailableMacs) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ObjectCounter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ObjectCounter.java
index 9bcf6c742f9..2ec96dec861 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ObjectCounter.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/ObjectCounter.java
@@ -10,7 +10,7 @@
  * Associative array counting instances of given object.
  * @param <T> class of instances being count.
  */
-class ObjectCounter<T> implements Iterable<T>{
+class ObjectCounter<T> implements Iterable<T> {
 
     private Map<T, Counter> map = new HashMap<>();
     private final boolean allowDuplicate;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/Range.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/Range.java
index 6d4314fd13b..24e58b16d39 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/Range.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/Range.java
@@ -24,7 +24,7 @@ class Range {
 
     public Range(LongRange range) {
         this.range = range;
-        long numberOfMacsLong =  (range.getMaximumLong() - range.getMinimumLong()) + 1;
+        long numberOfMacsLong = (range.getMaximumLong() - range.getMinimumLong()) + 1;
         Validate.isTrue(numberOfMacsLong <= Integer.MAX_VALUE,
                 String.format("Range too big; Range shouldn't be bigger than %1$s, but passed one "
                         + "contains %2$s elements.", Integer.MAX_VALUE, numberOfMacsLong));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java
index cc899b2e607..e2b8d9bb4c7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpool/TransactionalMacPoolDecorator.java
@@ -89,14 +89,14 @@ private List<String> filterOutUnusedMacs(List<String> macs) {
     @Override
     public String allocateNewMac() {
         String allocatedMacAddress = super.allocateNewMac();
-        getStrategyForMacAllocation().forEach(e->e.releaseMacsInCaseOfRollback(Collections.singletonList(allocatedMacAddress)));
+        getStrategyForMacAllocation().forEach(e -> e.releaseMacsInCaseOfRollback(Collections.singletonList(allocatedMacAddress)));
         return allocatedMacAddress;
     }
 
     @Override
     public final List<String> allocateMacAddresses(int numberOfAddresses) {
         List<String> allocatedMacAddresses = super.allocateMacAddresses(numberOfAddresses);
-        getStrategyForMacAllocation().forEach(e->e.releaseMacsInCaseOfRollback(allocatedMacAddresses));
+        getStrategyForMacAllocation().forEach(e -> e.releaseMacsInCaseOfRollback(allocatedMacAddresses));
         return allocatedMacAddresses;
     }
 
@@ -104,7 +104,7 @@ public final List<String> allocateMacAddresses(int numberOfAddresses) {
     public final boolean addMac(String mac) {
         boolean added = super.addMac(mac);
         if (added) {
-            getStrategyForMacAllocation().forEach(e->e.releaseMacsInCaseOfRollback(Collections.singletonList(mac)));
+            getStrategyForMacAllocation().forEach(e -> e.releaseMacsInCaseOfRollback(Collections.singletonList(mac)));
         }
 
         return added;
@@ -116,8 +116,8 @@ public List<String> addMacs(List<String> macs) {
 
         boolean atLeastOneAddedMac = notAddedMacs.size() < macs.size();
         if (atLeastOneAddedMac) {
-            List<String> addedMacs = macs.stream().filter(e->!notAddedMacs.contains(e)).collect(toList());
-            getStrategyForMacAllocation().forEach(e->e.releaseMacsInCaseOfRollback(addedMacs));
+            List<String> addedMacs = macs.stream().filter(e -> !notAddedMacs.contains(e)).collect(toList());
+            getStrategyForMacAllocation().forEach(e -> e.releaseMacsInCaseOfRollback(addedMacs));
         }
 
         return notAddedMacs;
@@ -214,7 +214,7 @@ private class UsingTxDecoratorState implements TransactionalStrategyState {
 
         @Override
         public void releaseMacsInCaseOfRollback(List<String> macs) {
-            registerRollbackHandler((TransactionRollbackListener)() -> {
+            registerRollbackHandler((TransactionRollbackListener) () -> {
                 log.debug("Rollback occurred, releasing macs {}.", macs);
                 macPool.freeMacs(macs);
             });
@@ -222,7 +222,7 @@ public void releaseMacsInCaseOfRollback(List<String> macs) {
 
         @Override
         public void releaseMacsOnCommit(List<String> macs) {
-            registerRollbackHandler((TransactionSuccessListener)() -> {
+            registerRollbackHandler((TransactionSuccessListener) () -> {
                 log.debug("Command succeeded, releasing macs {}.", macs);
                 macPool.freeMacs(macs);
             });
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java
index 37c594d8988..ce17b049fe8 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/ActivateDeactivateVmNicCommand.java
@@ -405,27 +405,27 @@ private void clearPassthroughData(String vfToUse) {
     }
 
     private void clearAddressIfPciSlotIsDuplicated(VmDevice vmDeviceToHotplug) {
-        if (searchForDuplicatesWithExistingVmDevices(vmDeviceToHotplug)){
+        if (searchForDuplicatesWithExistingVmDevices(vmDeviceToHotplug)) {
             vmDeviceToHotplug.setAddress("");
         }
     }
 
-    private boolean searchForDuplicatesWithExistingVmDevices(VmDevice vmDeviceToHotplug){
+    private boolean searchForDuplicatesWithExistingVmDevices(VmDevice vmDeviceToHotplug) {
         String deviceAddress = vmDeviceToHotplug.getAddress();
-        if (StringUtils.isEmpty(deviceAddress)){
+        if (StringUtils.isEmpty(deviceAddress)) {
             return false;
         }
         Map<String, String> addressMapToHotplug = StringMapUtils.string2Map(deviceAddress);
         List<VmDevice> allVmDevices = vmDeviceDao.getVmDeviceByVmId(getVm().getId());
         for (VmDevice vmDevice : allVmDevices) {
-            if (!vmDeviceToHotplug.getId().equals(vmDevice.getId())){
+            if (!vmDeviceToHotplug.getId().equals(vmDevice.getId())) {
                 Map<String, String> deviceAddressMap = StringMapUtils.string2Map(vmDevice.getAddress());
                 boolean duplicatedAddress = deviceAddressMap.equals(addressMapToHotplug);
 
                 boolean ambiguousInterfaceState = StringUtils.isEmpty(vmDevice.getAddress()) && vmDevice.isPlugged()
                         && VmDeviceGeneralType.INTERFACE.equals(vmDevice.getType());
 
-                if(duplicatedAddress || ambiguousInterfaceState) {
+                if (duplicatedAddress || ambiguousInterfaceState) {
                     return true;
                 }
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
index acccc39b7db..28deac662f9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/AddVmInterfaceCommand.java
@@ -162,7 +162,7 @@ protected boolean validate() {
         Version compatibilityVersion = getVm().getClusterCompatibilityVersion();
         VmNicValidator nicValidator = new VmNicValidator(getInterface(), compatibilityVersion, getVm().getOs());
         if (!validate(nicValidator.isCompatibleWithOs())
-                ||!validate(nicValidator.isNetworkSupportedByClusterSwitchType(getCluster()))
+                || !validate(nicValidator.isNetworkSupportedByClusterSwitchType(getCluster()))
                 || !validate(nicValidator.profileValid(getVm().getClusterId()))
                 || !validate(nicValidator.typeMatchesProfile())
                 || !validate(nicValidator.passthroughIsLinked())
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterCommand.java
index cd5d8ae2baa..57a73f1f3c3 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterCommand.java
@@ -11,7 +11,7 @@
 import org.ovirt.engine.core.dao.network.VmNicFilterParameterDao;
 
 public class RemoveVmNicFilterParameterCommand<T extends RemoveVmNicFilterParameterParameters>
-        extends AbstractVmNicFilterParameterCommand<T>  {
+        extends AbstractVmNicFilterParameterCommand<T> {
 
     @Inject
     private VmNicFilterParameterDao vmNicFilterParameterDao;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterLiveCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterLiveCommand.java
index c511fe987d7..885232e742e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterLiveCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/RemoveVmNicFilterParameterLiveCommand.java
@@ -13,7 +13,7 @@
 import org.ovirt.engine.core.dao.network.VmNicFilterParameterDao;
 
 public class RemoveVmNicFilterParameterLiveCommand<T extends RemoveVmNicFilterParameterParameters>
-        extends AbstractVmNicFilterParameterCommand<T>  {
+        extends AbstractVmNicFilterParameterCommand<T> {
 
     @Inject
     private VmNicFilterParameterDao vmNicFilterParameterDao;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
index 39ff0560c30..fa42d522b25 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/UpdateVmInterfaceCommand.java
@@ -189,7 +189,7 @@ private boolean updateHost() {
             setVdsId(getVm().getRunOnVds());
         }
 
-        if (getRequiredAction() != null){
+        if (getRequiredAction() != null) {
             switch (getRequiredAction()) {
             case PLUG:
                 return activateOrDeactivateExistingNic(getInterface(), PlugAction.PLUG);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommandBase.java
index 2a06aa48038..becf658eaf7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/vm/VnicProfileCommandBase.java
@@ -35,15 +35,15 @@ protected VnicProfile getVnicProfile() {
         return getParameters().getVnicProfile();
     }
 
-    protected void setNetworkFilterId(Guid networkFilterId){
+    protected void setNetworkFilterId(Guid networkFilterId) {
         getVnicProfile().setNetworkFilterId(networkFilterId);
     }
 
-    protected Guid getNetworkId(){
+    protected Guid getNetworkId() {
         return getNetwork().getId();
     }
 
-    protected Guid getNetworkFilterId(){
+    protected Guid getNetworkFilterId() {
         return getVnicProfile().getNetworkFilterId();
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java
index 997c3ef3717..f67ebbf8e56 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java
@@ -72,7 +72,7 @@ public class PmHealthCheckManager implements BackendService {
      */
     @PostConstruct
     private void initialize() {
-        if(Config.<Boolean>getValue(ConfigValues.PMHealthCheckEnabled)) {
+        if (Config.<Boolean>getValue(ConfigValues.PMHealthCheckEnabled)) {
             log.info("Start initializing {}", getClass().getSimpleName());
             long pmHealthCheckInterval = Config.<Long> getValue(ConfigValues.PMHealthCheckIntervalInSec);
             executor.scheduleWithFixedDelay(this::pmHealthCheck,
@@ -279,7 +279,7 @@ public void startHosts(List<VDS> hostWithPMInStatusReboot) {
                 }
                 ActionReturnValue
                         retValue = backend.get().runInternalAction(ActionType.RestartVds, restartVdsCommand.getParameters());
-                if (retValue!= null && retValue.getSucceeded()) {
+                if (retValue != null && retValue.getSucceeded()) {
                     log.info("Host '{}' was started successfully by PM Health Check Manager",
                             host.getName());
                 } else {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SingleAgentFenceActionExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SingleAgentFenceActionExecutor.java
index 3a2dcef4bf0..c849826ec05 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SingleAgentFenceActionExecutor.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SingleAgentFenceActionExecutor.java
@@ -30,7 +30,7 @@
  *     <li>Usage of {@code FenceAgentExecutor} to execute "simple" fence actions</li>
  * </ul>
  */
-public class SingleAgentFenceActionExecutor implements FenceActionExecutor{
+public class SingleAgentFenceActionExecutor implements FenceActionExecutor {
     private static final Logger log = LoggerFactory.getLogger(SingleAgentFenceActionExecutor.class);
 
     private AuditLogDirector auditLogDirector;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SshSoftFencingCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SshSoftFencingCommand.java
index 247a4834998..37f57bfe46b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SshSoftFencingCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/SshSoftFencingCommand.java
@@ -104,7 +104,7 @@ private boolean executeSshSoftFencingCommand(String version) {
                         cmdErr);
                 log.debug("Exception", ex);
             }
-        } catch(IOException e) {
+        } catch (IOException e) {
             log.error("IOException", e);
         }
         return ret;
@@ -124,10 +124,10 @@ private boolean checkIfHostBecomeUp() {
         // and another host will be selected for the SPM role.
         long graceTime = TimeUnit.SECONDS.toMillis(
                 Config.<Integer>getValue(ConfigValues.TimeoutToResetVdsInSeconds));
-        long passedTime=0;
+        long passedTime = 0;
         log.info("Waiting to host {} {} seconds to become up after soft fencing execution",
                 vdsManager.getCopyVds().getHostName(),
-                graceTime/100);
+                graceTime / 100);
         while (passedTime <= graceTime) {
             if (vdsManager.getCopyVds().getStatus() == VDSStatus.Up) {
                 // host became Up during grace period
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/VdsNotRespondingTreatmentCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/VdsNotRespondingTreatmentCommand.java
index 38cd400ae20..4007be3027a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/VdsNotRespondingTreatmentCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/VdsNotRespondingTreatmentCommand.java
@@ -267,7 +267,7 @@ private boolean isConnectivityBrokenThresholdReached(VDS vds) {
             double hostsNumber = hosts.size();
             double hostsWithBrokenConnectivityNumber =
                     hosts.stream().filter(h -> h.getStatus() == VDSStatus.Connecting || h.getStatus() == VDSStatus.NonResponsive).count();
-            percents = (int) ((hostsWithBrokenConnectivityNumber/hostsNumber)*100);
+            percents = (int) ((hostsWithBrokenConnectivityNumber / hostsNumber) * 100);
             result = percents >= cluster.getFencingPolicy().getHostsWithBrokenConnectivityThreshold();
         }
         if (result) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java
index 7dd8b83b44f..fa985e7800d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/AddProfileCommandBase.java
@@ -27,7 +27,7 @@ protected void executeCommand() {
         getProfileDao().save(getParameters().getProfile());
         getReturnValue().setActionReturnValue(getParameters().getProfile().getId());
 
-        if(getParameters().isAddPermissions()) {
+        if (getParameters().isAddPermissions()) {
             addPermissions();
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelper.java
index 0e49e46d6c3..e552f15602a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelper.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelper.java
@@ -61,7 +61,7 @@ public ValidationResult setAndValidateCpuProfile(VmBase vmBase, Guid userId) {
             return assignFirstCpuProfile(vmBase, userId);
         }
 
-        Guid clusterId =  vmBase.getClusterId();
+        Guid clusterId = vmBase.getClusterId();
         if (clusterId == null) {
             return new ValidationResult(EngineMessage.ACTION_TYPE_CPU_PROFILE_CLUSTER_NOT_PROVIDED);
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderValidator.java
index 8ce2cdcaa44..430d7d57e66 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ProviderValidator.java
@@ -127,7 +127,7 @@ public ValidationResult validateRemoveProvider() {
      * Validate that this action can be performed for read only providers
      */
     public ValidationResult validateReadOnlyActions() {
-        if (provider.getType() != ProviderType.EXTERNAL_NETWORK){
+        if (provider.getType() != ProviderType.EXTERNAL_NETWORK) {
             return ValidationResult.VALID;
         }
         boolean isReadOnly = ((OpenstackNetworkProviderProperties) provider.getAdditionalProperties()).getReadOnly();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/UnmanagedNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/UnmanagedNetworkProviderProxy.java
index 4bf48022a96..c1744bd22a5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/UnmanagedNetworkProviderProxy.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/UnmanagedNetworkProviderProxy.java
@@ -40,7 +40,7 @@ public String add(Network network) {
     }
 
     @Override
-    public void remove(String id) {}
+    public void remove(String id) { }
 
     @Override
     public List<Network> getAll() {
@@ -85,10 +85,10 @@ public Map<String, String> allocate(Network network, VnicProfile vnicProfile, Vm
     }
 
     @Override
-    public void deallocate(VmNic nic) {}
+    public void deallocate(VmNic nic) { }
 
     @Override
-    public void testConnection() {}
+    public void testConnection() { }
 
     @Override
     public ProviderValidator getProviderValidator() {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/BaseNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/BaseNetworkProviderProxy.java
index c9d38dfc1d5..2d8ec0b396b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/BaseNetworkProviderProxy.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/BaseNetworkProviderProxy.java
@@ -226,7 +226,7 @@ public Map<String, String> allocate(
         Network network, VnicProfile vnicProfile, VmNic nic, VDS host,
         boolean ignoreSecurityGroupsOnUpdate, String hostBindingId) {
 
-        if (hostBindingId==null) {
+        if (hostBindingId == null) {
             hostBindingId = host.getHostName();
             log.warn("Host binding id for external network {} on host {} is null, using host id {} to allocate vNIC " +
                     " {} instead. Please provide an after_get_caps hook for the plugin type {} on host {}",
@@ -374,7 +374,7 @@ private static class ApiRootResponse {
 
     @Override
     public Provider<P> getProvider() {
-        return (Provider<P>)super.getProvider();
+        return (Provider<P>) super.getProvider();
     }
 
     private <R> R execute(OpenStackRequest<R> request) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/ExternalNetworkProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/ExternalNetworkProviderProxy.java
index 08e9a29d4ce..32a54d9e586 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/ExternalNetworkProviderProxy.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/ExternalNetworkProviderProxy.java
@@ -50,12 +50,12 @@ public void removeSubnet(String id) {
         super.removeSubnet(id);
     }
 
-    private boolean isReadOnly(){
+    private boolean isReadOnly() {
         return getProvider().getAdditionalProperties().getReadOnly();
     }
 
     private void testProviderIsNotReadOnly() {
-        if (isReadOnly()){
+        if (isReadOnly()) {
             throw new EngineException(EngineError.NO_IMPLEMENTATION);
         }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/KeystoneV3TokenProvider.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/KeystoneV3TokenProvider.java
index 07121fb193e..96af907887a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/KeystoneV3TokenProvider.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/network/openstack/KeystoneV3TokenProvider.java
@@ -26,7 +26,7 @@ public void expireToken() {
     @Override
     public String getToken() {
         if (token == null) {
-            token =  createToken();
+            token = createToken();
         }
         return token;
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackImageProviderProxy.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackImageProviderProxy.java
index 4ff67960c1c..04c5e0b6358 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackImageProviderProxy.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/storage/OpenStackImageProviderProxy.java
@@ -103,7 +103,7 @@ public static OpenStackImageProviderProxy getFromStorageDomainId(Guid storageDom
     @Override
     protected Glance getClient() {
         if (client == null) {
-            client = new Glance(getProvider().getUrl() + API_VERSION,  new CustomizedRESTEasyConnector());
+            client = new Glance(getProvider().getUrl() + API_VERSION, new CustomizedRESTEasyConnector());
             if (getProvider().isRequiringAuthentication()) {
                 setClientTokenProvider(client);
             }
@@ -170,7 +170,7 @@ public List<RepoImage> getAllImagesAsRepoImages(Integer listSize, Integer totalL
                 repoImage.setLastRefreshed(currentTime);
                 repoImages.add(repoImage);
             }
-        } while(images.getList().size() >= listSize &&
+        } while (images.getList().size() >= listSize &&
                 totalListSize != null && repoImages.size() < totalListSize);
 
         return repoImages;
@@ -316,7 +316,7 @@ public String getImageUrl(Version compatibilityVersion, String id) {
     }
 
     private String getImageUrl(String apiVersion, String id) {
-        return removeTrailingSlash(getProvider().getUrl()) + apiVersion  + "/images/" + id;
+        return removeTrailingSlash(getProvider().getUrl()) + apiVersion + "/images/" + id;
     }
 
     private String removeTrailingSlash(String s) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/InvalidQuotaParametersException.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/InvalidQuotaParametersException.java
index 3bf5012ca1a..c69b9a09e5f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/InvalidQuotaParametersException.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/InvalidQuotaParametersException.java
@@ -8,7 +8,7 @@ public class InvalidQuotaParametersException extends RuntimeException {
     public InvalidQuotaParametersException() {
     }
 
-    public InvalidQuotaParametersException(String errorStr){
+    public InvalidQuotaParametersException(String errorStr) {
         super(errorStr);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaConsumptionParameter.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaConsumptionParameter.java
index a80d8d04bf8..6c1548104a9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaConsumptionParameter.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaConsumptionParameter.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public abstract class QuotaConsumptionParameter implements Cloneable{
+public abstract class QuotaConsumptionParameter implements Cloneable {
     private Guid quotaGuid;
     private QuotaAction quotaAction;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java
index bc72f28b86b..b8b8995e836 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java
@@ -379,7 +379,7 @@ private synchronized void updateQuotaCacheImpl() {
             lock.writeLock().unlock();
         }
         long timeEnd = System.currentTimeMillis();
-        log.info("Quota Cache updated. ({} msec)", timeEnd-timeStart);
+        log.info("Quota Cache updated. ({} msec)", timeEnd - timeStart);
     }
 
     public boolean isCacheUpdateNeeded() {
@@ -388,14 +388,14 @@ public boolean isCacheUpdateNeeded() {
 
         lock.readLock().lock();
         try {
-            for(Map<Guid, Quota> quotaMap : storagePoolQuotaMap.values()) {
+            for (Map<Guid, Quota> quotaMap : storagePoolQuotaMap.values()) {
                 cacheCount += quotaMap.size();
             }
         } finally {
             lock.readLock().unlock();
         }
 
-        return cacheCount < quotaCount * Config.<Integer> getValue(ConfigValues.MinimumPercentageToUpdateQuotaCache)/100;
+        return cacheCount < quotaCount * Config.<Integer> getValue(ConfigValues.MinimumPercentageToUpdateQuotaCache) / 100;
     }
 
     public boolean isVmStatusQuotaCountable(VMStatus status) {
@@ -464,7 +464,7 @@ private boolean consumeQuotaParameters(List<QuotaConsumptionParameter> parameter
         // Validate that all requests satisfy the quota limits
         for (Request request : requests.get()) {
             ValidationResult validation = request.validate(hardEnforcement, auditLogger);
-            if(!validation.isValid()) {
+            if (!validation.isValid()) {
                 command.getReturnValue().getValidationMessages().addAll(validation.getMessagesAsStrings());
                 return false;
             }
@@ -494,7 +494,7 @@ private Optional<List<Request>> createRequests(List<QuotaConsumptionParameter> p
 
         for (QuotaConsumptionParameter param: parameters) {
             // Use default quota if the id is empty
-            if(Guid.isNullOrEmpty(param.getQuotaGuid())) {
+            if (Guid.isNullOrEmpty(param.getQuotaGuid())) {
                 param.setQuotaGuid(storagePoolDefaultQuotaIdMap.get(command.getStoragePoolId()));
             }
 
@@ -555,7 +555,7 @@ private ValidationResult validateAndAddToClusterRequests(QuotaClusterConsumption
             return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_QUOTA_IS_NOT_VALID);
         }
 
-        Pair<Guid, Guid> key = quota.isGlobalClusterQuota()?
+        Pair<Guid, Guid> key = quota.isGlobalClusterQuota() ?
                 new Pair<>(quota.getId(), null) :
                 new Pair<>(quota.getId(), param.getClusterId());
 
@@ -668,7 +668,7 @@ public Quota getQuota() {
     /**
      * Request for cluster quota
      */
-    private class ClusterRequest extends Request{
+    private class ClusterRequest extends Request {
         private QuotaCluster quotaCluster;
         private int coresRequest = 0;
         private long memoryRequestMB = 0L;
@@ -702,7 +702,7 @@ public ValidationResult validate(boolean hardEnforcement, QuotaManagerAuditLogge
             }
 
             // Valid if the request releases quota, not consumes it.
-            if (coresRequest <=0 && memoryRequestMB <= 0) {
+            if (coresRequest <= 0 && memoryRequestMB <= 0) {
                 return ValidationResult.VALID;
             }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java
index b29144861de..65ef0f5391c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManagerAuditLogger.java
@@ -88,7 +88,7 @@ public void logClusterGraceExceeded(String quotaName,
         addClusterRequested(cpuRequestPercentage, memRequestPercentage);
 
         auditLogDirector.log(auditLogable, hardEnforcement ?
-                AuditLogType.USER_EXCEEDED_QUOTA_CLUSTER_GRACE_LIMIT:
+                AuditLogType.USER_EXCEEDED_QUOTA_CLUSTER_GRACE_LIMIT :
                 AuditLogType.USER_EXCEEDED_QUOTA_CLUSTER_GRACE_LIMIT_PERMISSIVE_MODE);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java
index 9626ae5fa3a..d97fd9649e2 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/HaReservationHandling.java
@@ -91,7 +91,7 @@ private boolean findReplacementForHost(Cluster cluster, VDS host,
 
         for (VM vm : vmList) {
             int curVmMemSize = 0;
-            if(vm.getUsageMemPercent() != null) {
+            if (vm.getUsageMemPercent() != null) {
                 curVmMemSize = (int) Math.round(vm.getMemSizeMb() * (vm.getUsageMemPercent() / 100.0));
             }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/OvirtGlusterSchedulingService.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/OvirtGlusterSchedulingService.java
index 61b72690e9a..bdd4792ad19 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/OvirtGlusterSchedulingService.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/OvirtGlusterSchedulingService.java
@@ -134,7 +134,7 @@ public void programmaticTimeout(Timer config) {
                 clazz = Class.forName(job.getJobClassName());
             }
             methodToRun = clazz.getDeclaredMethod(job.getJobName(), (Class<?>[]) parameterTypes);
-            if(methodToRun == null) {
+            if (methodToRun == null) {
                 log.error("could not find the required method '{}' on instance of {}",
                         job.getJobName(),
                         clazz.getClass().getSimpleName());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingContext.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingContext.java
index 54b88994b31..0ffda388141 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingContext.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingContext.java
@@ -47,7 +47,7 @@ public SchedulingContext(Cluster cluster, Map<String, String> policyParameters)
         this(cluster, policyParameters, false, false);
     }
 
-    public Cluster  getCluster() {
+    public Cluster getCluster() {
         return cluster;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
index b95f13045a6..8bbb6d5a614 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
@@ -291,7 +291,7 @@ private void loadPolicyUnits() {
             try {
                 PolicyUnitImpl unit = InternalPolicyUnits.instantiate(unitType, getPendingResourceManager());
                 policyUnits.put(unit.getGuid(), Injector.injectMembers(unit));
-            } catch (Exception e){
+            } catch (Exception e) {
                 log.error("Could not instantiate a policy unit {}.", unitType.getName(), e);
             }
         }
@@ -300,7 +300,7 @@ private void loadPolicyUnits() {
             try {
                 PolicyUnitImpl unit = InternalPolicyUnits.instantiate(mandatoryUnitType, getPendingResourceManager());
                 mandatoryFilters.add(Injector.injectMembers(unit));
-            } catch (Exception e){
+            } catch (Exception e) {
                 log.error("Could not instantiate a policy unit {}.", mandatoryUnitType.getName(), e);
             }
         }
@@ -539,7 +539,7 @@ private void updateHostNumaNodes(VDS host, Map<Integer, NumaNodeMemoryConsumptio
         }
     }
 
-    private void addPendingResources(VM vm, VDS host, Map<Integer, NumaNodeMemoryConsumption> numaConsumption, List<VdsCpuUnit>  dedicatedCpus) {
+    private void addPendingResources(VM vm, VDS host, Map<Integer, NumaNodeMemoryConsumption> numaConsumption, List<VdsCpuUnit> dedicatedCpus) {
         int numOfCpus = VmCpuCountHelper.getRuntimeNumOfCpu(vm, host);
         int numOfCores = VmCpuCountHelper.getRuntimeNumOfCores(vm, host);
         Guid hostId = host.getId();
@@ -578,7 +578,7 @@ private void addPendingResources(VM vm, VDS host, Map<Integer, NumaNodeMemoryCon
         }
     }
 
-    private  Map<Guid, Map<Integer, NumaNodeMemoryConsumption>> vmNumaRequirements(List<VM> vmGroup, VDS host) {
+    private Map<Guid, Map<Integer, NumaNodeMemoryConsumption>> vmNumaRequirements(List<VM> vmGroup, VDS host) {
         List<VM> filteredVms = vmGroup.stream()
                 .filter(vm -> vm.getvNumaNodeList().stream().map(VmNumaNode::getNumaTuneMode)
                         .allMatch(tune -> tune != NumaTuneMode.PREFERRED))
@@ -786,7 +786,7 @@ private Optional<Guid> selectBestHost(List<VM> vmGroup,
             runnableHosts = availableVdsList;
         }
 
-        switch (runnableHosts.size()){
+        switch (runnableHosts.size()) {
         case 0:
             // no runnable hosts found, nothing found
             return Optional.empty();
@@ -1182,10 +1182,10 @@ public Set<Guid> positiveAffinityClosure(Cluster cluster, List<Guid> vms) {
     }
 
     public boolean isHostAffinityMoreImportantThanVmAffinity(Cluster cluster) {
-        Guid hostAffinityPolicyUnitId =  Guid.createGuidFromString(
+        Guid hostAffinityPolicyUnitId = Guid.createGuidFromString(
                 VmToHostAffinityWeightPolicyUnit.class.getAnnotation(SchedulingUnit.class).guid());
 
-        Guid vmAffinityPolicyUnitId =  Guid.createGuidFromString(
+        Guid vmAffinityPolicyUnitId = Guid.createGuidFromString(
                 VmAffinityWeightPolicyUnit.class.getAnnotation(SchedulingUnit.class).guid());
 
         ClusterPolicy policy = policyMap.get(cluster.getClusterPolicyId());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java
index a68b56a449f..a3f9ba34486 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesEnforcer.java
@@ -123,7 +123,7 @@ private Pair<Iterable<Guid>, Iterable<Guid>> getCandidateVmsFromVmsToHostAffinit
                 .collect(Collectors.toList());
 
         if (allVmToHostsAffinityGroups.isEmpty()) {
-            return new Pair<>(IteratorUtils::emptyIterator,  IteratorUtils::emptyIterator);
+            return new Pair<>(IteratorUtils::emptyIterator, IteratorUtils::emptyIterator);
         }
 
         List<Guid> vmIds = allVmToHostsAffinityGroups.stream()
@@ -363,7 +363,7 @@ private Map<Guid, List<Guid>> groupVmsByHostFiltered(Cache cache, List<Guid> vms
         Set<Guid> removedHosts = new HashSet<>();
 
         Map<Guid, List<Guid>> res = new HashMap<>();
-        for(Guid vmId : vms) {
+        for (Guid vmId : vms) {
             VM vm = cache.getVm(vmId);
 
             Guid host = vm.getRunOnVds();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java
index d4d7891f553..6fbaa0f255b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/arem/AffinityRulesUtils.java
@@ -76,11 +76,11 @@ public static Set<Set<Guid>> getUnifiedPositiveAffinityGroups(List<AffinityGroup
 
         // Go through each positive affinity group and merge all existing groups
         // that contain the referenced VMs into one.
-        for(AffinityGroup ag : affinityGroups) {
-            if(ag.isVmPositive()) {
+        for (AffinityGroup ag : affinityGroups) {
+            if (ag.isVmPositive()) {
                 Set<Guid> mergedGroup = new HashSet<>();
 
-                for(Guid id : ag.getVmIds()) {
+                for (Guid id : ag.getVmIds()) {
                     // Get the current groups VM(id) belongs to
                     Set<Guid> existingGroup = vmIndex.get(id);
 
@@ -114,7 +114,7 @@ public static Set<Set<Guid>> getUnifiedPositiveAffinityGroups(List<AffinityGroup
     static List<AffinityGroup> setsToAffinityGroups(Set<Set<Guid>> uag) {
         List<AffinityGroup> output = new ArrayList<>(uag.size());
 
-        for(Set<Guid> s : uag) {
+        for (Set<Guid> s : uag) {
             AffinityGroup temp = new AffinityGroup();
             temp.setVmAffinityRule(EntityAffinityRule.POSITIVE);
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AddVmLabelToAffinityGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AddVmLabelToAffinityGroupCommand.java
index 60b2833beb0..0a7c2155db5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AddVmLabelToAffinityGroupCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/AddVmLabelToAffinityGroupCommand.java
@@ -9,7 +9,7 @@
 import org.ovirt.engine.core.dao.scheduling.AffinityGroupDao;
 
 public class AddVmLabelToAffinityGroupCommand <T extends AffinityGroupMemberChangeParameters>
-        extends EditAffinityGroupCommand<T>{
+        extends EditAffinityGroupCommand<T> {
     @Inject
     private AffinityGroupDao affinityGroupDao;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
index 480e10ad566..1306bceec8f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
@@ -52,7 +52,7 @@ protected boolean checkAddEditValidations() {
         // check filter policy units
         if (getClusterPolicy().getFilters() != null) {
             for (Guid filterId : getClusterPolicy().getFilters()) {
-                if(isPolicyUnitExists(filterId, existingPolicyUnits)) {
+                if (isPolicyUnitExists(filterId, existingPolicyUnits)) {
                     return failValidation(EngineMessage.ACTION_TYPE_FAILED_CLUSTER_POLICY_DUPLICATE_POLICY_UNIT);
                 }
                 PolicyUnitImpl policyUnitImpl = map.get(filterId);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/RemoveExternalPolicyUnitCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/RemoveExternalPolicyUnitCommand.java
index b7338d85b1d..facdc31c543 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/RemoveExternalPolicyUnitCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/RemoveExternalPolicyUnitCommand.java
@@ -26,7 +26,7 @@ public RemoveExternalPolicyUnitCommand(RemoveExternalPolicyUnitParameters parame
 
     @Override
     protected boolean validate() {
-        if(!schedulingManager.getPolicyUnitsMap().containsKey(getPolicyUnitId())){
+        if (!schedulingManager.getPolicyUnitsMap().containsKey(getPolicyUnitId())) {
             return failValidation(EngineMessage.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
         }
         List<String> clusterPoliciesNames =
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerObjectBuilder.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerObjectBuilder.java
index 2a66b7a2939..75ca1523739 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerObjectBuilder.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerObjectBuilder.java
@@ -61,7 +61,7 @@ private static Object populateCommonFields(Object xmlRpcStruct, SchedulerResult
 
         if (result.getResultCode() != RESULT_OK) {
             plugin_errors = (Map<String, Object[]>) castedResult.get("plugin_errors");
-            errors = (Object[])castedResult.get("errors");
+            errors = (Object[]) castedResult.get("errors");
 
             if (plugin_errors != null) {
                 for (Map.Entry<String, Object[]> entry: plugin_errors.entrySet()) {
@@ -74,8 +74,8 @@ private static Object populateCommonFields(Object xmlRpcStruct, SchedulerResult
 
             if (errors != null) {
                 for (Object msg: errors) {
-                    auditLogExternalSchedulerError((String)msg);
-                    result.addError((String)msg);
+                    auditLogExternalSchedulerError((String) msg);
+                    result.addError((String) msg);
                 }
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscovery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscovery.java
index 85f595250f7..52349ea6d88 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscovery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscovery.java
@@ -38,7 +38,7 @@ public class ExternalSchedulerDiscovery {
     @Inject
     private AuditLogDirector auditLogDirector;
 
-    protected ExternalSchedulerDiscovery() {}
+    protected ExternalSchedulerDiscovery() { }
 
     /**
      * Discover external schedulers and process its policy units. This operation may take time and is recommended to run
@@ -99,7 +99,7 @@ private void markExternalPoliciesAsDisabled(List<PolicyUnit> units) {
         }
     }
 
-    public void markAllExternalPoliciesAsDisabled(){
+    public void markAllExternalPoliciesAsDisabled() {
         markExternalPoliciesAsDisabled(policyUnitDao.getAll());
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryUnit.java
index 8fcaa3b588e..7216f4d2b77 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryUnit.java
@@ -1,6 +1,6 @@
 package org.ovirt.engine.core.bll.scheduling.external;
 
-public class ExternalSchedulerDiscoveryUnit{
+public class ExternalSchedulerDiscoveryUnit {
     private String name;
     private String description;
     private String regex;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/FilteringResult.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/FilteringResult.java
index 7a17e5ea51c..d256c860301 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/FilteringResult.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/FilteringResult.java
@@ -12,7 +12,7 @@ public void addHost(Guid host) {
         possibleHosts.add(host);
     }
 
-    public List<Guid> getHosts(){
+    public List<Guid> getHosts() {
         return possibleHosts;
     }
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManager.java
index e2d040a2aae..85267e21315 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManager.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManager.java
@@ -154,7 +154,7 @@ public void addPending(PendingResource resource) {
      */
     public <T extends PendingResource> List<T> pendingHostResources(Guid host, Class<T> type) {
         return collectResources(resourcesByHost, host, res -> res.getClass().equals(type)).stream()
-                .map(r -> (T)r)
+                .map(r -> (T) r)
                 .collect(Collectors.toList());
     }
 
@@ -166,7 +166,7 @@ public <T extends PendingResource> List<T> pendingHostResources(Guid host, Class
      */
     public <T extends PendingResource> List<T> pendingVmResources(Guid vm, Class<T> type) {
         return collectResources(resourcesByVm, vm, res -> res.getClass().equals(type)).stream()
-                .map(r -> (T)r)
+                .map(r -> (T) r)
                 .collect(Collectors.toList());
     }
 
@@ -191,7 +191,7 @@ private static List<PendingResource> collectResources(Map<Guid, Set<PendingResou
      * @return The actual pending resource
      */
     public <T extends PendingResource> T getExactPendingResource(T template) {
-        return (T)pendingResources.get(template);
+        return (T) pendingResources.get(template);
     }
 
     /**
@@ -203,7 +203,7 @@ public <T extends PendingResource> Iterable<T> pendingResources(Class<T> type) {
         List<T> list = new ArrayList<>();
         for (PendingResource resource: pendingResources.values()) {
             if (resource.getClass().equals(type)) {
-                list.add((T)resource);
+                list.add((T) resource);
             }
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingVM.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingVM.java
index 9f238c984bb..75f8a541159 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingVM.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/pending/PendingVM.java
@@ -42,7 +42,7 @@ public static Set<Guid> collectForHost(PendingResourceManager manager, Guid host
     }
 
     public static Guid getScheduledHost(PendingResourceManager manager, VM vm) {
-        PendingVM template = new PendingVM((Guid)null, vm);
+        PendingVM template = new PendingVM((Guid) null, vm);
         PendingVM pending = manager.getExactPendingResource(template);
         return pending == null ? null : pending.getHost();
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EmulatedMachineFilterPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EmulatedMachineFilterPolicyUnit.java
index 99c354978e5..9c821d74dee 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EmulatedMachineFilterPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EmulatedMachineFilterPolicyUnit.java
@@ -49,7 +49,7 @@ public List<VDS> filter(SchedulingContext context, List<VDS> hosts, VM vm, PerHo
         /* find compatible hosts */
         for (VDS host : hosts) {
             String supportedEmulatedMachines = host.getSupportedEmulatedMachines();
-            if(StringUtils.isNotEmpty(supportedEmulatedMachines)) {
+            if (StringUtils.isNotEmpty(supportedEmulatedMachines)) {
                 if (Arrays.asList(supportedEmulatedMachines.split(",")).contains(requiredEmulatedMachine)) {
                     hostsToRunOn.add(host);
                     log.debug("Host {} wasn't filtered out as it supports the VM required emulated machine ({})",
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionCPUWeightPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionCPUWeightPolicyUnit.java
index fd1ace02e23..dd410e73b48 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionCPUWeightPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionCPUWeightPolicyUnit.java
@@ -98,7 +98,7 @@ private int calcAddedSharedVmsLoad(VDS vds, List<VM> vmGroup) {
                 .filter(vm -> !vds.getId().equals(vm.getRunOnVds()))
                 .filter(vm -> !vm.getCpuPinningPolicy().isExclusive())
                 // If the VM is running, use its current CPU load, otherwise use the config value
-                .mapToInt(vm -> vm.getRunOnVds() != null && vm.getStatisticsData() != null  && vm.getUsageCpuPercent() != null ?
+                .mapToInt(vm -> vm.getRunOnVds() != null && vm.getStatisticsData() != null && vm.getUsageCpuPercent() != null ?
                         vm.getUsageCpuPercent() * VmCpuCountHelper.getRuntimeNumOfCpu(vm, vds) :
                         vcpuLoadPerCore * VmCpuCountHelper.getRuntimeNumOfCpu(vm, vds))
                 .sum();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PinToHostPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PinToHostPolicyUnit.java
index c2e09a644f3..f849f485e15 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PinToHostPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PinToHostPolicyUnit.java
@@ -33,7 +33,7 @@ public PinToHostPolicyUnit(PolicyUnit policyUnit,
     public List<VDS> filter(SchedulingContext context, List<VDS> hosts, VM vm, PerHostMessages messages) {
         if (vm.getMigrationSupport() == MigrationSupport.PINNED_TO_HOST) {
             // host has been specified for pin to host.
-            if(vm.getDedicatedVmForVdsList().size() > 0) {
+            if (vm.getDedicatedVmForVdsList().size() > 0) {
                 List<VDS> dedicatedHostsList = new LinkedList<>();
                 for (VDS host : hosts) {
                     if (vm.getDedicatedVmForVdsList().contains(host.getId())) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java
index f39a2f32202..dfef2f6bd3a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingBalancePolicyUnit.java
@@ -77,7 +77,7 @@ public PowerSavingBalancePolicyUnit(PolicyUnit policyUnit,
     public List<BalanceResult> balance(Cluster cluster,
             List<VDS> hosts,
             Map<String, String> parameters) {
-        final List<BalanceResult> migrationRule =  super.balance(cluster, hosts, parameters);
+        final List<BalanceResult> migrationRule = super.balance(cluster, hosts, parameters);
 
         List<VDS> allHosts = vdsDao.getAllForCluster(cluster.getId());
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingCPUWeightPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingCPUWeightPolicyUnit.java
index 20f9da22201..be9e7584424 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingCPUWeightPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingCPUWeightPolicyUnit.java
@@ -59,7 +59,7 @@ public List<Pair<Guid, Integer>> score(SchedulingContext context, List<VDS> host
             }
 
             // Using negative score
-            int score = -(int)Math.round(calcHostScore(vmGroup, cpuLoadHelper, 0));
+            int score = -(int) Math.round(calcHostScore(vmGroup, cpuLoadHelper, 0));
             scores.add(new Pair<>(vds.getId(), score));
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingMemoryWeightPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingMemoryWeightPolicyUnit.java
index be00f0a0bb3..652d069bbd7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingMemoryWeightPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingMemoryWeightPolicyUnit.java
@@ -99,7 +99,7 @@ private int calcHostScore(float hostSchedulingMem, float maxMemory, float lowMem
         }
 
         // Scores are in the interval [1, MaxSchedulerWeight]
-        return (int)((hostSchedulingMem / maxMemory) * (getMaxSchedulerWeight() - 1)) + 1;
+        return (int) ((hostSchedulingMem / maxMemory) * (getMaxSchedulerWeight() - 1)) + 1;
     }
 
     private float getMaxMemoryOfVdsInCluster(List<VDS> hosts) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/VmAffinityFilterPolicyUnit.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/VmAffinityFilterPolicyUnit.java
index 7d9e145ef7e..b459725c8e9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/VmAffinityFilterPolicyUnit.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/policyunits/VmAffinityFilterPolicyUnit.java
@@ -148,7 +148,7 @@ private Set<Guid> getAcceptableHosts(List<VDS> hosts,
                 .map(VM::getRunOnVds)
                 .collect(Collectors.toSet());
 
-        Supplier<String> vmNames = new MemoizingSupplier<>(() -> getVmNames(vmGroup));// Compute the intersection of hosts with positive and negative affinity and report that
+        Supplier<String> vmNames = new MemoizingSupplier<>(() -> getVmNames(vmGroup)); // Compute the intersection of hosts with positive and negative affinity and report that
         // contradicting rules to the log
         unacceptableHosts.retainAll(acceptableHosts);
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/queries/AffinityGroupsQueryBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/queries/AffinityGroupsQueryBase.java
index 552765891f2..fe553929a48 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/queries/AffinityGroupsQueryBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/queries/AffinityGroupsQueryBase.java
@@ -53,7 +53,7 @@ protected void checkBrokenGroups(List<AffinityGroup> groups) {
 
         for (AffinityGroup group : groups) {
             Set<Guid> vmIds = AffinityValidator.unpackAffinityGroupVmsFromLabels(group, labelsMap);
-            List<VM> runningVms =  vmIds.stream()
+            List<VM> runningVms = vmIds.stream()
                     .map(runningVmsMap::get)
                     .filter(Objects::nonNull)
                     .collect(Collectors.toList());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/FindVmAndDestinations.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/FindVmAndDestinations.java
index 1c8cf6bad8e..5e404cfee50 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/FindVmAndDestinations.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/FindVmAndDestinations.java
@@ -53,7 +53,7 @@ public List<BalanceResult> invoke(List<VDS> sourceHosts,
             VmDao vmDao,
             ResourceManager resourceManager) {
 
-        Map<Guid, List<VM>> vmsForHost =  getMigratableVmsRunningOnHosts(vmDao,
+        Map<Guid, List<VM>> vmsForHost = getMigratableVmsRunningOnHosts(vmDao,
                 sourceHosts.stream().map(VDS::getId).collect(Collectors.toList()));
 
         List<BalanceResult> results = new ArrayList<>();
@@ -64,12 +64,12 @@ public List<BalanceResult> invoke(List<VDS> sourceHosts,
             migratableVms.forEach(vm -> vm.setStatisticsData(resourceManager.getVmManager(vm.getId(), false).getStatistics()));
             migratableVms.sort(VmCpuUsageComparator.INSTANCE);
 
-            for (VM vm : migratableVms){
+            for (VM vm : migratableVms) {
                 // Check if vm not over utilize memory or CPU of destination hosts
                 List<VDS> validDestinationHosts = getValidHosts(
                         destinationHosts, cluster, vm, highCpuUtilization, requiredMemory);
 
-                if (!validDestinationHosts.isEmpty()){
+                if (!validDestinationHosts.isEmpty()) {
                     // Add the current host, it is possible it is the best host after all,
                     // because the balancer does not know about affinity for example
                     validDestinationHosts.add(sourceHost);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/VdsCpuUnitPinningHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/VdsCpuUnitPinningHelper.java
index 0e4b4165d61..ffbe8be66d7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/VdsCpuUnitPinningHelper.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/utils/VdsCpuUnitPinningHelper.java
@@ -163,7 +163,7 @@ private List<VdsCpuUnit> allocateDedicatedCpus(List<VdsCpuUnit> cpuTopology, VM
             int amountOfVSocketsInPSockets = Integer.MAX_VALUE;
             if (!vm.getvNumaNodeList().isEmpty()) {
                 int highestAmountOfvNumaNodesInSocket = getVirtualNumaNodesInSocket(cpuTopology, vm, hostId, cpusInChosenSocket.get(0).getSocket());
-                int vNumaNodesInVirtualSocket = (int) Math.ceil((float)vm.getvNumaNodeList().size() / (float)vm.getNumOfSockets());
+                int vNumaNodesInVirtualSocket = (int) Math.ceil((float) vm.getvNumaNodeList().size() / (float) vm.getNumOfSockets());
                 amountOfVSocketsInPSockets = highestAmountOfvNumaNodesInSocket / vNumaNodesInVirtualSocket;
             }
             // coreCount is based on the VM topology
@@ -212,7 +212,7 @@ private List<VdsCpuUnit> allocateIsolatedThreadsCpus(List<VdsCpuUnit> cpuTopolog
             int amountOfVSocketsInPSockets = Integer.MAX_VALUE;
             if (!vm.getvNumaNodeList().isEmpty()) {
                 int highestAmountOfvNumaNodesInSocket = getVirtualNumaNodesInSocket(cpuTopology, vm, hostId, cpusInChosenSocket.get(0).getSocket());
-                int vNumaNodesInVirtualSocket = (int) Math.ceil((float)vm.getvNumaNodeList().size() / (float)vm.getNumOfSockets());
+                int vNumaNodesInVirtualSocket = (int) Math.ceil((float) vm.getvNumaNodeList().size() / (float) vm.getNumOfSockets());
                 amountOfVSocketsInPSockets = highestAmountOfvNumaNodesInSocket / vNumaNodesInVirtualSocket;
             }
             // coreCount is based on the VM topology
@@ -257,7 +257,7 @@ private void releaseDedicatedCpu(Guid vmId, List<VdsCpuUnit> cpusToBeAllocated)
 
     private void releaseIsolateThreadsCpu(Guid vmId, List<VdsCpuUnit> cpusToBeAllocated) {
         VdsCpuUnit cpuUnit = cpusToBeAllocated.get(cpusToBeAllocated.size() - 1);
-        int coreId  = cpuUnit.getCore();
+        int coreId = cpuUnit.getCore();
         int socketId = cpuUnit.getSocket();
         List<VdsCpuUnit> cpusToRemove = getCpusInCore(getCoresInSocket(cpusToBeAllocated, socketId), coreId);
         cpusToRemove.forEach(vdsCpuUnit -> {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateSnapshotForVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateSnapshotForVmCommand.java
index dc13c239bfc..fb498f2c66a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateSnapshotForVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/CreateSnapshotForVmCommand.java
@@ -394,7 +394,7 @@ private boolean performLiveSnapshot(final Snapshot snapshot) {
     }
 
     private CreateSnapshotForVmParameters createLiveSnapshotParameters(final Snapshot snapshot) {
-        CreateSnapshotForVmParameters params =  new CreateSnapshotForVmParameters();
+        CreateSnapshotForVmParameters params = new CreateSnapshotForVmParameters();
         params.setVmId(getParameters().getVmId());
         params.setSnapshot(snapshot);
         params.setSaveMemory(getParameters().isSaveMemory());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskCommandBase.java
index a37c7b75f50..75f57cbd6e9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotSingleDiskCommandBase.java
@@ -146,7 +146,7 @@ protected void syncChildCommandList(RemoveSnapshotSingleDiskParameters parameter
                 .map(CommandEntity::getId)
                 .collect(Collectors.toList());
         if (childCommandIds.size() != parameters.getChildCommands().size()) {
-            parameters.getChildCommands().put(parameters.getCommandStep(), childCommandIds.get(childCommandIds.size()-1));
+            parameters.getChildCommands().put(parameters.getCommandStep(), childCommandIds.get(childCommandIds.size() - 1));
         }
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreAllSnapshotsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreAllSnapshotsCommand.java
index 685db6be836..19aebe7d9c6 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreAllSnapshotsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/RestoreAllSnapshotsCommand.java
@@ -597,7 +597,7 @@ protected void restoreSnapshotAndRemoveObsoleteSnapshots(Snapshot targetSnapshot
                         && image.getDiskStorageType() != DiskStorageType.MANAGED_BLOCK_STORAGE) {
                     imagesToRestore.add(image);
                 } else {
-                    List<DiskImage> cinderDiskFromPreviewSnapshot = intersection.stream().filter(diskImage->
+                   List<DiskImage> cinderDiskFromPreviewSnapshot = intersection.stream().filter(diskImage ->
                             diskImage.getId().equals(image.getId())).collect(Collectors.toList());
                     if (!cinderDiskFromPreviewSnapshot.isEmpty()) {
                         imagesToRestore.add(cinderDiskFromPreviewSnapshot.get(0));
@@ -620,13 +620,13 @@ protected void restoreSnapshotAndRemoveObsoleteSnapshots(Snapshot targetSnapshot
             // Set the active snapshot's images as target images for restore, because they are what we keep.
             getParameters().setImages(imagesFromActiveSnapshot);
             imagesFromActiveSnapshot.forEach(image -> {
-                List<DiskImage> cinderDiskFromPreviewSnapshot = imagesFromPreviewSnapshot.stream().filter(diskImage->
+                List<DiskImage> cinderDiskFromPreviewSnapshot = imagesFromPreviewSnapshot.stream().filter(diskImage ->
                         diskImage.getId().equals(image.getId())).collect(Collectors.toList());
                 if (!cinderDiskFromPreviewSnapshot.isEmpty()) {
                     if (image.getDiskStorageType() == DiskStorageType.IMAGE ||
                             image.getDiskStorageType() == DiskStorageType.MANAGED_BLOCK_STORAGE) {
                         imagesToRestore.add(image);
-                    } else if (image.getDiskStorageType() == DiskStorageType.CINDER){
+                    } else if (image.getDiskStorageType() == DiskStorageType.CINDER) {
                         CinderDisk cinderVolume = getInitialCinderVolumeToDelete(image);
                         if (cinderVolume != null) {
                             imagesToRestore.add(cinderVolume);
@@ -733,7 +733,7 @@ private List<Guid> getRedundantVolumesToDeleteAfterCommitSnapshot(Guid diskId, S
     private Set<Guid> getCriticalSnapshotsChain(List<DiskImage> imagesFromActiveSnapshot, List<CinderDisk> cinderImagesForPreviewedSnapshot) {
         Set<Guid> criticalSnapshotsChain = new HashSet<>();
         for (DiskImage image : cinderImagesForPreviewedSnapshot) {
-            List<DiskImage> cinderDiskFromSnapshot = imagesFromActiveSnapshot.stream().filter(diskImage->
+          List<DiskImage> cinderDiskFromSnapshot = imagesFromActiveSnapshot.stream().filter(diskImage ->
                     diskImage.getId().equals(image.getId())).collect(Collectors.toList());
             for (DiskImage diskImage : diskImageDao.getAllSnapshotsForLeaf(cinderDiskFromSnapshot.get(0).getImageId())) {
                 criticalSnapshotsChain.add(diskImage.getVmSnapshotId());
@@ -857,7 +857,7 @@ && getSnapshot().getStatus() != SnapshotStatus.IN_PREVIEW) {
             return failValidation(EngineMessage.ACTION_TYPE_FAILED_VM_SNAPSHOT_NOT_IN_PREVIEW);
         }
 
-        if(!canRestoreVmConfigFromSnapshot()) {
+        if (!canRestoreVmConfigFromSnapshot()) {
             return failValidation(EngineMessage.MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES);
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java
index 466ff42ee54..79cd7bb3653 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsValidator.java
@@ -153,7 +153,7 @@ public ValidationResult isSnapshotStatusOK(Guid snapshotId) {
      *
      * @return Snapshot is in the required status or not
      */
-    private ValidationResult isSnapshotInStatus(Guid snapshotId, SnapshotStatus status,  EngineMessage msg) {
+    private ValidationResult isSnapshotInStatus(Guid snapshotId, SnapshotStatus status, EngineMessage msg) {
         Snapshot snap = snapshotDao.get(snapshotId);
         if (snap != null && snap.getStatus() != status) {
             return new ValidationResult(msg, String.format("$SnapshotStatus %1$s", snap.getStatus()));
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommand.java
index 515a9ce6512..76f3c051bf7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/TryBackToAllSnapshotsOfVmCommand.java
@@ -317,7 +317,7 @@ public Void runInTransaction() {
                             continue;
                         }
                         if (image.getDiskStorageType() == DiskStorageType.CINDER) {
-                            cinderDisks.add((CinderDisk)image);
+                            cinderDisks.add((CinderDisk) image);
                             continue;
                         }
                         ActionReturnValue actionReturnValue =
@@ -562,7 +562,7 @@ protected boolean validate() {
         // verify that the destination lease domain ID belongs to one of the VM's snapshots
         if (getParameters().getDstLeaseDomainId() != null) {
             if (!validate(snapshotsValidator.isLeaseDomainIdBelongsToSnapshot(getVmId(),
-                    getParameters().getDstLeaseDomainId())) &&!getParameters().getDstLeaseDomainId()
+                    getParameters().getDstLeaseDomainId())) && !getParameters().getDstLeaseDomainId()
                     .equals(getVm().getLeaseStorageDomainId())) {
                 return failValidation(EngineMessage.ACTION_TYPE_FAILED_LEASE_DOMAIN_ID_IS_NOT_VALID);
             }
@@ -637,7 +637,7 @@ protected boolean validate() {
             return false;
         }
 
-        if(!canRestoreVmConfigFromSnapshot()) {
+        if (!canRestoreVmConfigFromSnapshot()) {
             return failValidation(EngineMessage.MAC_POOL_NOT_ENOUGH_MAC_ADDRESSES);
         }
         return true;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/EntityPollingCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/EntityPollingCommand.java
index 1a785f858cd..f8c7e5818ea 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/EntityPollingCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/EntityPollingCommand.java
@@ -8,5 +8,5 @@ public interface EntityPollingCommand {
     /**
      * Method to perform job fencing using the command entity (if supported).
      */
-    default void attemptToFenceJob() {}
+    default void attemptToFenceJob() { }
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java
index 4f90834a7a9..45138a72e65 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FenceVdsManualyCommand.java
@@ -85,7 +85,7 @@ protected boolean validate() {
         // check problematic vds status
         if (isLegalStatus(problematicVds.getStatus())) {
             if (problematicVds.getSpmStatus() == VdsSpmStatus.SPM) {
-                if(!getStoragePool().isLocal()) {
+                if (!getStoragePool().isLocal()) {
                     if (!initializeVds()) {
                         return false;
                     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
index fe8344074cc..9c346cb8805 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java
@@ -101,31 +101,31 @@ public abstract class StorageHandlingCommandBase<T extends StoragePoolParameters
     private AuditLogDirector auditLogDirector;
 
     @Inject
-    private  MacPoolPerCluster macPoolPerCluster;
+    private MacPoolPerCluster macPoolPerCluster;
     @Inject
-    private  SnapshotsValidator snapshotsValidator;
+    private SnapshotsValidator snapshotsValidator;
     @Inject
-    private  VdsDao vdsDao;
+    private VdsDao vdsDao;
     @Inject
-    private  StoragePoolDao storagePoolDao;
+    private StoragePoolDao storagePoolDao;
     @Inject
-    private  StorageDomainDao storageDomainDao;
+    private StorageDomainDao storageDomainDao;
     @Inject
     protected VmTemplateDao vmTemplateDao;
     @Inject
-    private  DiskImageDao diskImageDao;
+    private DiskImageDao diskImageDao;
     @Inject
-    private  UnregisteredOVFDataDao unregisteredOVFDataDao;
+    private UnregisteredOVFDataDao unregisteredOVFDataDao;
     @Inject
     protected VmNicDao vmNicDao;
     @Inject
-    private  StorageDomainOvfInfoDao storageDomainOvfInfoDao;
+    private StorageDomainOvfInfoDao storageDomainOvfInfoDao;
     @Inject
-    private  StorageDomainStaticDao storageDomainStaticDao;
+    private StorageDomainStaticDao storageDomainStaticDao;
     @Inject
     private StoragePoolIsoMapDao storagePoolIsoMapDao;
     @Inject
-    private  UnregisteredDisksDao unregisteredDisksDao;
+    private UnregisteredDisksDao unregisteredDisksDao;
     @Inject
     private VmDao vmDao;
     @Inject
@@ -518,7 +518,7 @@ private Pair<DiskImage, Long> getLatestOVFDisk(List<DiskImage> ovfStoreDiskImage
                 size = Long.valueOf(diskDescriptionMap.get(OvfInfoFileConstants.Size).toString());
             }
         }
-        return new Pair<>((DiskImage)ovfDisk, size);
+        return new Pair<>((DiskImage) ovfDisk, size);
     }
 
     protected List<OvfEntityData> getEntitiesFromStorageOvfDisk(Guid storageDomainId, Guid storagePoolId) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectAllHostsToLunCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectAllHostsToLunCommand.java
index 0e88448a700..ffc1cfc0377 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectAllHostsToLunCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectAllHostsToLunCommand.java
@@ -179,7 +179,7 @@ private boolean validateConnectedLuns(VDS vds, Set<String> processedLunIds) {
             res = (Map<String, Boolean>) runVdsCommand(VDSCommandType.GetDevicesVisibility,
                     new GetDevicesVisibilityVDSCommandParameters(vds.getId(),
                             processedLunIds.toArray(new String[processedLunIds.size()]))).getReturnValue();
-        } catch(EngineException e) {
+        } catch (EngineException e) {
             handleFailure(vds, null);
             throw e;
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectStorageToVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectStorageToVdsCommand.java
index 95ce4d47055..be71580d2fa 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectStorageToVdsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/ConnectStorageToVdsCommand.java
@@ -171,7 +171,7 @@ private ValidationResult validateVolumeIdAndUpdatePath(StorageServerConnections
             }
 
             engineMessage = glusterUtil.validateVolumeForStorageDomain(glusterVolume);
-            if(engineMessage != null) {
+            if (engineMessage != null) {
                 return new ValidationResult(engineMessage);
             }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/DetachStorageConnectionFromStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/DetachStorageConnectionFromStorageDomainCommand.java
index 04edbfaf919..42f69bf5018 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/DetachStorageConnectionFromStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/DetachStorageConnectionFromStorageDomainCommand.java
@@ -40,7 +40,7 @@ protected boolean validate() {
                 || !validate(storageConnectionValidator.isISCSIConnectionAndDomain(getStorageDomain()))) {
             return false;
         }
-        if(!storageConnectionValidator.isConnectionForISCSIDomainAttached(getStorageDomain())) {
+        if (!storageConnectionValidator.isConnectionForISCSIDomainAttached(getStorageDomain())) {
             return failValidation(EngineMessage.ACTION_TYPE_FAILED_STORAGE_CONNECTION_FOR_DOMAIN_NOT_EXIST);
         }
         return true;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/GetAllStorageServerConnectionsQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/GetAllStorageServerConnectionsQuery.java
index fc936035421..b0ddb9dd027 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/GetAllStorageServerConnectionsQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/GetAllStorageServerConnectionsQuery.java
@@ -7,7 +7,7 @@
 import org.ovirt.engine.core.common.queries.QueryParametersBase;
 import org.ovirt.engine.core.dao.StorageServerConnectionDao;
 
-public class GetAllStorageServerConnectionsQuery <P extends QueryParametersBase> extends QueriesCommandBase<P>  {
+public class GetAllStorageServerConnectionsQuery <P extends QueryParametersBase> extends QueriesCommandBase<P> {
     @Inject
     private StorageServerConnectionDao storageServerConnectionDao;
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/RemoveStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/RemoveStorageServerConnectionCommand.java
index 4791bbeaf5a..9528f264c83 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/RemoveStorageServerConnectionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/RemoveStorageServerConnectionCommand.java
@@ -50,7 +50,7 @@ protected boolean validate() {
            return failValidation(EngineMessage.ACTION_TYPE_FAILED_STORAGE_CONNECTION_ID_EMPTY);
         }
         StorageServerConnections connection = storageServerConnectionDao.get(connectionId);
-        if(connection == null) {
+        if (connection == null) {
             return failValidation(EngineMessage.ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST);
         }
         // if user passed only the connection id for removal, vdsm still needs few more details in order to disconnect, so
@@ -60,7 +60,7 @@ protected boolean validate() {
         if (storageType.isFileDomain()) {
             // go to storage domain static, get all storage domains where storage field  = storage connection id
            domains = getStorageDomainsByConnId(connectionId);
-           if(domains.size() > 0) {
+           if (domains.size() > 0) {
                String domainNames = createDomainNamesListFromStorageDomains(domains);
                return prepareFailureMessageForDomains(domainNames);
            }
@@ -71,7 +71,7 @@ protected boolean validate() {
            List<LUNs> luns = lunDao.getAllForStorageServerConnection(connectionId);
            if (!luns.isEmpty()) {
                 String volumeGroupId = null;
-                for(LUNs lun : luns) {
+                for (LUNs lun : luns) {
                     volumeGroupId = lun.getVolumeGroupId();
                     if (StringUtils.isNotEmpty(volumeGroupId)) {
                         // non empty vg id indicates there's a storage domain using the lun
@@ -124,23 +124,23 @@ protected void executeCommand() {
 
     protected void populateMissingFields(StorageServerConnections connectionFromDb) {
         StorageServerConnections connectionFromParams = getConnection();
-        if(connectionFromParams.getStorageType() == null || connectionFromParams.getStorageType().equals(StorageType.UNKNOWN)) {
+        if (connectionFromParams.getStorageType() == null || connectionFromParams.getStorageType().equals(StorageType.UNKNOWN)) {
             connectionFromParams.setStorageType(connectionFromDb.getStorageType());
         }
-        if(StringUtils.isEmpty(connectionFromParams.getConnection())) {
+        if (StringUtils.isEmpty(connectionFromParams.getConnection())) {
             connectionFromParams.setConnection(connectionFromDb.getConnection());
         }
-        if(connectionFromParams.getStorageType().equals(StorageType.ISCSI)){
-            if(StringUtils.isEmpty(connectionFromParams.getIqn())) {
+        if (connectionFromParams.getStorageType().equals(StorageType.ISCSI)) {
+            if (StringUtils.isEmpty(connectionFromParams.getIqn())) {
                 connectionFromParams.setIqn(connectionFromDb.getIqn());
             }
-            if(StringUtils.isEmpty(connectionFromParams.getUserName())) {
+            if (StringUtils.isEmpty(connectionFromParams.getUserName())) {
                 connectionFromParams.setUserName(connectionFromDb.getUserName());
             }
-            if(StringUtils.isEmpty(connectionFromParams.getPassword())) {
+            if (StringUtils.isEmpty(connectionFromParams.getPassword())) {
                 connectionFromParams.setPassword(connectionFromDb.getPassword());
             }
-            if(StringUtils.isEmpty(connectionFromParams.getPort())) {
+            if (StringUtils.isEmpty(connectionFromParams.getPort())) {
                 connectionFromParams.setPort(connectionFromDb.getPort());
             }
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/StorageHelperBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/StorageHelperBase.java
index d57723441c6..c182620e95a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/StorageHelperBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/StorageHelperBase.java
@@ -241,7 +241,7 @@ public boolean syncDomainInfo(StorageDomain storageDomain, Guid vdsId) {
         return true;
     }
 
-    public void addMessageToAuditLog(AuditLogType auditLogType, StorageDomain storageDomain, VDS vds){
+    public void addMessageToAuditLog(AuditLogType auditLogType, StorageDomain storageDomain, VDS vds) {
         AuditLogable logable = new AuditLogableImpl();
         logable.setVdsId(vds.getId());
         logable.setVdsName(vds.getName());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommand.java
index 3cd39391836..63c5a5be367 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommand.java
@@ -363,15 +363,15 @@ protected Map<String, Pair<String, String>> getExclusiveLocks() {
                     EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));
 
           //lock lun disks and domains, not VMs , no need to load from db.
-          if(getLuns()!=null) {
-              for(LUNs lun : getLuns()) {
+          if (getLuns() != null) {
+              for (LUNs lun : getLuns()) {
                 Guid diskId = lun.getDiskId();
                 Guid storageDomainId = lun.getStorageDomainId();
-                if(diskId != null) {
+                if (diskId != null) {
                        locks.put(diskId.toString(), LockMessagesMatchUtil.makeLockingPair(LockingGroup.DISK,
                        EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));
                 }
-                if(storageDomainId != null) {
+                if (storageDomainId != null) {
                        locks.put(storageDomainId.toString(), LockMessagesMatchUtil.makeLockingPair(LockingGroup.STORAGE,
                        EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED));
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/iscsibond/BaseIscsiBondCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/iscsibond/BaseIscsiBondCommand.java
index 08fc37ef071..dbcaa4f223d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/iscsibond/BaseIscsiBondCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/connection/iscsibond/BaseIscsiBondCommand.java
@@ -76,7 +76,7 @@ protected void connectAllHostsToStorage(List<String> connectionIds) {
                             .collect(Collectors.toList());
                     if (!failedConnectionsList.isEmpty()) {
                         log.error("Host '{}' - '{}' encounter problems to connect to the iSCSI Storage"
-                                        + " Server. The following connections were problematic"+ "" +
+                                        + " Server. The following connections were problematic" + "" +
                                         " (connectionid=vdsm result): {}",
                                 host.getName(),
                                 host.getId(),
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java
index 2603826eb83..ddc3e632f39 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommand.java
@@ -546,7 +546,7 @@ private void createDiskBasedOnLun() {
     }
 
     protected VmDevice addManagedDeviceForDisk(Guid diskId) {
-        return  getVmDeviceUtils().addDiskDevice(
+        return getVmDeviceUtils().addDiskDevice(
                 getVmId(),
                 diskId,
                 shouldDiskBePlugged(),
@@ -569,7 +569,7 @@ protected boolean useCallback() {
     }
 
     private void createDiskBasedOnImage() {
-        if(!getParameters().getDiskInfo().isWipeAfterDeleteSet()) {
+        if (!getParameters().getDiskInfo().isWipeAfterDeleteSet()) {
             getParameters().getDiskInfo().setWipeAfterDelete(getStorageDomain().getWipeAfterDelete());
         }
         // create from blank template, create new vm snapshot id
@@ -635,7 +635,7 @@ protected void attachImage() {
 
     @Override
     public CommandCallback getCallback() {
-        return useCallback() ? callbackProvider.get() :  null;
+        return useCallback() ? callbackProvider.get() : null;
     }
 
     private void createDiskBasedOnCinder() {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommand.java
index bc2d9a045b1..1cef667a71b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/AttachDiskToVmCommand.java
@@ -99,7 +99,7 @@ protected LockProperties applyLockProperties(LockProperties lockProperties) {
     @Override
     protected boolean validate() {
         DiskValidator oldDiskValidator = new DiskValidator(disk);
-        if (!validate(oldDiskValidator.isDiskExists())){
+        if (!validate(oldDiskValidator.isDiskExists())) {
             return false;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/DiskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/DiskHandler.java
index 688fdfc983e..c783737f544 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/DiskHandler.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/DiskHandler.java
@@ -41,7 +41,7 @@ public Disk loadActiveDisk(Guid diskId) {
      * Loads a disk info for selected snapshot, if no snapshot ID was specified it will load the active snapshot
      */
     public Disk loadDiskFromSnapshot(Guid diskId, Guid snapshotId) {
-        return snapshotId == null ?  loadActiveDisk(diskId) :
+        return snapshotId == null ? loadActiveDisk(diskId) :
                 diskImageDao.getDiskSnapshotForVmSnapshot(diskId, snapshotId);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java
index d30cf4c1d84..8de5993175c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/MoveOrCopyDiskCommand.java
@@ -469,19 +469,19 @@ protected void endWithFailure() {
     public AuditLogType getAuditLogTypeValue() {
         switch (getActionState()) {
         case EXECUTE:
-            return getSucceeded() ? (isMoveOperation()) ? AuditLogType.USER_MOVED_DISK
+            return getSucceeded() ? isMoveOperation() ? AuditLogType.USER_MOVED_DISK
                     : AuditLogType.USER_COPIED_DISK
-                    : (isMoveOperation()) ? AuditLogType.USER_FAILED_MOVED_VM_DISK
+                    : isMoveOperation() ? AuditLogType.USER_FAILED_MOVED_VM_DISK
                             : AuditLogType.USER_FAILED_COPY_DISK;
 
         case END_SUCCESS:
-            return getSucceeded() ? (isMoveOperation()) ? AuditLogType.USER_MOVED_DISK_FINISHED_SUCCESS
+            return getSucceeded() ? isMoveOperation() ? AuditLogType.USER_MOVED_DISK_FINISHED_SUCCESS
                     : AuditLogType.USER_COPIED_DISK_FINISHED_SUCCESS
-                    : (isMoveOperation()) ? AuditLogType.USER_MOVED_DISK_FINISHED_FAILURE
+                    : isMoveOperation() ? AuditLogType.USER_MOVED_DISK_FINISHED_FAILURE
                             : AuditLogType.USER_COPIED_DISK_FINISHED_FAILURE;
 
         default:
-            return (isMoveOperation()) ? AuditLogType.USER_MOVED_DISK_FINISHED_FAILURE
+            return isMoveOperation() ? AuditLogType.USER_MOVED_DISK_FINISHED_FAILURE
                     : AuditLogType.USER_COPIED_DISK_FINISHED_FAILURE;
         }
     }
@@ -670,7 +670,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                 getDestinationQuotaId(),
                 QuotaConsumptionParameter.QuotaAction.CONSUME,
                 getParameters().getDestDomainId(),
-                (double)getImage().getSizeInGigabytes()));
+                (double) getImage().getSizeInGigabytes()));
 
         if (isMoveOperation()) {
             if (getImage().getQuotaId() != null && !Guid.Empty.equals(getImage().getQuotaId())) {
@@ -678,7 +678,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                         getImage().getQuotaId(),
                         QuotaConsumptionParameter.QuotaAction.RELEASE,
                         getParameters().getSourceDomainId(),
-                        (double)getImage().getSizeInGigabytes()));
+                        (double) getImage().getSizeInGigabytes()));
             }
         }
         return list;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java
index 16a41463b8f..51ac7e5bbea 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommand.java
@@ -332,7 +332,7 @@ private boolean canRemoveTemplateDisk() {
             return failValidation(EngineMessage.VM_TEMPLATE_IMAGE_LAST_DOMAIN);
         }
 
-        if (!checkDerivedVmFromTemplateExists(diskImage) || !checkDerivedDisksFromDiskNotExist(diskImage)){
+        if (!checkDerivedVmFromTemplateExists(diskImage) || !checkDerivedDisksFromDiskNotExist(diskImage)) {
             return false;
         }
 
@@ -744,6 +744,6 @@ private DiskStorageType getDiskStorageType() {
 
     @Override
     public CommandCallback getCallback() {
-        return getDiskStorageType() == DiskStorageType.IMAGE ? callbackProvider.get() :  null;
+        return getDiskStorageType() == DiskStorageType.IMAGE ? callbackProvider.get() : null;
     }
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommand.java
index 4925d6cde0f..fddbc462ce2 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommand.java
@@ -335,7 +335,7 @@ private boolean isQcowCompatChangedOnRawDisk() {
     private boolean isIncrementalBackupChangedOnRawDisk() {
         if (getNewDisk().getDiskStorageType() == DiskStorageType.IMAGE) {
             DiskImage diskImage = (DiskImage) getNewDisk();
-            return diskImage.getBackup() == DiskBackup.Incremental &&  diskImage.getVolumeFormat() == VolumeFormat.RAW;
+            return diskImage.getBackup() == DiskBackup.Incremental && diskImage.getVolumeFormat() == VolumeFormat.RAW;
         }
         return false;
     }
@@ -376,7 +376,7 @@ private boolean validateCanUpdateShareable() {
 
         if (isUpdatedToShareable(getOldDisk(), getNewDisk())) {
 
-            StorageDomainStatic sds = storageDomainStaticDao.get(((DiskImage)getNewDisk()).getStorageIds().get(0));
+            StorageDomainStatic sds = storageDomainStaticDao.get(((DiskImage) getNewDisk()).getStorageIds().get(0));
             if (sds.getStorageType() == StorageType.GLUSTERFS) {
                 return failValidation(EngineMessage.ACTION_TYPE_FAILED_SHAREABLE_DISKS_NOT_SUPPORTED_ON_GLUSTER_DOMAIN);
             }
@@ -402,7 +402,7 @@ private boolean validateCanUpdateShareable() {
 
     protected boolean validateCanUpdateReadOnly() {
         if (updateReadOnlyRequested()) {
-            if(getVm().getStatus() != VMStatus.Down && vmDeviceForVm.isPlugged()) {
+            if (getVm().getStatus() != VMStatus.Down && vmDeviceForVm.isPlugged()) {
                 return failValidation(EngineMessage.ACTION_TYPE_FAILED_VM_IS_NOT_DOWN);
             }
             DiskVmElementValidator diskVmElementValidator = getDiskVmElementValidator(getNewDisk(), getDiskVmElement());
@@ -792,7 +792,7 @@ public Map<String, String> getJobMessageProperties() {
                     .map(VM::getName)
                     .sorted()
                     .collect(Collectors.joining(", "));
-            jobProperties.put("vm", vmNames.isEmpty()? "N/A" : vmNames);
+            jobProperties.put("vm", vmNames.isEmpty() ? "N/A" : vmNames);
         }
         return jobProperties;
     }
@@ -886,7 +886,7 @@ public List<QuotaConsumptionParameter> getQuotaStorageConsumptionParameters() {
                         QuotaStorageConsumptionParameter.QuotaAction.RELEASE,
                         //TODO: Shared Disk?
                         oldDiskImage.getStorageIds().get(0),
-                        (double)oldDiskImage.getSizeInGigabytes()));
+                        (double) oldDiskImage.getSizeInGigabytes()));
             }
         }
         return list;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommand.java
index 83e8a11e02c..693fd4bdcbb 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/AddCinderDiskCommand.java
@@ -138,7 +138,7 @@ private Guid getDiskId() {
 
     @Override
     public boolean validate() {
-        if (!validateQuota()){
+        if (!validateQuota()) {
             return false;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotDiskCommand.java
index 768c89a7b73..f476b2cde93 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderSnapshotDiskCommand.java
@@ -36,7 +36,7 @@ public RemoveCinderSnapshotDiskCommand(T parameters, CommandContext cmdContext)
 
     @Override
     protected void executeCommand() {
-        registerRollbackHandler((TransactionRollbackListener)() -> {
+        registerRollbackHandler((TransactionRollbackListener) () -> {
             TransactionSupport.executeInNewTransaction(() -> {
                 if (!getParameters().isLeaveLocked()) {
                     DiskImage diskImage = getImage();
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderVolumeParentCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderVolumeParentCommand.java
index a94be0ff924..a169960101d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderVolumeParentCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/cinder/RemoveCinderVolumeParentCommand.java
@@ -149,7 +149,7 @@ public boolean performNextOperation(int completedChildCount) {
                 getParameters().getChildCommandsParameters().get(completedChildCount - 1).getRemovedVolume();
         removeDiskFromDbCallBack(cinderVolume);
 
-        if(getParameters().getChildCommandsParameters().size() == completedChildCount){
+        if (getParameters().getChildCommandsParameters().size() == completedChildCount) {
             return false;
         }
         getParameters().setRemovedVolumeIndex(completedChildCount);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupCommand.java
index 205e5dc1240..239a4d25c2e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyImageGroupCommand.java
@@ -255,7 +255,7 @@ private boolean performStorageOperation() {
 
     @Override
     public CommandCallback getCallback() {
-        if (isUsingSPDMFlow()){
+        if (isUsingSPDMFlow()) {
             return callbackProvider.get();
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyManagedBlockDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyManagedBlockDiskCommand.java
index 417344fd24a..8ca1712900d 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyManagedBlockDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/CopyManagedBlockDiskCommand.java
@@ -125,7 +125,7 @@ protected void executeCommand() {
 
     @Override
     public boolean performNextOperation(int completedChildCount) {
-        switch(getParameters().getStage()) {
+        switch (getParameters().getStage()) {
         case LEASE_CREATION:
             if (!saveLease()) {
                     setCommandStatus(CommandStatus.FAILED);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java
index 230a2162eb4..018c3ec5305 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandler.java
@@ -215,7 +215,7 @@ public static boolean setDiskAlias(BaseDisk disk, VM vm, int count) {
             return false;
         }
 
-        String vmName =  nullSafeGetVmName(vm);
+        String vmName = nullSafeGetVmName(vm);
         disk.setDiskAlias(getSuggestedDiskAlias(disk, vmName, count));
         return true;
     }
@@ -565,7 +565,7 @@ public void fillImagesBySnapshots(VM vm) {
      *            List of Disk objects to aggregate their snapshots
      * @return List of active DiskImages objects which related to their snapshots
      */
-    public Collection<DiskImage> aggregateDiskImagesSnapshots(Collection<DiskImage> images){
+    public Collection<DiskImage> aggregateDiskImagesSnapshots(Collection<DiskImage> images) {
         Map<Guid, DiskImage> diskImagesMap = new HashMap<>();
 
         // Get active diskImages
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommand.java
index a08219453cf..fb142f61fd0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/RemoveImageCommand.java
@@ -51,7 +51,7 @@
  * This command responsible to removing image, contains all created snapshots.
  */
 @InternalCommandAttribute
-@NonTransactiveCommandAttribute(forceCompensation=true)
+@NonTransactiveCommandAttribute(forceCompensation = true)
 public class RemoveImageCommand<T extends RemoveImageParameters> extends BaseImagesCommand<T> {
 
     private static final Set<ActionType> ACTIONS_NOT_REQUIRED_DB_OPERATION = new HashSet<>(
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
index 1c6c42f0795..b8d16d1b7fe 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommand.java
@@ -381,7 +381,7 @@ protected ImageActionsVDSCommandParameters getImageActionsParameters(Guid vdsId)
     }
 
     protected String getImageAlias() {
-        return  getParameters().getAddDiskParameters() != null ?
+        return getParameters().getAddDiskParameters() != null ?
                 getParameters().getAddDiskParameters().getDiskInfo().getDiskAlias() :
                 getDiskImage().getDiskAlias();
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/AddManagedBlockStorageDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/AddManagedBlockStorageDiskCommand.java
index c13467cf770..6074eaea444 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/AddManagedBlockStorageDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/AddManagedBlockStorageDiskCommand.java
@@ -179,7 +179,7 @@ private ManagedBlockStorageDisk createDisk() {
      * @return The next GiB multiple in bytes
      */
     private long getDiskSize(long size) {
-        long correctedSize = (long) Math.ceil((double)size / (double)SizeConverter.BYTES_IN_GB);
+        long correctedSize = (long) Math.ceil((double) size / (double) SizeConverter.BYTES_IN_GB);
         return SizeConverter.convert(correctedSize, SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES)
                 .longValue();
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/RemoveManagedBlockStorageSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/RemoveManagedBlockStorageSnapshotCommand.java
index 77bcfec41fb..8e57e3ee507 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/RemoveManagedBlockStorageSnapshotCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/disk/managedblock/RemoveManagedBlockStorageSnapshotCommand.java
@@ -68,7 +68,7 @@ protected void executeCommand() {
                             getCorrelationId());
             returnValue =
                     cinderlibExecutor.runCommand(CinderlibExecutor.CinderlibCommand.REMOVE_SNAPSHOT, params);
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Failed executing snapshot deletion", e);
             return;
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddLocalStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddLocalStorageDomainCommand.java
index b605a7a13b4..3b929304e4b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddLocalStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddLocalStorageDomainCommand.java
@@ -74,7 +74,7 @@ protected void executeCommand() {
                     .runInternalAction(
                             ActionType.AttachStorageDomainToPool,
                             new AttachStorageDomainToPoolParameters(getStorageDomain().getId(), getStoragePool().getId()));
-            if(!returnValue.getSucceeded()) {
+            if (!returnValue.getSucceeded()) {
                 getReturnValue().setSucceeded(false);
                 getReturnValue().setFault(returnValue.getFault());
             }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddSANStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddSANStorageDomainCommand.java
index a19ad204fb7..1dd37718978 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddSANStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddSANStorageDomainCommand.java
@@ -47,7 +47,7 @@ protected void executeCommand() {
         // status to be locked
         getStorageDomain().setStorage("");
         addStorageDomainInDb();
-        if(StringUtils.isEmpty(storage)) {
+        if (StringUtils.isEmpty(storage)) {
               storage = createVG();
         }
         getStorageDomain().setStorage(storage);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommand.java
index 4b566215072..47ab32533c2 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommand.java
@@ -82,7 +82,7 @@ protected void updateStaticDataDefaults() {
     }
 
     private void updateStorageDomainWipeAfterDelete() {
-        if(getStorageDomain().getStorageStaticData().getWipeAfterDelete() == null) {
+        if (getStorageDomain().getStorageStaticData().getWipeAfterDelete() == null) {
             getStorageDomain().getStorageStaticData().setWipeAfterDelete(
                     WipeAfterDeleteUtils.getDefaultWipeAfterDeleteFlag(
                             getStorageDomain().getStorageStaticData().getStorageType()));
@@ -90,14 +90,14 @@ private void updateStorageDomainWipeAfterDelete() {
     }
 
     private void updateSpaceThresholds() {
-        if(getStorageDomain().getWarningLowSpaceIndicator() == null) {
+        if (getStorageDomain().getWarningLowSpaceIndicator() == null) {
             getStorageDomain().setWarningLowSpaceIndicator(Config.<Integer>getValue(ConfigValues.WarningLowSpaceIndicator));
         }
-        if(getStorageDomain().getWarningLowConfirmedSpaceIndicator() == null) {
+        if (getStorageDomain().getWarningLowConfirmedSpaceIndicator() == null) {
             getStorageDomain().getStorageStaticData().setWarningLowConfirmedSpaceIndicator(
                     Config.<Integer>getValue(ConfigValues.WarningLowSpaceIndicator));
         }
-        if(getStorageDomain().getCriticalSpaceActionBlocker() == null) {
+        if (getStorageDomain().getCriticalSpaceActionBlocker() == null) {
             getStorageDomain().setCriticalSpaceActionBlocker(Config.<Integer>getValue(ConfigValues.CriticalSpaceActionBlocker));
         }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DeactivateStorageDomainWithOvfUpdateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DeactivateStorageDomainWithOvfUpdateCommand.java
index 323e1def929..3f1742c4a28 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DeactivateStorageDomainWithOvfUpdateCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DeactivateStorageDomainWithOvfUpdateCommand.java
@@ -137,7 +137,7 @@ protected boolean shouldPerformOvfUpdate() {
     }
 
     private StoragePoolIsoMap loadStoragePoolIsoMap() {
-        return  storagePoolIsoMapDao.get
+        return storagePoolIsoMapDao.get
                         (new StoragePoolIsoMapId(getParameters().getStorageDomainId(),
                                 getParameters().getStoragePoolId()));
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DetachStorageDomainFromPoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DetachStorageDomainFromPoolCommand.java
index 9eaba3d6ac8..2daa4dbc6ca 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DetachStorageDomainFromPoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/DetachStorageDomainFromPoolCommand.java
@@ -35,7 +35,7 @@
 import org.ovirt.engine.core.dao.profiles.DiskProfileDao;
 import org.ovirt.engine.core.utils.transaction.TransactionSupport;
 
-@NonTransactiveCommandAttribute(forceCompensation=true)
+@NonTransactiveCommandAttribute(forceCompensation = true)
 public class DetachStorageDomainFromPoolCommand<T extends DetachStorageDomainFromPoolParameters> extends
         StorageDomainCommandBase<T> {
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetManagedBlockStorageStatsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetManagedBlockStorageStatsCommand.java
index a91e460907b..9e35b41f1db 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetManagedBlockStorageStatsCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetManagedBlockStorageStatsCommand.java
@@ -56,7 +56,7 @@ protected void executeCommand() {
                             getCorrelationId());
             returnValue = cinderlibExecutor.runCommand(CinderlibExecutor.CinderlibCommand.STORAGE_STATS, params);
 
-            if(returnValue.getSucceed()) {
+            if (returnValue.getSucceed()) {
                 storageStats = JsonHelper.jsonToMap(returnValue.getOutput());
             }
         } catch (Exception e) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsByVmTemplateIdQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsByVmTemplateIdQuery.java
index 6f6c093f325..f72e8c5393a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsByVmTemplateIdQuery.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/GetStorageDomainsByVmTemplateIdQuery.java
@@ -45,7 +45,7 @@ protected void executeQueryCommand() {
 
                 Set<Guid> domains = new HashSet<>();
                 for (Disk templateDisk : templateDisks) {
-                    domains.addAll(((DiskImage)templateDisk).getStorageIds());
+                    domains.addAll(((DiskImage) templateDisk).getStorageIds());
                 }
 
                 for (Guid domainId : domains) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommand.java
index 2ba29e0e95f..520a8ecbf36 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/ImportHostedEngineStorageDomainCommand.java
@@ -237,7 +237,7 @@ private boolean fetchStorageDomainInfo() {
                         null));
         if (allDomainsQuery.getSucceeded()) {
             for (StorageDomain sd : (List<StorageDomain>) allDomainsQuery.getReturnValue()) {
-                if(sd.getId().equals(getParameters().getStorageDomainId())){
+                if (sd.getId().equals(getParameters().getStorageDomainId())) {
                     heStorageDomain = sd;
                     return true;
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/SyncLunsInfoForBlockStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/SyncLunsInfoForBlockStorageDomainCommand.java
index 4522e3e8431..7ed138a6e4f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/SyncLunsInfoForBlockStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/SyncLunsInfoForBlockStorageDomainCommand.java
@@ -282,7 +282,7 @@ public boolean requiresDbUpdate() {
         }
     };
 
-    protected final LunHandler noOp = luns -> {};
+    protected final LunHandler noOp = luns -> { };
 
     protected interface LunHandler extends Consumer<List<LUNs>> {
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/UpdateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/UpdateStorageDomainCommand.java
index 03d5cd36e96..ba5a0df92c5 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/UpdateStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/domain/UpdateStorageDomainCommand.java
@@ -25,7 +25,7 @@
 import org.ovirt.engine.core.utils.ObjectIdentityChecker;
 
 public class UpdateStorageDomainCommand<T extends StorageDomainManagementParameter> extends
-        StorageDomainManagementCommandBase<T>  implements RenamedEntityInfoProvider {
+        StorageDomainManagementCommandBase<T> implements RenamedEntityInfoProvider {
 
     @Inject
     private StorageDomainStaticDao storageDomainStaticDao;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/dr/ScheduleGlusterStorageSyncCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/dr/ScheduleGlusterStorageSyncCommand.java
index 15508ad06b8..38c246d946a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/dr/ScheduleGlusterStorageSyncCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/dr/ScheduleGlusterStorageSyncCommand.java
@@ -57,7 +57,7 @@ protected void setActionMessageParameters() {
 
     @Override
     protected Map<String, Pair<String, String>> getExclusiveLocks() {
-        return Collections.singletonMap(getStorageDomainId().toString() + ";" +getGeoRepSession().toString(),
+        return Collections.singletonMap(getStorageDomainId().toString() + ";" + getGeoRepSession().toString(),
                 LockMessagesMatchUtil.makeLockingPair(LockingGroup.GLUSTER_STORAGE_DOMAIN_SYNC,
                         new LockMessage(EngineMessage.STORAGE_DOMAIN_SYNC_SCHEDULING_IN_PROGRESS)));
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java
index 6faed984173..38d0655a850 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/lsm/LiveMigrateDiskCommand.java
@@ -152,7 +152,7 @@ public void init() {
         getParameters().setImageGroupID(getImageGroupId());
         getParameters().setCommandType(getActionType());
 
-        getParameters().setDestinationImageId(((DiskImage)getDiskImageByDiskId(getParameters().getImageGroupID()))
+        getParameters().setDestinationImageId(((DiskImage) getDiskImageByDiskId(getParameters().getImageGroupID()))
                 .getImageId());
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/ProcessOvfUpdateForStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/ProcessOvfUpdateForStorageDomainCommand.java
index 61b6e5a41f0..ed2234b700b 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/ProcessOvfUpdateForStorageDomainCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ovfstore/ProcessOvfUpdateForStorageDomainCommand.java
@@ -464,7 +464,7 @@ public boolean performNextOperation(int completedChildCount) {
         return false;
     }
 
-    private void setOvfUpdateStep(OvfUpdateStep step){
+    private void setOvfUpdateStep(OvfUpdateStep step) {
         getParameters().setOvfUpdateStep(step);
         persistCommand(getParameters().getParentCommand(), true);
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ActivateDeactivateSingleAsyncOperationFactory.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ActivateDeactivateSingleAsyncOperationFactory.java
index 307d91bb9fe..03fa987f7ba 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ActivateDeactivateSingleAsyncOperationFactory.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ActivateDeactivateSingleAsyncOperationFactory.java
@@ -31,7 +31,7 @@ public void initialize(List<?> parameters) {
         if (!(parameters.get(0) instanceof List)) {
             throw new IllegalArgumentException();
         }
-        List l = new ArrayList((List)parameters.get(0));
+        List l = new ArrayList((List) parameters.get(0));
         if (!l.isEmpty() && !(l.get(0) instanceof VDS)) {
             throw new IllegalArgumentException();
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/AddStoragePoolWithStoragesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/AddStoragePoolWithStoragesCommand.java
index 33a39e7b74b..d54b8891827 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/AddStoragePoolWithStoragesCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/AddStoragePoolWithStoragesCommand.java
@@ -163,7 +163,7 @@ protected void executeCommand() {
     }
 
     private boolean updateStorageDomainsInDb() {
-        boolean result  = TransactionSupport.executeInNewTransaction(() -> {
+        boolean result = TransactionSupport.executeInNewTransaction(() -> {
             for (Guid storageDomainId : getParameters().getStorages()) {
                 StorageDomain storageDomain = storageDomainDao.get(storageDomainId);
                 if (storageDomain != null) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ForceSelectSPMCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ForceSelectSPMCommand.java
index d36361684e3..dba609c564c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ForceSelectSPMCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/ForceSelectSPMCommand.java
@@ -52,7 +52,7 @@ protected boolean validate() {
             return failValidation(EngineMessage.VDS_NOT_EXIST);
         }
 
-        if(!getVds().getClusterSupportsVirtService()){
+        if (!getVds().getClusterSupportsVirtService()) {
             return failValidation(EngineMessage.CANNOT_FORCE_SELECT_SPM_HOST_DOES_NOT_SUPPORT_VIRT_SERVICES);
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/RemoveStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/RemoveStoragePoolCommand.java
index d0fc911e4fa..6d269615ecf 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/RemoveStoragePoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/RemoveStoragePoolCommand.java
@@ -86,7 +86,7 @@ protected void executeCommand() {
 
         if (!storageDomains.isEmpty()) {
             if (!getParameters().isForceDelete() && !getAllRunningVdssInPool().isEmpty()) {
-                if(!regularRemoveStorageDomains(storageDomains)) {
+                if (!regularRemoveStorageDomains(storageDomains)) {
                     setSucceeded(false);
                     return;
                 }
@@ -158,7 +158,7 @@ private void forceRemoveStorageDomains(List<StorageDomain> storageDomains) {
     private boolean regularRemoveStorageDomains(List<StorageDomain> storageDomains) {
         boolean retVal = true;
         final StorageDomain masterDomain =
-                storageDomains.stream().filter(s ->  s.getStorageDomainType() == StorageDomainType.Master).findFirst().orElse(null);
+                storageDomains.stream().filter(s -> s.getStorageDomainType() == StorageDomainType.Master).findFirst().orElse(null);
         lockStorageDomain(masterDomain);
         // destroying a pool is an SPM action. We need to connect all hosts
         // to the pool. Later on, during spm election, one of the hosts will
@@ -280,7 +280,7 @@ protected boolean validate() {
             return false;
         }
         if (!getParameters().isForceDelete()) {
-            if(poolDomains.size() > 1) {
+            if (poolDomains.size() > 1) {
                 return failValidation(EngineMessage.ERROR_CANNOT_REMOVE_STORAGE_POOL_WITH_NONMASTER_DOMAINS);
             }
             if (!poolDomains.isEmpty() && !canDetachStorageDomainWithVmsAndDisks(poolDomains.get(0))) {
@@ -322,7 +322,7 @@ protected boolean validateDomainsInMaintenance(List<StorageDomain> domainsList)
 
     @Override
     public AuditLogType getAuditLogTypeValue() {
-        if (getParameters().isForceDelete()){
+        if (getParameters().isForceDelete()) {
             return getSucceeded() ? AuditLogType.USER_FORCE_REMOVE_STORAGE_POOL : AuditLogType.USER_FORCE_REMOVE_STORAGE_POOL_FAILED;
         }
         return getSucceeded() ? AuditLogType.USER_REMOVE_STORAGE_POOL : AuditLogType.USER_REMOVE_STORAGE_POOL_FAILED;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/StoragePoolQueryBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/StoragePoolQueryBase.java
index 67cbcac4fa2..7244e2ae6a1 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/StoragePoolQueryBase.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/StoragePoolQueryBase.java
@@ -13,7 +13,7 @@
  * Class which encapsulates logic of figuring out macPoolId for data center based on pools used by data centers
  * clusters.
  */
-public abstract class StoragePoolQueryBase<P extends QueryParametersBase>  extends QueriesCommandBase<P> {
+public abstract class StoragePoolQueryBase<P extends QueryParametersBase> extends QueriesCommandBase<P> {
 
     @Inject
     protected StoragePoolDao storagePoolDao;
@@ -39,7 +39,7 @@ private void setMacPoolReference(Object dataCenterQueryResult) {
         }
 
         if (dataCenterQueryResult instanceof StoragePool) {
-            dataCenterQueryResult((StoragePool)dataCenterQueryResult);
+            dataCenterQueryResult((StoragePool) dataCenterQueryResult);
             return;
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java
index 4226a2a2833..e54daba14a0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/pool/UpdateStoragePoolCommand.java
@@ -53,8 +53,7 @@
 import org.ovirt.engine.core.utils.transaction.TransactionSupport;
 
 @NonTransactiveCommandAttribute
-public class UpdateStoragePoolCommand<T extends StoragePoolManagementParameter> extends
-        StoragePoolManagementCommandBase<T>  implements RenamedEntityInfoProvider{
+public class UpdateStoragePoolCommand<T extends StoragePoolManagementParameter> extends StoragePoolManagementCommandBase<T> implements RenamedEntityInfoProvider {
 
     @Inject
     private AuditLogDirector auditLogDirector;
@@ -128,7 +127,7 @@ private boolean shouldSetNewMacPoolOnAllClusters(Guid newMacPoolId) {
     }
 
     private void updateQuotaCache() {
-        if(wasQuotaEnforcementChanged()){
+        if (wasQuotaEnforcementChanged()) {
             getQuotaManager().removeStoragePoolFromCache(getStoragePool().getId());
         }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
index b3344a29cf7..e7767de9899 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsCacheImpl.java
@@ -35,7 +35,7 @@ public CommandsCacheImpl() {
 
     private void initializeCache() {
         if (!cacheInitialized) {
-            synchronized(LOCK) {
+            synchronized (LOCK) {
                 if (!cacheInitialized) {
                     List<CommandEntity> cmdEntities = commandEntityDao.getAll();
                     for (CommandEntity cmdEntity : cmdEntities) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsRepository.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsRepository.java
index 3c2991f1c22..d27810b63a9 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsRepository.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/CommandsRepository.java
@@ -222,7 +222,7 @@ public void removeCommand(Guid commandId) {
 
     private void initChildHierarchy() {
         if (!childHierarchyInitialized) {
-            synchronized(LOCK) {
+            synchronized (LOCK) {
                 if (!childHierarchyInitialized) {
                     childHierarchy.clear();
                     getCommands(false).forEach(this::buildCmdHierarchy);
@@ -255,7 +255,7 @@ private void updateCmdHierarchy(Guid cmdId) {
 
     public void removeAllCommandsBeforeDate(final DateTime cutoff) {
         commandsCache.removeAllCommandsBeforeDate(cutoff);
-        synchronized(LOCK) {
+        synchronized (LOCK) {
             childHierarchyInitialized = false;
         }
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java
index 4f61040e329..cc09772211f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/tasks/SPMAsyncTask.java
@@ -469,7 +469,7 @@ public void clearAsyncTask(boolean forceDelete) {
                 onTaskCleanFailure();
             } else {
                 setState(AsyncTaskState.Cleared);
-                shouldGracefullyDeleteTask =  true;
+                shouldGracefullyDeleteTask = true;
             }
         }
         //A task should be removed from DB if forceDelete is set to true, or if it was cleared successfully.
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
index fd917bffa29..30645a2a5c0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/GlusterUtil.java
@@ -249,7 +249,7 @@ public Map<VDS, String> getGlusterIpaddressAsMap(Map<String, Network> networkNam
         Optional<Map.Entry<String, Network>> result =
               networkNameObjectMap.entrySet().stream().filter(v -> v.getValue().getCluster().isGluster()).findFirst();
 
-        if(result.isPresent()) {
+        if (result.isPresent()) {
             networkName = result.get().getKey();
 
         } else {
@@ -265,13 +265,13 @@ public Map<VDS, String> getGlusterIpaddressAsMap(Map<String, Network> networkNam
         Optional<Map.Entry<VDS, String>> hostGlusterIpresult =
                 hostGlusterIpMap.entrySet().stream().filter(x -> x.getValue().equals(null)).findAny();
 
-        if(hostGlusterIpresult.isPresent()) {
+        if (hostGlusterIpresult.isPresent()) {
             return null;
         }
         return hostGlusterIpMap;
     }
 
-    public List<VdsNetworkInterface> getGlusterIpaddressUtil(Guid hostId){
+    public List<VdsNetworkInterface> getGlusterIpaddressUtil(Guid hostId) {
         return interfaceDao.getAllInterfacesForVds(hostId);
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/PermissionSubject.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/PermissionSubject.java
index a610727082a..5ace28cca5e 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/PermissionSubject.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/PermissionSubject.java
@@ -49,7 +49,7 @@ public void setActionGroup(ActionGroup actionGroup) {
         this.actionGroup = actionGroup;
     }
 
-    public EngineMessage getMessage(){
+    public EngineMessage getMessage() {
         return message;
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
index 0cc574dbd40..e2a13a7c9af 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmDeviceUtils.java
@@ -1788,7 +1788,7 @@ dstCluster, new VmRngDevice(device)).isValid()) {
 
         if (isSoundEnabled) {
             if (hasSound) {
-                updateSoundDevice(srcVmBase, dstVmBase, CompatibilityVersionUtils.getEffective(dstVmBase,  dstCluster), isSoundEnabled);
+                updateSoundDevice(srcVmBase, dstVmBase, CompatibilityVersionUtils.getEffective(dstVmBase, dstCluster), isSoundEnabled);
             } else {
                 addSoundDevice(dstVmBase, () -> dstCluster);
             }
@@ -2116,7 +2116,7 @@ private void setNewIdInImportedCollections(VmBase vmBase) {
     public boolean vmDeviceChanged(Guid vmId, VmDeviceGeneralType deviceGeneralType, String deviceTypeName,
                                           boolean deviceEnabled) {
         List<VmDevice> vmDevices = deviceTypeName != null ?
-                vmDeviceDao.getVmDeviceByVmIdTypeAndDevice(vmId, deviceGeneralType, deviceTypeName):
+                vmDeviceDao.getVmDeviceByVmIdTypeAndDevice(vmId, deviceGeneralType, deviceTypeName) :
                 vmDeviceDao.getVmDeviceByVmIdAndType(vmId, deviceGeneralType);
 
         return deviceEnabled == vmDevices.isEmpty();
@@ -2133,7 +2133,7 @@ public boolean vmDeviceChanged(Guid vmId, VmDeviceGeneralType deviceGeneralType,
     public boolean vmDeviceChanged(Guid vmId, VmDeviceGeneralType deviceGeneralType, String deviceTypeName,
                                           VmDevice device) {
         List<VmDevice> vmDevices = deviceTypeName != null ?
-                vmDeviceDao.getVmDeviceByVmIdTypeAndDevice(vmId, deviceGeneralType, deviceTypeName):
+                vmDeviceDao.getVmDeviceByVmIdTypeAndDevice(vmId, deviceGeneralType, deviceTypeName) :
                 vmDeviceDao.getVmDeviceByVmIdAndType(vmId, deviceGeneralType);
 
         if (device == null) {
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmOverheadCalculatorImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmOverheadCalculatorImpl.java
index 63f52328322..01803360c0c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmOverheadCalculatorImpl.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/utils/VmOverheadCalculatorImpl.java
@@ -190,7 +190,7 @@ public int getStaticOverheadInMb(VM vm) {
      */
     @Override
     public long getSnapshotMemorySizeInBytes(VM vm) {
-        long videoRam = (long)videoDeviceSettings.totalVideoRAMSizeMb(vm,
+        long videoRam = (long) videoDeviceSettings.totalVideoRAMSizeMb(vm,
                 VmDeviceCommonUtils.isSingleQxlPci(vm.getStaticData()));
         return (vm.getVmMemSizeMb() + 200 + videoRam) * 1024 * 1024;
     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/AffinityValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/AffinityValidator.java
index 7e6a445f863..06545c0e5f0 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/AffinityValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/AffinityValidator.java
@@ -61,7 +61,7 @@ public static Result newFailed(ValidationResult validationResult) {
             return new Result(validationResult, null);
         }
 
-        public static final Result VALID = newValid((a, b) -> {});
+        public static final Result VALID = newValid((a, b) -> { });
     }
 
     @Inject
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
index e6ed1c90739..cdfcdd12444 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/ClusterValidator.java
@@ -510,13 +510,13 @@ private StoragePool getDataCenterOfNewCluster() {
 
     public List<String> getLowDeviceSpaceVolumes() {
         List<String> volumes = new ArrayList<>();
-        if(cluster.supportsGlusterService()) {
+        if (cluster.supportsGlusterService()) {
             List<GlusterVolumeEntity> glusterVolumeEntities = glusterVolumeDao.getByClusterId(cluster.getId());
-            if(glusterVolumeEntities != null && !glusterVolumeEntities.isEmpty()) {
-                for(GlusterVolumeEntity glusterVolumeEntity: glusterVolumeEntities) {
+            if (glusterVolumeEntities != null && !glusterVolumeEntities.isEmpty()) {
+                for (GlusterVolumeEntity glusterVolumeEntity: glusterVolumeEntities) {
                     if (((glusterVolumeEntity.getAdvancedDetails().getCapacityInfo().getUsedSize().doubleValue()
                             / glusterVolumeEntity.getAdvancedDetails().getCapacityInfo().getTotalSize().doubleValue())
-                            * 100) > (Integer)Config.getValue(ConfigValues.StorageDeviceSpaceLimit)) {
+                            * 100) > (Integer) Config.getValue(ConfigValues.StorageDeviceSpaceLimit)) {
                         volumes.add(glusterVolumeEntity.getName());
                     }
                 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
index db7916e47fb..d97255ce4b7 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/HostInterfaceValidator.java
@@ -60,7 +60,7 @@ public ValidationResult interfaceHasNameSet() {
                 .when(iface.getName() == null);
     }
 
-    public  ValidationResult interfaceAlreadyLabeledWith(String label) {
+    public ValidationResult interfaceAlreadyLabeledWith(String label) {
         return ValidationResult.failWith(EngineMessage.INTERFACE_ALREADY_LABELED,
             ReplacementUtils.createSetVariableString(VAR_LABELED_NIC, iface.getName()),
             ReplacementUtils.createSetVariableString(VAR_NIC_LABEL, label))
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/IsRoleNetworkIpConfigurationValid.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/IsRoleNetworkIpConfigurationValid.java
index a90846d26a0..0f6a2751e0c 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/IsRoleNetworkIpConfigurationValid.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/IsRoleNetworkIpConfigurationValid.java
@@ -56,7 +56,7 @@ private boolean hasBootProtocolOtherThanNoneOnIpv6(IpConfiguration ipConfigurati
      * must be in sync with {@link #validate(NetworkAttachment)}
      */
     public boolean validateAddressesOnExistingNic(VdsNetworkInterface nic) {
-        if (networkCluster.isMigration() || networkCluster.isDefaultRoute()  || networkCluster.isDisplay() || networkCluster.isGluster()) {
+        if (networkCluster.isMigration() || networkCluster.isDefaultRoute() || networkCluster.isDisplay() || networkCluster.isGluster()) {
             return StringUtils.isNotEmpty(nic.getIpv4Address()) || StringUtils.isNotEmpty(nic.getIpv6Address());
         }
         return StringUtils.isNotEmpty(nic.getIpv4Address());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidator.java
index dd644b4bdf7..7bcdb49f646 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/NetworkAttachmentValidator.java
@@ -64,7 +64,7 @@ public ValidationResult networkExists() {
          */
 
         // User did not specify neither id nor name.
-        if (networkId ==null && networkName == null) {
+        if (networkId == null && networkName == null) {
             return new ValidationResult(EngineMessage.NETWORK_ATTACHMENT_NETWORK_ID_OR_NAME_IS_NOT_SET);
         }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
index cc415529708..5698d34c31f 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/RunVmValidator.java
@@ -206,7 +206,7 @@ public boolean canRunVm(List<String> messages, StoragePool storagePool,
                 validate(snapshotsValidator.vmNotDuringSnapshot(vm.getId()), messages) &&
                 (runInUnknownStatus && vm.getStatus() == VMStatus.Unknown || validate(validateVmStatusUsingMatrix(vm), messages)) &&
                 validate(validateStoragePoolUp(vm, storagePool, getVmImageDisks()), messages) &&
-                validate(validateIsoPath(vm, runVmParam.getDiskPath(), runVmParam.getFloppyPath(), activeIsoDomainId), messages)  &&
+                validate(validateIsoPath(vm, runVmParam.getDiskPath(), runVmParam.getFloppyPath(), activeIsoDomainId), messages) &&
                 validate(vmDuringInitialization(vm), messages) &&
                 validate(validateStatelessVm(vm, runVmParam.getRunAsStateless()), messages) &&
                 validate(validateFloppy(), messages) &&
@@ -700,7 +700,7 @@ private Set<String> getInterfaceNetworkNames() {
 
     private List<Network> getClusterNetworks() {
         if (cachedClusterNetworks == null) {
-            cachedClusterNetworks =  networkDao.getAllForCluster(vm.getClusterId());
+            cachedClusterNetworks = networkDao.getAllForCluster(vm.getClusterId());
         }
 
         return cachedClusterNetworks;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicMacsUtils.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicMacsUtils.java
index dbf27d0a762..9005e2f9675 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicMacsUtils.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmNicMacsUtils.java
@@ -49,7 +49,7 @@ public <T extends VmNic> ValidationResult validateThereIsEnoughOfFreeMacs(List<T
     public void replaceInvalidEmptyStringMacAddressesWithNull(List<VmNetworkInterface> vmNetworkInterfaces) {
         vmNetworkInterfaces.stream()
                 .filter(vmNetworkInterface -> StringUtils.isEmpty(vmNetworkInterface.getMacAddress()))
-                .forEach(e->e.setMacAddress(null));
+                .forEach(e -> e.setMacAddress(null));
     }
 
 }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
index f416322a967..d64ae2f9746 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/VmValidator.java
@@ -285,13 +285,13 @@ VmDeviceUtils getVmDeviceUtils() {
         return Injector.get(VmDeviceUtils.class);
     }
 
-    public ValidationResult isPinnedVmRunningOnDedicatedHost(VM recentVm, VmStatic paramVm){
+    public ValidationResult isPinnedVmRunningOnDedicatedHost(VM recentVm, VmStatic paramVm) {
         boolean isPinned = paramVm.getMigrationSupport() == MigrationSupport.PINNED_TO_HOST;
         Guid vdsId = recentVm.getRunOnVds();
         List<Guid> hostList = paramVm.getDedicatedVmForVdsList();
 
         // If hostList is empty -> all hosts are allowed
-        if (isPinned && vdsId != null && !hostList.isEmpty() && !hostList.contains(vdsId)){
+        if (isPinned && vdsId != null && !hostList.isEmpty() && !hostList.contains(vdsId)) {
             // VM is NOT running on a dedicated host
             // fail with error message
             String hostName = String.format("$hostName %1$s", recentVm.getRunOnVdsName());
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidator.java
index 5415b1b8f1a..b9b6a632b27 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/network/VlanUntaggedNetworkExclusivenessValidator.java
@@ -30,7 +30,7 @@ final class VlanUntaggedNetworkExclusivenessValidator implements NetworkExclusiv
      */
     @Override
     public boolean isNetworkExclusive(List<NetworkType> networksOnIface) {
-        return  networksOnIface.stream().filter(untaggedNetworkPredicate).count() <= 1;
+        return networksOnIface.stream().filter(untaggedNetworkPredicate).count() <= 1;
     }
 
     @Override
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskValidator.java
index 3a8ec687087..6d47b0757ad 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/DiskValidator.java
@@ -80,7 +80,7 @@ public ValidationResult isUsingScsiReservationValid(VM vm, DiskVmElement dve, Lu
                 return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_SGIO_IS_FILTERED);
             }
         }
-        return  ValidationResult.VALID;
+        return ValidationResult.VALID;
     }
 
     public ValidationResult validateConnectionsInLun(StorageType storageType) {
@@ -89,7 +89,7 @@ public ValidationResult validateConnectionsInLun(StorageType storageType) {
                 case UNKNOWN:
                     return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_DISK_LUN_HAS_NO_VALID_TYPE);
                 case ISCSI:
-                    LUNs luns = ((LunDisk)disk).getLun();
+                    LUNs luns = ((LunDisk) disk).getLun();
                     if (luns.getLunConnections() == null || luns.getLunConnections().isEmpty()) {
                         return new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_DISK_LUN_ISCSI_MISSING_CONNECTION_PARAMS);
                     }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java
index c30323c47a5..db3fe024cd6 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainValidator.java
@@ -401,7 +401,7 @@ public ValidationResult isStorageFormatCompatibleWithDomain() {
             }
         }
 
-        return validationSucceeded? ValidationResult.VALID : new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_STORAGE_DOMAIN_FORMAT_ILLEGAL_HOST,
+        return validationSucceeded ? ValidationResult.VALID : new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_STORAGE_DOMAIN_FORMAT_ILLEGAL_HOST,
                     String.format("$storageFormat %1$s", storageDomain.getStorageFormat()));
     }
 
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/businessentities/SeparateNewAndModifiedInstances.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/businessentities/SeparateNewAndModifiedInstances.java
index 57ce120e820..1a9907b124a 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/businessentities/SeparateNewAndModifiedInstances.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/businessentities/SeparateNewAndModifiedInstances.java
@@ -9,7 +9,7 @@ public class SeparateNewAndModifiedInstances {
     private final List<BusinessEntity<?>> updatedEntities = new ArrayList<>();
 
     public SeparateNewAndModifiedInstances(List<? extends BusinessEntity<?>> businessEntities) {
-        for (BusinessEntity<?> businessEntity :  businessEntities) {
+        for (BusinessEntity<?> businessEntity : businessEntities) {
             boolean withoutId = businessEntity.getId() == null;
             if (withoutId) {
                 newEntities.add(businessEntity);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleCommandConfig.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleCommandConfig.java
index eae4e90916a..fe45ee6e986 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleCommandConfig.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleCommandConfig.java
@@ -260,7 +260,7 @@ public List<String> build() {
             ansibleCommand.add(artifactsDir);
             ansibleCommand.add("-i");
             ansibleCommand.add(String.valueOf(this.uuid));
-        } catch(Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException(e.getMessage(), e);
         }
         return ansibleCommand;
@@ -316,7 +316,7 @@ private void createExtraVarsFile(File env) {
         try {
             extraVars.createNewFile();
             Files.writeString(extraVars.toPath(), vars);
-        } catch(IOException ex) {
+        } catch (IOException ex) {
             throw new AnsibleRunnerCallException(
                 String.format("Failed to create host variables file '%s':", extraVars.toString()), ex);
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java
index 3cec31e0f73..03edb52b6c4 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleExecutor.java
@@ -179,7 +179,7 @@ public AnsibleReturnValue runCommand(AnsibleCommandConfig commandConfig, int tim
             log.error("Error executing playbook: {}", message);
             log.debug("InventoryException: ", ex);
             ret.setStderr(message);
-            ret.setAnsibleReturnCode(message.contains(SSH_TIMEOUT) ? AnsibleReturnCode.UNREACHABLE: AnsibleReturnCode.FAIL);
+            ret.setAnsibleReturnCode(message.contains(SSH_TIMEOUT) ? AnsibleReturnCode.UNREACHABLE : AnsibleReturnCode.FAIL);
         } catch (Exception ex) {
             log.error("Exception: {}", ex.getMessage());
             log.debug("Exception: ", ex);
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java
index a4819e03186..e99efd85720 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerClient.java
@@ -99,7 +99,7 @@ public void processEvents(AnsibleReturnValue returnValue,
             BiConsumer<String, String> fn,
             AnsibleRunnerLogger runnerLogger) {
         String jobEvents = getJobEventsDir(returnValue.getPlayUuid());
-        while(true){
+        while (true) {
             // get next event
             String event = getEventFileName(returnValue.getPlayUuid(), returnValue.getLastEventId() + 1);
             if (event == null) {
@@ -302,7 +302,7 @@ private JsonNode getEvent(String eventPath) {
                 );
             }
             currentNode = mapper.readTree(jsonOutput);
-        } catch(Exception ex) {
+        } catch (Exception ex) {
             throw new AnsibleRunnerCallException("Failed to read event: %1$s", eventPath);
         }
         return currentNode;
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerLogger.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerLogger.java
index db4df94097a..71f1640e087 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerLogger.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/ansible/AnsibleRunnerLogger.java
@@ -36,7 +36,7 @@ public Path getLogFile() {
         return logFile;
     }
 
-    public void log(String str, Object ...params) {
+    public void log(String str, Object ... params) {
         if (str == null) {
             return;
         }
diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/cinderlib/CinderlibExecutor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/cinderlib/CinderlibExecutor.java
index 08ba34f8c82..f8650a47df2 100644
--- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/cinderlib/CinderlibExecutor.java
+++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/common/utils/cinderlib/CinderlibExecutor.java
@@ -26,8 +26,8 @@ public class CinderlibExecutor {
     private static final String CINDERLIB_DIR = "/cinderlib";
     private static final String CINDERLIB_DB_USER = "CINDERLIB_DB_USER";
     private static final String CINDERLIB_DB_PASSWORD = "CINDERLIB_DB_PASSWORD";
-    private static final String CINDERLIB_DB_HOST= "CINDERLIB_DB_HOST";
-    private static final String CINDERLIB_DB_PORT="CINDERLIB_DB_PORT";
+    private static final String CINDERLIB_DB_HOST = "CINDERLIB_DB_HOST";
+    private static final String CINDERLIB_DB_PORT = "CINDERLIB_DB_PORT";
     private static final String CINDERLIB_DB_DATABASE = "CINDERLIB_DB_DATABASE";
     private final String urlTemplate = "postgresql+psycopg2://%s:%s@%s:%s/%s";
     private String url;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
index 9070cbdb427..cf10f5e8803 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmCommandTest.java
@@ -38,7 +38,7 @@
 import org.ovirt.engine.core.compat.Version;
 import org.ovirt.engine.core.utils.MockConfigDescriptor;
 import org.ovirt.engine.core.utils.MockConfigExtension;
-import  org.ovirt.engine.core.utils.MockedConfig;
+import org.ovirt.engine.core.utils.MockedConfig;
 
 
 @ExtendWith(MockConfigExtension.class)
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
index 13443cdcab2..9853fdadcc1 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVmTemplateCommandTest.java
@@ -235,17 +235,17 @@ public void testDiskAliasNotEmpty() {
     }
 
     @Test
-    public void testPermissionsForAddingTemplateDedicatedHostNotChanged(){
+    public void testPermissionsForAddingTemplateDedicatedHostNotChanged() {
         setupDedicatedHostForVmAndTemplate(true);
 
         List<PermissionSubject> permissionCheckSubjects = cmd.getPermissionCheckSubjects();
-        for(PermissionSubject permissionSubject : permissionCheckSubjects){
+        for (PermissionSubject permissionSubject : permissionCheckSubjects) {
             assertNotEquals(ActionGroup.EDIT_ADMIN_TEMPLATE_PROPERTIES, permissionSubject.getActionGroup());
         }
     }
 
     @Test
-    public void testPermissionsForAddingTemplateDedicatedHostChanged(){
+    public void testPermissionsForAddingTemplateDedicatedHostChanged() {
         setupDedicatedHostForVmAndTemplate(false);
 
         PermissionSubject editDefaultHostPermission = new PermissionSubject(vm.getStoragePoolId(),
@@ -265,7 +265,7 @@ private void verifyPermissions(PermissionSubject editDefaultHostPermission, Perm
         assertEquals(permissionSubject.getObjectType(), editDefaultHostPermission.getObjectType());
     }
 
-    private void setupDedicatedHostForVmAndTemplate(boolean setDefaultHostForTemplate){
+    private void setupDedicatedHostForVmAndTemplate(boolean setDefaultHostForTemplate) {
         Guid hostId = Guid.newGuid();
         vm.setDedicatedVmForVdsList(Collections.singletonList(hostId));
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
index b6cb6d13b4c..7b66093230e 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommandBaseTest.java
@@ -126,7 +126,7 @@ public void testExtractVariableDeclarationsForStaticMsgs() {
     public void testExtractVariableDeclarationsForDynamicMsgs() {
         String msg1_1 = "ACTION_TYPE_FAILED_TEMPLATE_IS_USED_FOR_CREATE_VM";
         String msg1_2 = "$VmName Vm1";
-        String msg2   = "IRS_FAILED_CREATING_SNAPSHOT";
+        String msg2 = "IRS_FAILED_CREATING_SNAPSHOT";
         String msg3_1 = "ACTION_TYPE_FAILED_VM_SNAPSHOT_HAS_NO_CONFIGURATION";
         String msg3_2 = "$VmName Vm2";
         String msg3_3 = "$SnapshotName Snapshot";
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java
index 20094dc23e1..14163c20b55 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/CommonVmPoolCommandTestAbstract.java
@@ -51,7 +51,7 @@
 import org.ovirt.engine.core.dao.VmTemplateDao;
 import org.ovirt.engine.core.dao.network.VmNicDao;
 import org.ovirt.engine.core.utils.MockConfigDescriptor;
-import  org.ovirt.engine.core.utils.MockedConfig;
+import org.ovirt.engine.core.utils.MockedConfig;
 
 public abstract class CommonVmPoolCommandTestAbstract extends BaseCommandTest {
     private final Guid clusterId = Guid.newGuid();
@@ -63,7 +63,7 @@ public abstract class CommonVmPoolCommandTestAbstract extends BaseCommandTest {
     private Cluster cluster = mockCluster();
     protected VM testVm = mockVm();
     protected VmPool vmPools = mockVmPools();
-    protected List<VM>  vms = mockVms();
+    protected List<VM> vms = mockVms();
     protected static int VM_COUNT = 5;
     protected VmTemplate vmTemplate = mockVmTemplate();
     protected StoragePool storagePool = mockStoragePool();
@@ -216,7 +216,7 @@ private VM mockVm() {
     }
 
     private List<VM> mockVms() {
-        List<VM>  vms = new ArrayList<>();
+        List<VM> vms = new ArrayList<>();
         vms.add(mockVm());
         return vms;
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LabelActionParametersTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LabelActionParametersTest.java
index 55135eb1f23..756ed2a1525 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LabelActionParametersTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LabelActionParametersTest.java
@@ -42,7 +42,7 @@ private void validateLabelNameLength(Label label, boolean isValidLabelName) {
 
         List<String> validationMessages = ValidationUtils.validateInputs(new ArrayList<>(), parameters);
 
-        if(isValidLabelName){
+        if (isValidLabelName) {
             assertThat(validationMessages).isEmpty();
         } else {
             assertThat(validationMessages)
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunnerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunnerTest.java
index 5091dc37d47..49ecc5f025a 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunnerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/PrevalidatingMultipleActionsRunnerTest.java
@@ -17,7 +17,7 @@
 import org.ovirt.engine.core.common.action.ActionType;
 import org.ovirt.engine.core.common.action.DiskProfileParameters;
 
-public class PrevalidatingMultipleActionsRunnerTest extends MultipleActionsRunnerBaseTest{
+public class PrevalidatingMultipleActionsRunnerTest extends MultipleActionsRunnerBaseTest {
 
     private static CommandContext commandContext = CommandContext.createContext(new
             DiskProfileParameters().getSessionId()).withCompensationContext(NoOpCompensationContext.getInstance());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
index 87ef2cb93fe..4cd17a0e333 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/RemoveVdsCommandTest.java
@@ -363,7 +363,7 @@ public void removeLastHost() {
     @MethodSource("removeWithAnsiblePlaybookScenarios")
     public void auditAnsibleRemoveVdsPlaybookExecution(AnsibleReturnCode ansibleReturnCode,
                                                        VDSStatus vdsStatus,
-                                                       AuditLogType  expectedAuditLogType) {
+                                                       AuditLogType expectedAuditLogType) {
         mockVdsWithStatus(vdsStatus);
         mockIsGlusterEnabled(true);
         mockHasMultipleClusters(false);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunnerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunnerTest.java
index a4f33053211..d7dcf4fdaf7 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunnerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/SequentialMultipleActionsRunnerTest.java
@@ -16,7 +16,7 @@
 import org.ovirt.engine.core.common.action.ActionType;
 import org.ovirt.engine.core.common.action.DiskProfileParameters;
 
-public class SequentialMultipleActionsRunnerTest extends MultipleActionsRunnerBaseTest{
+public class SequentialMultipleActionsRunnerTest extends MultipleActionsRunnerBaseTest {
 
     private static CommandContext commandContext = CommandContext.createContext(new
             DiskProfileParameters().getSessionId()).withCompensationContext(NoOpCompensationContext.getInstance());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java
index 477322f603c..51749814acb 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java
@@ -539,7 +539,7 @@ public void randomAdditionalRngDeviceUsed() {
 
     @Test
     @MockedConfig("configForClusterWithVirtGlusterServicesNotAllowed")
-    public void memoryOptimizationWithoutKsmOrBallooning(){
+    public void memoryOptimizationWithoutKsmOrBallooning() {
         final Cluster cluster = createDefaultCluster();
         cluster.setMaxVdsMemoryOverCommit(150);
         cluster.setEnableKsm(false);
@@ -551,7 +551,7 @@ public void memoryOptimizationWithoutKsmOrBallooning(){
 
     @Test
     @MockedConfig("configForClusterWithVirtGlusterServicesNotAllowed")
-    public void memoryOptimizationLowerThenZeroWithoutKsmOrBallooning(){
+    public void memoryOptimizationLowerThenZeroWithoutKsmOrBallooning() {
         final Cluster cluster = createDefaultCluster();
         cluster.setMaxVdsMemoryOverCommit(-52);
         cluster.setEnableKsm(false);
@@ -563,7 +563,7 @@ public void memoryOptimizationLowerThenZeroWithoutKsmOrBallooning(){
 
     @Test
     @MockedConfig("configForClusterWithVirtGlusterServicesNotAllowed")
-    public void memoryOptimizationWithoutBallooning(){
+    public void memoryOptimizationWithoutBallooning() {
         final Cluster cluster = createDefaultCluster();
         cluster.setMaxVdsMemoryOverCommit(0);
         cluster.setEnableKsm(true);
@@ -575,7 +575,7 @@ public void memoryOptimizationWithoutBallooning(){
 
     @Test
     @MockedConfig("configForClusterWithVirtGlusterServicesNotAllowed")
-    public void memoryOptimizationWithoutKsm(){
+    public void memoryOptimizationWithoutKsm() {
         final Cluster cluster = createDefaultCluster();
         cluster.setMaxVdsMemoryOverCommit(200);
         cluster.setEnableKsm(false);
@@ -587,7 +587,7 @@ public void memoryOptimizationWithoutKsm(){
 
     @Test
     @MockedConfig("configForClusterWithVirtGlusterServicesNotAllowed")
-    public void memoryOptimizationWithKsmAndBallooning(){
+    public void memoryOptimizationWithKsmAndBallooning() {
         final Cluster cluster = createDefaultCluster();
         cluster.setMaxVdsMemoryOverCommit(200);
         cluster.setEnableKsm(true);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
index 8cad8798ef3..082825c719d 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/VmHandlerTest.java
@@ -112,7 +112,7 @@ private void populateVmWithDisks(List<Disk> disks, VM vm) {
                     false,
                     "",
                     null,
-                    disk.getDiskStorageType() == DiskStorageType.IMAGE ? ((DiskImage)disk).getSnapshotId() : null,
+                    disk.getDiskStorageType() == DiskStorageType.IMAGE ? ((DiskImage) disk).getSnapshotId() : null,
                     null);
             vm.getManagedVmDeviceMap().put(disk.getId(), device);
         }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/common/comparator/NumericSuffixNameableComparatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/common/comparator/NumericSuffixNameableComparatorTest.java
index 812c7a72cb3..56faf068b0b 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/common/comparator/NumericSuffixNameableComparatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/common/comparator/NumericSuffixNameableComparatorTest.java
@@ -39,7 +39,7 @@ public void compare(String name1, String name2, int expected) {
         assertThat(underTest.compare(nameable1, nameable2), expectedMatcher);
     }
 
-    public static Stream<Arguments> compare()  {
+    public static Stream<Arguments> compare() {
         return Stream.of(
                 Arguments.of(null, null, 0),
                 Arguments.of(null, "", -1),
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
index ebc74b06a9e..9e0f7d45f59 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/ImportVmCommandTest.java
@@ -69,7 +69,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.Version;
 import org.ovirt.engine.core.utils.MockConfigDescriptor;
-import  org.ovirt.engine.core.utils.MockedConfig;
+import org.ovirt.engine.core.utils.MockedConfig;
 import org.ovirt.engine.core.utils.RandomUtils;
 import org.ovirt.engine.core.utils.RandomUtilsSeedingExtension;
 import org.ovirt.engine.core.vdsbroker.vdsbroker.CloudInitHandler;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicFlowTestUtils.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicFlowTestUtils.java
index d0d1d11a496..dbd3f8b7ee8 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicFlowTestUtils.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicFlowTestUtils.java
@@ -32,7 +32,7 @@ private static String printMapping(ExternalVnicProfileMapping mapping) {
         StringBuilder sb = new StringBuilder();
         sb.append(mapping.getSourceNetworkName()).append(", ")
                 .append(mapping.getSourceProfileName()).append(", ")
-                .append(mapping.getTargetProfileId() != null ? mapping.getTargetProfileId().toString(): "null").append(", ")
+                .append(mapping.getTargetProfileId() != null ? mapping.getTargetProfileId().toString() : "null").append(", ")
                 .append(mapping.getTargetNetworkName()).append(", ")
                 .append(mapping.getTargetProfileName());
         return sb.toString();
@@ -74,11 +74,11 @@ private static void printContext(MapVnicContext ctx, String ctxName) {
         }
     }
 
-    static MapVnicContext makeCtx(Guid clusterId, ExternalVnicProfileMapping mapping, VmNetworkInterface vnic){
+    static MapVnicContext makeCtx(Guid clusterId, ExternalVnicProfileMapping mapping, VmNetworkInterface vnic) {
         return new MapVnicContext().setClusterId(clusterId).setProfileMapping(mapping).setOvfVnic(vnic);
     }
 
-    static MapVnicContext makeCtx(Guid clusterId, VmNetworkInterface vnic){
+    static MapVnicContext makeCtx(Guid clusterId, VmNetworkInterface vnic) {
         return new MapVnicContext().setClusterId(clusterId).setOvfVnic(vnic);
     }
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsFlowTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsFlowTest.java
index 5029c953932..30f3ef334a8 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsFlowTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/exportimport/vnics/MapVnicsFlowTest.java
@@ -35,7 +35,7 @@ public class MapVnicsFlowTest {
 
     private static final ExternalVnicProfileMapping NO_SOURCE_MAPPING = new ExternalVnicProfileMapping(null, null, PROFILE_ID);
     private static final ExternalVnicProfileMapping NO_TARGET_MAPPING = new ExternalVnicProfileMapping(NETWORK_NAME, PROFILE2_NAME, null);
-    private static final ExternalVnicProfileMapping FULL_MAPPING =  new ExternalVnicProfileMapping(NETWORK_NAME, PROFILE1_NAME, PROFILE_ID);
+    private static final ExternalVnicProfileMapping FULL_MAPPING = new ExternalVnicProfileMapping(NETWORK_NAME, PROFILE1_NAME, PROFILE_ID);
 
     private MapVnicsFlow underTest;
 
@@ -48,11 +48,11 @@ public static Stream<Arguments> flow() {
         Pair someMappingsAndNullOvfs = testSomeMappingsAndNullOvfs();
 
         return Stream.of(
-            Arguments.of(nullMappingsAndNullOvfs.getFirst(),       nullMappingsAndNullOvfs.getSecond()  ),
-            Arguments.of(nullMappingsAndEmptyOvfs.getFirst(),      nullMappingsAndEmptyOvfs.getSecond() ),
-            Arguments.of(emptyMappingsAndEmptyOvfs.getFirst(),     emptyMappingsAndEmptyOvfs.getSecond()),
-            Arguments.of(emptyMappingsAndNullOvfs.getFirst(),      emptyMappingsAndNullOvfs.getSecond() ),
-            Arguments.of(someMappingsAndNullOvfs.getFirst(),       someMappingsAndNullOvfs.getSecond()  )
+            Arguments.of(nullMappingsAndNullOvfs.getFirst(), nullMappingsAndNullOvfs.getSecond() ),
+            Arguments.of(nullMappingsAndEmptyOvfs.getFirst(), nullMappingsAndEmptyOvfs.getSecond() ),
+            Arguments.of(emptyMappingsAndEmptyOvfs.getFirst(), emptyMappingsAndEmptyOvfs.getSecond()),
+            Arguments.of(emptyMappingsAndNullOvfs.getFirst(), emptyMappingsAndNullOvfs.getSecond() ),
+            Arguments.of(someMappingsAndNullOvfs.getFirst(), someMappingsAndNullOvfs.getSecond() )
         );
     }
 
@@ -141,7 +141,7 @@ private static Pair<MapVnicsContext, MapVnicContext> testSomeMappingsAndNullOvfs
     /**
      * setup a context with user input - mappings and ovf vnics - that would be under test
      */
-    private static MapVnicsContext setupContext(List<ExternalVnicProfileMapping> mappings, List<VmNetworkInterface> vnics, String name){
+    private static MapVnicsContext setupContext(List<ExternalVnicProfileMapping> mappings, List<VmNetworkInterface> vnics, String name) {
         return new MapVnicsContext(name).setUserMappings(mappings).setOvfVnics(vnics);
     }
 }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
index 752e936eb21..ffc15456b4b 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/AddBricksToGlusterVolumeCommandTest.java
@@ -248,7 +248,7 @@ public void validateFailsOnSameServer() {
     @Test
     public void validateFailsOnSameServerIncreasingReplica() {
         initTestCommand(volumeIdRepl, getBricks(volumeIdRepl, 2, true), 3, 0, false);
-        GlusterVolumeEntity vol =  getMultiBrickVolume(volumeIdRepl, 4);
+        GlusterVolumeEntity vol = getMultiBrickVolume(volumeIdRepl, 4);
         vol.setVolumeType(GlusterVolumeType.DISTRIBUTED_REPLICATE);
         vol.setReplicaCount(2);
         doReturn(vol).when(volumeDao).getById(volumeIdRepl);
@@ -262,7 +262,7 @@ public void validateSucceedsonServerCheckIncreasingReplica() {
         bricks.add(getBrick(volumeIdRepl, Guid.newGuid(), "/brick2"));
         initTestCommand(volumeIdRepl, bricks, 3, 0, false);
         doReturn(getVdsStatic()).when(vdsStaticDao).get(any());
-        GlusterVolumeEntity vol =  getMultiBrickVolume(volumeIdRepl, 4);
+        GlusterVolumeEntity vol = getMultiBrickVolume(volumeIdRepl, 4);
         vol.setVolumeType(GlusterVolumeType.DISTRIBUTED_REPLICATE);
         vol.setReplicaCount(2);
         doReturn(vol).when(volumeDao).getById(volumeIdRepl);
@@ -276,7 +276,7 @@ public void validateSucceedsonServerCheck() {
         bricks.add(getBrick(volumeIdRepl, Guid.newGuid(), "/brick2"));
         initTestCommand(volumeIdRepl, bricks, 2, 0, false);
         doReturn(getVdsStatic()).when(vdsStaticDao).get(any());
-        GlusterVolumeEntity vol =  getMultiBrickVolume(volumeIdRepl, 4);
+        GlusterVolumeEntity vol = getMultiBrickVolume(volumeIdRepl, 4);
         vol.setVolumeType(GlusterVolumeType.DISTRIBUTED_REPLICATE);
         vol.setReplicaCount(2);
         doReturn(vol).when(volumeDao).getById(volumeIdRepl);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
index fd993d2df53..117af8fe366 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/CreateGlusterVolumeCommandTest.java
@@ -111,7 +111,7 @@ public void prepareMocks() {
         doReturn(getCluster(true, Version.v4_3)).when(clusterDao).get(any());
     }
 
-    private GlusterVolumeEntity getVolume(int brickCount, boolean withDuplicateBricks){
+    private GlusterVolumeEntity getVolume(int brickCount, boolean withDuplicateBricks) {
         return getVolume(brickCount, withDuplicateBricks, GlusterVolumeType.DISTRIBUTE, 0, false);
     }
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQueryTest.java
index a6c92efaf80..ff9f253a308 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQueryTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GetGlusterVolumeGeoRepSessionsQueryTest.java
@@ -17,7 +17,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dao.gluster.GlusterGeoRepDao;
 
-public class GetGlusterVolumeGeoRepSessionsQueryTest extends AbstractQueryTest<IdQueryParameters, GetGlusterVolumeGeoRepSessionsQuery<IdQueryParameters>>{
+public class GetGlusterVolumeGeoRepSessionsQueryTest extends AbstractQueryTest<IdQueryParameters, GetGlusterVolumeGeoRepSessionsQuery<IdQueryParameters>> {
 
     private Guid masterVolumeId = Guid.newGuid();
     private Guid sessionId = Guid.newGuid();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java
index fd6bed3a69d..89e1c082282 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookCommandTest.java
@@ -123,7 +123,7 @@ protected VDS getServer(Guid id, String name, Guid clusterId) {
     }
 
     protected VDS getServer(Guid id, String name, Guid clusterId, VDSStatus status) {
-        VDS server =  new VDS();
+        VDS server = new VDS();
         server.setId(id);
         server.setVdsName(name);
         server.setStatus(status);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java
index 13994e510cb..2e42c5b71c0 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterHookSyncJobTest.java
@@ -102,7 +102,7 @@ private Object getHookContentVDSReturnVal() {
 
     private List<GlusterHookEntity> getHooksList(int listCount, boolean setIds) {
         List<GlusterHookEntity> hookList = new ArrayList<>();
-        for (int i=0; i< listCount; i++) {
+        for (int i = 0; i < listCount; i++) {
             hookList.add(getHook( i , setIds));
         }
         return hookList;
@@ -115,7 +115,7 @@ private GlusterHookEntity getHook(int index, boolean setId) {
         hook.setStatus(GlusterHookStatus.ENABLED);
         hook.setGlusterCommand("create");
         hook.setStage("PRE");
-        hook.setName("hook-"+index);
+        hook.setName("hook-" + index);
         if (setId) {
             hook.setId(EXISTING_HOOK_IDS[index]);
             hook.setClusterId(CLUSTER_GUIDS[0]);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java
index 7facca678a6..d1455133550 100755
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/GlusterTasksSyncJobTest.java
@@ -174,7 +174,7 @@ private Step createStep(Guid taskGuid) {
         Calendar stepTime = Calendar.getInstance();
         if (taskGuid.equals(TASK_GUIDS[2])) {
             //only create TASK_GUIDS[2] as older job
-            stepTime.set(Calendar.HOUR, stepTime.get(Calendar.HOUR) -1);
+            stepTime.set(Calendar.HOUR, stepTime.get(Calendar.HOUR) - 1);
         }
         step.setStartTime(stepTime.getTime());
         return step;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
index ab8ad1b5394..62dcbd2630c 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterHooksCommandTest.java
@@ -52,7 +52,7 @@ private Cluster getCluster() {
     }
 
     protected VDS getServer() {
-        VDS server =  new VDS();
+        VDS server = new VDS();
         server.setId(Guid.newGuid());
         server.setVdsName("VDS1");
         server.setStatus(VDSStatus.Up);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommandTest.java
index d3f2438c101..1d7ba4324b7 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/RefreshGlusterVolumeDetailsCommandTest.java
@@ -101,7 +101,7 @@ private List<GlusterBrickEntity> getBricks(Guid volumeId, int n) {
     }
 
     protected VDS getServer() {
-        VDS server =  new VDS();
+        VDS server = new VDS();
         server.setId(Guid.newGuid());
         server.setVdsName("VDS1");
         server.setStatus(VDSStatus.Up);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeBrickCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeBrickCommandTest.java
index c3fc19cd02e..a7b69bd63b9 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeBrickCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResetGlusterVolumeBrickCommandTest.java
@@ -109,13 +109,13 @@ private GlusterVolumeEntity getVolume(Guid volumeId, GlusterVolumeType volumeTyp
         volumeEntity.setName("test-vol");
         volumeEntity.addAccessProtocol(AccessProtocol.GLUSTER);
         volumeEntity.addTransportType(TransportType.TCP);
-        if(volumeType.equals(GlusterVolumeType.DISTRIBUTED_REPLICATE)) {
+        if (volumeType.equals(GlusterVolumeType.DISTRIBUTED_REPLICATE)) {
             volumeEntity.setStatus((volumeId == volumeId1) ? GlusterStatus.UP : GlusterStatus.DOWN);
             volumeEntity.setBricks(getBricks(volumeId, "distrib", 2));
             volumeEntity.setVolumeType(GlusterVolumeType.DISTRIBUTED_REPLICATE);
             volumeEntity.setClusterId(clusterId);
             return volumeEntity;
-        } else if(volumeType.equals(GlusterVolumeType.REPLICATE)) {
+        } else if (volumeType.equals(GlusterVolumeType.REPLICATE)) {
             volumeEntity.setStatus(GlusterStatus.UP);
             volumeEntity.setBricks(getBricks(volumeId, "repl", brickCount));
             volumeEntity.setVolumeType(GlusterVolumeType.REPLICATE);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommandTest.java
index 785e50b2504..2751dde9dee 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ResumeGeoRepSessionCommandTest.java
@@ -21,7 +21,7 @@ protected ResumeGeoRepSessionCommand createCommand() {
     }
 
     protected GlusterGeoRepSession getGeoRepSession(Guid gSessionId, GeoRepSessionStatus status, Guid masterVolumeID) {
-        GlusterGeoRepSession session =  super.getGeoRepSession(gSessionId, status);
+        GlusterGeoRepSession session = super.getGeoRepSession(gSessionId, status);
         session.setMasterVolumeId(startedVolumeId);
         return session;
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommandTest.java
index 99bea4f1219..1d2d0fd7a8c 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/UpdateGlusterHookCommandTest.java
@@ -119,7 +119,7 @@ public void executeCommandFailedWhenServerIdPresent() {
         mockForReadContent(false, EngineError.GlusterHookNotFound);
         try {
             cmd.executeCommand();
-        }catch (EngineException e) {
+        } catch (EngineException e) {
             assertEquals(EngineError.GlusterHookNotFound, e.getErrorCode());
         }
         verify(hooksDao, never()).updateGlusterHook(any());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessorTest.java
index 70a92fd7269..2ba88e76252 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/events/GlusterEventsProcessorTest.java
@@ -11,7 +11,7 @@ public class GlusterEventsProcessorTest {
     @Test
     public void testEventsSerialize() {
         JsonObjectDeserializer deserializer = new JsonObjectDeserializer();
-        String jsonBody="{'event': 'BRICK_CONNECTED', 'message': "
+        String jsonBody = "{'event': 'BRICK_CONNECTED', 'message': "
                 + "{'peer': 'SERVER1', "
                 + "'volume': 'vmstore', 'brick': '/gluster_bricks/vmstore/vmstore'}, "
                 + "'nodeid': '82e53643-48ca-4808-a759-dfaaebc28914', 'ts': 1554962105}";
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/CopyHostNetworksHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/CopyHostNetworksHelperTest.java
index 6b72514bd3c..d5d0f830de9 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/CopyHostNetworksHelperTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/CopyHostNetworksHelperTest.java
@@ -457,7 +457,7 @@ void printIfaceAttachment(String ifaceName, Guid networkId) {
                 printShape(ifaceName);
                 String networkName = toNetworkName(networkId);
                 printShape(networkName);
-                printout.append("    " + prefix() + ifaceName + " -> " + prefix() +  networkName);
+                printout.append("    " + prefix() + ifaceName + " -> " + prefix() + networkName);
             }
             printIfaceAttachment = true;
         }
@@ -465,7 +465,7 @@ void printIfaceAttachment(String ifaceName, Guid networkId) {
         void printVlanToNetwork(Integer vlanId, Guid networkId) {
             String networkName = toNetworkName(networkId);
             printShape(networkName);
-            printout.append("    " + prefix() + toVlanName(vlanId) + " -> " + prefix() +  networkName);
+            printout.append("    " + prefix() + toVlanName(vlanId) + " -> " + prefix() + networkName);
             printIfaceAttachment = false;
         }
 
@@ -529,7 +529,7 @@ void printDigraphSuffix() {
         }
 
         void printDigraphPrefix() {
-            switch(node){
+            switch (node) {
             case SOURCE:
                 printout.append("digraph ScenarioResult {\n"
                         + "\n"
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java
index f1cf04be649..12c66f60c67 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/HostSetupNetworksValidatorTest.java
@@ -1181,7 +1181,7 @@ public void testAddNetworkToNicAlongWithAddingItIntoBond() {
         VdsNetworkInterface nicA = createNic("nicA");
         VdsNetworkInterface nicB = createNic("nicB");
 
-        NetworkAttachment networkAttachment = createNetworkAttachment(networkA, (Guid)null);
+        NetworkAttachment networkAttachment = createNetworkAttachment(networkA, (Guid) null);
         networkAttachment.setNicId(nicA.getId());
         networkAttachment.setNicName(nicA.getName());
         networkAttachment.setNetworkId(networkA.getId());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidatorTest.java
index 1ca0b783a47..4e5fe3b9ee5 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/host/UnmanagedNetworkValidatorTest.java
@@ -35,7 +35,7 @@ public class UnmanagedNetworkValidatorTest {
     private UnmanagedNetworkValidator validator = new UnmanagedNetworkValidator();
 
     @Test
-    public void testFilterNicsWithUnmanagedNetworks(){
+    public void testFilterNicsWithUnmanagedNetworks() {
         VdsNetworkInterface nicManaged = createNicWithNetworkImplementationDetails("eth0", true);
         VdsNetworkInterface nicUnmanaged = createNicWithNetworkImplementationDetails("eth1", false);
         List<VdsNetworkInterface> existingInterfaces = Arrays.asList(nicManaged, nicUnmanaged);
@@ -45,14 +45,14 @@ public void testFilterNicsWithUnmanagedNetworks(){
     }
 
     @Test
-    public void testFilterNicsWithUnmanagedNetworksNetworkImplementationDetailsIsNull(){
+    public void testFilterNicsWithUnmanagedNetworksNetworkImplementationDetailsIsNull() {
         VdsNetworkInterface nicWithNetworkImplementationsDetailsNull = createNic("eth1");
         List<VdsNetworkInterface> existingInterfaces = Collections.singletonList(nicWithNetworkImplementationsDetailsNull);
         Set<String> unmanagedNicsSet = validator.filterNicsWithUnmanagedNetworks(existingInterfaces, Collections.emptySet());
         assertTrue(unmanagedNicsSet.isEmpty());
     }
 
-    public void testFilterNicsWithUnmanagedNetworksUmngmtNetRemoved(){
+    public void testFilterNicsWithUnmanagedNetworksUmngmtNetRemoved() {
 
         VdsNetworkInterface nicWithUnmanagedToBeRemoved = createNicWithNetworkImplementationDetails("eth_unmanaged1_toBeRemoved", false);
         VdsNetworkInterface nicWithUnmanaged = createNicWithNetworkImplementationDetails("eth_unmanaged", false);
@@ -69,7 +69,7 @@ public void testFilterNicsWithUnmanagedNetworksUmngmtNetRemoved(){
     }
 
     @Test
-    public void testValidateLabels(){
+    public void testValidateLabels() {
         String nicWithUnmanagedNetwork = "eth_unmanaged";
 
         NicLabel label = new NicLabel(null, "eth1", "label1");
@@ -91,7 +91,7 @@ public void testValidateLabels(){
     }
 
     @Test
-    public void testValidateLabelsForVlan(){
+    public void testValidateLabelsForVlan() {
         Nic nic = createNic("eth0");
 
         NicLabel label = new NicLabel(null, "eth1", "label1");
@@ -121,7 +121,7 @@ public void testValidateLabelsForVlan(){
     }
 
     @Test
-    public void testValidateAttachements(){
+    public void testValidateAttachements() {
         String unmanagedNicName = "eth0";
         NetworkAttachment attachement1 = new NetworkAttachment();
         attachement1.setNetworkName("network1");
@@ -151,7 +151,7 @@ public void testValidateAttachements(){
     }
 
     @Test
-    public void testValidateAttachementsForVlans(){
+    public void testValidateAttachementsForVlans() {
         String unmanagedBaseNicName = "eth0";
 
         NetworkAttachment attachement1 = new NetworkAttachment();
@@ -183,7 +183,7 @@ public void testValidateAttachementsForVlans(){
     }
 
     @Test
-    public void testValidateRemovedUnmanagedNetworks(){
+    public void testValidateRemovedUnmanagedNetworks() {
         String networkName = "networkName";
 
         Nic nic = createNicWithNetworkImplementationDetails("eth0", false);
@@ -218,7 +218,7 @@ public void testValidateRemovedUnmanagedNetworks(){
                         ReplacementUtils.createSetVariableString(NETWORK, unmanagedNetworkNotPresentOnAnyNic)));
     }
 
-    private Nic createNic(String name){
+    private Nic createNic(String name) {
         Nic nic = new Nic();
         nic.setName(name);
         return nic;
@@ -236,7 +236,7 @@ public VdsNetworkInterface createVlanNic(VdsNetworkInterface baseNic, String nic
         return vlanNic;
     }
 
-    private Nic createNicWithNetworkImplementationDetails(String name, boolean isManaged){
+    private Nic createNicWithNetworkImplementationDetails(String name, boolean isManaged) {
         Nic nic = createNic(name);
         NetworkImplementationDetails networkImplementationDetails1 = new NetworkImplementationDetails(true, isManaged);
         nic.setNetworkImplementationDetails(networkImplementationDetails1);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/MacsStorageTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/MacsStorageTest.java
index 77542216d93..dfbc2d666be 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/MacsStorageTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/MacsStorageTest.java
@@ -34,7 +34,7 @@ public class MacsStorageTest {
     private static final int RANGE_TO = 19;
     private static final int NUMBER_OF_MACS = 12;
     private static final boolean ALLOW_DUPLICATES = true;
-    private static final List<Integer> RANGE_BOUNDARIES =Arrays.asList(
+    private static final List<Integer> RANGE_BOUNDARIES = Arrays.asList(
         RANGE_FROM,
         RANGE_FROM + NUMBER_OF_MACS / 3,
         RANGE_FROM + NUMBER_OF_MACS / 3 * 2,
@@ -100,7 +100,7 @@ private void addRangesToStorage(List<Range> ranges, MacsStorage macsStorage) {
     }
 
     private void mockAvailableMacsInRange(List<Range> ranges, List<Integer> rangesWithoutAvailableMacs) {
-        for(int i = 0; i < ranges.size(); i++) {
+        for (int i = 0; i < ranges.size(); i++) {
             Range range = ranges.get(i);
             boolean shouldBeEmpty = rangesWithoutAvailableMacs.contains(i);
             when(range.getAvailableCount()).thenReturn(shouldBeEmpty ? 0 : 1);
@@ -109,7 +109,7 @@ private void mockAvailableMacsInRange(List<Range> ranges, List<Integer> rangesWi
 
     private List<Range> createMockedRanges(int count) {
         List<Range> result = new ArrayList<>(count);
-        for(int i = 0; i < count; i++) {
+        for (int i = 0; i < count; i++) {
             result.add(mock(Range.class));
         }
         return result;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/RangeTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/RangeTest.java
index a097688e706..e197835f3b4 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/RangeTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/macpool/RangeTest.java
@@ -88,7 +88,7 @@ public void testFreeMac() {
         assertThat(rangeOf10Macs.getAvailableCount(), is(0));
         assertThat(rangeOf10Macs.containsDuplicates(), is(false));
 
-        for(int i = 1; i <= NUMBER_OF_MACS; i++) {
+        for (int i = 1; i <= NUMBER_OF_MACS; i++) {
             rangeOf10Macs.freeMac(allocatedMacs.remove(0));
             assertThat(rangeOf10Macs.getAvailableCount(), is(i));
             assertThat(rangeOf10Macs.containsDuplicates(), is(false));
@@ -160,7 +160,7 @@ public void testMaxSizeRange() {
     public void testOrderOrAcquiredMACs() {
         Range range = new Range(new LongRange(0, 5));
         List<Integer> usedMacs = Arrays.asList(0, 2, 4);
-        for(int i = 0; i < 5; i++) {
+        for (int i = 0; i < 5; i++) {
             boolean usedMac = usedMacs.contains(i);
             if (usedMac) {
                 boolean allowDuplicates = false;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/VmNicFilterParameterCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/VmNicFilterParameterCommandTest.java
index 5532da8dee7..f709142f8b4 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/VmNicFilterParameterCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/VmNicFilterParameterCommandTest.java
@@ -54,7 +54,7 @@ protected void validId(boolean isValid) {
     }
 
     private void validVmInterfaceId(boolean isValid) {
-        vmNicFilterParameter.setVmInterfaceId(isValid? Guid.newGuid() : null);
+        vmNicFilterParameter.setVmInterfaceId(isValid ? Guid.newGuid() : null);
         when(validator.vmInterfaceHavingIdExists(vmNicFilterParameter.getVmInterfaceId())).thenReturn(
                 isValid ? ValidationResult.VALID
                 : new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_INVALID_NIC_FILTER_PARAMETER_INTERFACE));
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/mac/VmNicFilterParameterAnnotationTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/mac/VmNicFilterParameterAnnotationTest.java
index f50a0399fd7..e9cd4b9f64c 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/mac/VmNicFilterParameterAnnotationTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/network/vm/mac/VmNicFilterParameterAnnotationTest.java
@@ -61,7 +61,7 @@ public void validate(String name, String value, Guid vmInterfaceId, String expec
                 validator.validate(vmNicFilterParameter, VALIDATE_GROUPS);
 
         boolean expectViolations = expectedErrorMessage != null;
-        assertTrue(expectViolations !=  violations.isEmpty());
+        assertTrue(expectViolations != violations.isEmpty());
         if (expectViolations) {
             assertEquals(expectedErrorMessage, violations.iterator().next().getMessage());
         }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
index 39829ab96eb..96578325ccf 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/pm/FenceProxyLocatorTest.java
@@ -382,6 +382,6 @@ private void mockFenceAgents() {
     }
 
     private boolean shouldHostBeUnreachable(VDSStatus status) {
-        return  status != VDSStatus.Up && status != VDSStatus.NonOperational;
+        return status != VDSStatus.Up && status != VDSStatus.NonOperational;
     }
 }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommandTest.java
index ea66855ae48..3da0ff23c83 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/AddCpuProfileCommandTest.java
@@ -22,7 +22,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.dao.profiles.CpuProfileDao;
 
-public class AddCpuProfileCommandTest extends BaseCommandTest{
+public class AddCpuProfileCommandTest extends BaseCommandTest {
     private static final Guid CLUSTER_ID = Guid.newGuid();
     private static final String PROFILE_NAME = "profile name";
     private static final String SESSION_ID = "S3SS10N1D";
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelperTest.java
index 04644197263..63237f48fd5 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelperTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/profiles/CpuProfileHelperTest.java
@@ -71,7 +71,7 @@ public void testNullClusterId() {
         VmBase vmBase = createVmBase(cpuProfile1.getId());
         vmBase.setClusterId(null);
 
-        ValidationResult res =  cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
+        ValidationResult res = cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
         assertThat(res, failsWith(EngineMessage.ACTION_TYPE_CPU_PROFILE_CLUSTER_NOT_PROVIDED));
     }
 
@@ -79,7 +79,7 @@ public void testNullClusterId() {
     public void testNonExistingCpuProfile() {
         VmBase vmBase = createVmBase(Guid.newGuid());
 
-        ValidationResult res =  cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
+        ValidationResult res = cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
         assertThat(res, failsWith(EngineMessage.ACTION_TYPE_FAILED_CPU_PROFILE_NOT_FOUND));
     }
 
@@ -88,7 +88,7 @@ public void testDifferentClusters() {
         VmBase vmBase = createVmBase(cpuProfile1.getId());
         vmBase.setClusterId(Guid.newGuid());
 
-        ValidationResult res =  cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
+        ValidationResult res = cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
         assertThat(res, failsWith(EngineMessage.ACTION_TYPE_CPU_PROFILE_NOT_MATCH_CLUSTER));
     }
 
@@ -96,7 +96,7 @@ public void testDifferentClusters() {
     public void testNoPermission() {
         VmBase vmBase = createVmBase(cpuProfile2.getId());
 
-        ValidationResult res =  cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
+        ValidationResult res = cpuProfileHelper.setAndValidateCpuProfile(vmBase, USER_1_ID);
         assertThat(res, failsWith(EngineMessage.ACTION_TYPE_NO_PERMISSION_TO_ASSIGN_CPU_PROFILE));
     }
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java
index 005af5e7d2f..6b15cd54ac3 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/quota/QuotaManagerTest.java
@@ -84,7 +84,7 @@ public void setUp() {
         command = new CommandBase<ActionParametersBase>(
                 param, CommandContext.createContext(param.getSessionId())) {
             @Override
-            protected void executeCommand() {}
+            protected void executeCommand() { }
 
             @Override
             public List<PermissionSubject> getPermissionCheckSubjects() {
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPoliciesTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPoliciesTest.java
index a738be201db..0a2629bbc23 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPoliciesTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/InternalClusterPoliciesTest.java
@@ -25,7 +25,7 @@ public class InternalClusterPoliciesTest {
     @Test
     public void testConfiguredPolicyCreation() {
         assertNotNull(InternalClusterPolicies.getClusterPolicies());
-        assertNotEquals(0, (long)InternalClusterPolicies.getClusterPolicies().size());
+        assertNotEquals(0, (long) InternalClusterPolicies.getClusterPolicies().size());
     }
 
     @Test
@@ -98,8 +98,8 @@ public void testPolicyCreation() {
             funcMap.put(pair.getFirst(), pair.getSecond());
         }
 
-        assertEquals(1, (long)funcMap.get(getUnitId(HaReservationWeightPolicyUnit.class)));
-        assertEquals(2, (long)funcMap.get(getUnitId(VmAffinityWeightPolicyUnit.class)));
+        assertEquals(1, (long) funcMap.get(getUnitId(HaReservationWeightPolicyUnit.class)));
+        assertEquals(2, (long) funcMap.get(getUnitId(VmAffinityWeightPolicyUnit.class)));
     }
 
     private Guid getUnitId(Class<? extends PolicyUnitImpl> unit) {
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManagerTest.java
index a06f077055e..733b3334760 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManagerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/pending/PendingResourceManagerTest.java
@@ -93,7 +93,7 @@ public void testAddPending() {
         Set<Guid> pending = PendingVM.collectForHost(manager, host.getId());
         assertEquals(2, pending.size());
         assertEquals(11, PendingCpuCores.collectForHost(manager, host.getId()));
-        assertEquals(1024+768, PendingMemory.collectForHost(manager, host.getId()));
+        assertEquals(1024 + 768, PendingMemory.collectForHost(manager, host.getId()));
         assertEquals(host.getId(), PendingVM.getScheduledHost(manager, vm1));
         assertEquals(host.getId(), PendingVM.getScheduledHost(manager, vm2));
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/AbstractPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/AbstractPolicyUnitTest.java
index 5c8014c9662..68ad51ea015 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/AbstractPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/AbstractPolicyUnitTest.java
@@ -61,7 +61,7 @@ Object convert(Class<?> type, String value, Map<Guid, BusinessEntity<Guid>> cach
             if (converter != null) {
                 return converter.invoke(type, value);
             }
-        } catch (NoSuchMethodException|InvocationTargetException|IllegalAccessException ex) {
+        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
             // ignore and try the next method
         }
 
@@ -74,7 +74,7 @@ Object convert(Class<?> type, String value, Map<Guid, BusinessEntity<Guid>> cach
                 return null;
             }
             return constructor.newInstance(value);
-        } catch (NoSuchMethodException|InstantiationException|IllegalAccessException|InvocationTargetException ex) {
+        } catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException ex) {
             // ignore and try the next method
         }
 
@@ -90,7 +90,7 @@ <E> E setField(E entity, String fieldName, String value, Map<Guid, BusinessEntit
         Object ptr = entity;
 
         /* Make sure all intermediate objects exist */
-        for (int i=0; i<components.length - 1; i++) {
+        for (int i = 0; i < components.length - 1; i++) {
             Field f = ptr.getClass().getField(components[i]);
             if (f.get(ptr) == null) {
                 Class<?> fieldType = f.getType();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuPinningPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuPinningPolicyUnitTest.java
index d644e49430c..a9e91a443b7 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuPinningPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/CpuPinningPolicyUnitTest.java
@@ -90,7 +90,7 @@ public void setUp() {
     @Test
     public void shouldHandleEmptyHostList() {
         vm.setCpuPinning("1#0_2#3");
-        final List<VDS> filteredHost = policyUnit.filter(new SchedulingContext(cluster, Collections.emptyMap()),  new ArrayList<>(), vm, mock(PerHostMessages.class));
+        final List<VDS> filteredHost = policyUnit.filter(new SchedulingContext(cluster, Collections.emptyMap()), new ArrayList<>(), vm, mock(PerHostMessages.class));
         assertThat(filteredHost, is(empty()));
         assertThat(messages(), is(empty()));
     }
@@ -132,13 +132,13 @@ public void shouldDetectOfflineCpu() {
     }
 
     @Test
-    public void shouldExcludeHostWithoutCpuInformation(){
+    public void shouldExcludeHostWithoutCpuInformation() {
         vm.setCpuPinning("1#0_2#4");
         assertThat(filter(), not(hasItem(hostWithoutCpus)));
     }
 
     @Test
-    public void shouldHandleExcludedCpu(){
+    public void shouldHandleExcludedCpu() {
         vm.setCpuPinning("1#3-5,^4");
         assertThat(filter(), hasItem(hostWithCpus));
         assertThat(messages(), hasSize(1));
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionWeightPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionWeightPolicyUnitTest.java
index 6f9152eb4b1..3cc57a3f27d 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionWeightPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/EvenDistributionWeightPolicyUnitTest.java
@@ -70,7 +70,7 @@ public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
     private EvenDistributionCPUWeightPolicyUnit evenDistributionCPUWeightPolicyUnit = new EvenDistributionCPUWeightPolicyUnit(null, new PendingResourceManager());
 
     @InjectMocks
-    private EvenDistributionMemoryWeightPolicyUnit evenDistributionMemoryWeightPolicyUnit =  new EvenDistributionMemoryWeightPolicyUnit(null, new PendingResourceManager());
+    private EvenDistributionMemoryWeightPolicyUnit evenDistributionMemoryWeightPolicyUnit = new EvenDistributionMemoryWeightPolicyUnit(null, new PendingResourceManager());
 
     @BeforeEach
     public void setUp() {
@@ -106,7 +106,7 @@ protected <T extends PolicyUnitImpl> void testScore(T unit,
         }
     }
 
-    protected  <T extends PolicyUnitImpl> Guid selectedBestHost(T unit, VM vm, ArrayList<VDS> hosts) {
+    protected <T extends PolicyUnitImpl> Guid selectedBestHost(T unit, VM vm, ArrayList<VDS> hosts) {
         List<Pair<Guid, Integer>> scores = unit.score(
                 new SchedulingContext(new Cluster(), Collections.emptyMap()),
                 hosts,
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyTestBase.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyTestBase.java
index 9fb7dd3957f..b9d6b2ebf5d 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyTestBase.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyTestBase.java
@@ -52,7 +52,7 @@ protected static VDS createHost(int nodeCount, long nodeSize, int coresPerNode)
             node.setNumaNodeStatistics(new NumaNodeStatistics());
             node.getNumaNodeStatistics().setMemFree(nodeSize);
 
-            node.setCpuIds(IntStream.range(i * coresPerNode, (i+1) * coresPerNode)
+            node.setCpuIds(IntStream.range(i * coresPerNode, (i + 1) * coresPerNode)
                     .boxed()
                     .collect(Collectors.toList())
             );
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyUnitTest.java
index ee31d258eef..a47d07e66ae 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaPolicyUnitTest.java
@@ -24,7 +24,7 @@
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-public class NumaPolicyUnitTest extends NumaPolicyTestBase{
+public class NumaPolicyUnitTest extends NumaPolicyTestBase {
 
     private static final long NODE_SIZE = 1024;
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaWeightPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaWeightPolicyUnitTest.java
index 18951b722f4..b2ce333fb73 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaWeightPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/NumaWeightPolicyUnitTest.java
@@ -28,7 +28,7 @@
 
 @ExtendWith({MockitoExtension.class, MockConfigExtension.class})
 @MockitoSettings(strictness = Strictness.LENIENT)
-public class NumaWeightPolicyUnitTest extends NumaPolicyTestBase{
+public class NumaWeightPolicyUnitTest extends NumaPolicyTestBase {
 
     public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
         return Stream.of(
@@ -37,7 +37,7 @@ public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
     }
 
     @InjectMocks
-    private NumaWeightPolicyUnit unit = new NumaWeightPolicyUnit(null,  null);
+    private NumaWeightPolicyUnit unit = new NumaWeightPolicyUnit(null, null);
 
     private VM vm;
     private VDS host1;
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingWeightPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingWeightPolicyUnitTest.java
index 72ebf5d8c51..37d522b2cf0 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingWeightPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PowerSavingWeightPolicyUnitTest.java
@@ -74,7 +74,7 @@ public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
     private VdsManager vdsManager;
 
     @InjectMocks
-    private PowerSavingCPUWeightPolicyUnit powerSavingCPUWeightPolicyUnit =  new PowerSavingCPUWeightPolicyUnit(null, new PendingResourceManager());
+    private PowerSavingCPUWeightPolicyUnit powerSavingCPUWeightPolicyUnit = new PowerSavingCPUWeightPolicyUnit(null, new PendingResourceManager());
 
     @InjectMocks
     private PowerSavingMemoryWeightPolicyUnit powerSavingMemoryWeightPolicyUnit = new PowerSavingMemoryWeightPolicyUnit(null, new PendingResourceManager());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnitTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnitTest.java
index cb7c351a8d6..678428790b0 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnitTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/scheduling/policyunits/PreferredHostsWeightPolicyUnitTest.java
@@ -50,7 +50,7 @@ public void testHostPreference() {
             results.put(r.getFirst(), r.getSecond());
         }
 
-        assertEquals(0, (long)results.get(host2.getId()));
+        assertEquals(0, (long) results.get(host2.getId()));
         assertNotEquals(0, (long) results.get(host1.getId()));
         assertNotEquals(0, (long) results.get(host3.getId()));
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommandTest.java
index 601f3caf35a..7b6722ee5b2 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveDiskSnapshotsCommandTest.java
@@ -88,7 +88,7 @@ public void setUp() {
         doReturn(ValidationResult.VALID).when(diskImagesValidator).diskImagesSnapshotsNotAttachedToOtherVms(false);
     }
 
-    private void mockStorageDomain(){
+    private void mockStorageDomain() {
         StorageDomain storageDomain = new StorageDomain();
         storageDomain.setStorageType(StorageType.NFS);
         doReturn(storageDomain).when(cmd).getStorageDomain();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java
index 094b5f79b10..8f68d6b4401 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/RemoveSnapshotCommandTest.java
@@ -96,7 +96,7 @@ public void setUp() {
         spySdValidator();
     }
 
-    private void mockStorageDomain(){
+    private void mockStorageDomain() {
         StorageDomain storageDomain = new StorageDomain();
         storageDomain.setStorageType(StorageType.NFS);
         doReturn(storageDomain).when(cmd).getStorageDomain();
@@ -277,7 +277,7 @@ private DiskImage mockSourceImage() {
     private List<DiskImage> mockDisksList(int numberOfDisks) {
         List<DiskImage> disksList = new ArrayList<>(numberOfDisks);
         for (int index = 0; index < numberOfDisks; index++) {
-            DiskImage image =createDiskImage(STORAGE_DOMAIN_ID);
+            DiskImage image = createDiskImage(STORAGE_DOMAIN_ID);
             disksList.add(image);
         }
         doReturn(disksList).when(cmd).getSourceImages();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
index 8ce376f480b..f757d7aceaf 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelperTest.java
@@ -73,7 +73,7 @@ public void testIllegalImageReturnedByQuery() {
         snapshotVmConfigurationHelper.markImagesIllegalIfNotInDb(existingVm, existingSnapshotId);
 
         for (Disk diskImage : existingVm.getDiskMap().values()) {
-            assertEquals(ImageStatus.ILLEGAL, ((DiskImage)diskImage).getImageStatus());
+            assertEquals(ImageStatus.ILLEGAL, ((DiskImage) diskImage).getImageStatus());
         }
     }
 }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java
index cbcd8f6fdb8..f96a4e56e66 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/AddStorageServerConnectionCommandTest.java
@@ -177,8 +177,8 @@ public void addISCSIEmptyConn() {
 
     @Test
     public void isConnWithSameDetailsExist() {
-       StorageServerConnections  newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3650", "user1", "mypassword123");
-       StorageServerConnections  existingConn = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3650", "user1", "mypassword123");
+       StorageServerConnections newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3650", "user1", "mypassword123");
+       StorageServerConnections existingConn = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3650", "user1", "mypassword123");
        existingConn.setId(Guid.newGuid().toString());
 
        when(iscsiStorageHelper.findConnectionsByAddressPortAndIqn(newISCSIConnection)).thenReturn(Collections.singletonList(existingConn));
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java
index 41cae02765e..f4b799a0bed 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/connection/UpdateStorageServerConnectionCommandTest.java
@@ -486,7 +486,7 @@ public void succeedValidatePosix() {
 
     @Test
     public void succeedUpdateNFSCommandWithDomain() {
-        StorageServerConnections  newNFSConnection = createNFSConnection(
+        StorageServerConnections newNFSConnection = createNFSConnection(
                        "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                         StorageType.NFS,
                         NfsVersion.V4,
@@ -532,7 +532,7 @@ public void succeedUpdateNFSCommandNoDomain() {
 
     @Test
     public void failUpdateStats() {
-        StorageServerConnections  newNFSConnection = createNFSConnection(
+        StorageServerConnections newNFSConnection = createNFSConnection(
                        "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                         StorageType.NFS,
                         NfsVersion.V4,
@@ -559,7 +559,7 @@ public void failUpdateStats() {
 
     @Test
     public void failUpdateConnectToStorage() {
-        StorageServerConnections  newNFSConnection = createNFSConnection(
+        StorageServerConnections newNFSConnection = createNFSConnection(
                 "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                 StorageType.NFS,
                 NfsVersion.V4,
@@ -584,7 +584,7 @@ public void failUpdateConnectToStorage() {
 
     @Test
     public void isConnWithSameDetailsExistFileDomains() {
-       StorageServerConnections  newNFSConnection = createNFSConnection(
+       StorageServerConnections newNFSConnection = createNFSConnection(
                        "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                         StorageType.NFS,
                         NfsVersion.V4,
@@ -612,7 +612,7 @@ public void isConnWithSameDetailsExistFileDomains() {
 
     @Test
     public void isConnWithSameDetailsExistSameConnection() {
-       StorageServerConnections  newNFSConnection = createNFSConnection(
+       StorageServerConnections newNFSConnection = createNFSConnection(
                        "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                         StorageType.NFS,
                         NfsVersion.V4,
@@ -627,7 +627,7 @@ public void isConnWithSameDetailsExistSameConnection() {
 
     @Test
     public void isConnWithSameDetailsExistNoConnections() {
-       StorageServerConnections  newNFSConnection = createNFSConnection(
+       StorageServerConnections newNFSConnection = createNFSConnection(
                        "multipass.my.domain.tlv.company.com:/export/allstorage/data2",
                         StorageType.NFS,
                         NfsVersion.V4,
@@ -642,7 +642,7 @@ public void isConnWithSameDetailsExistNoConnections() {
 
     @Test
     public void isConnWithSameDetailsExistBlockDomains() {
-       StorageServerConnections  newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3260", "user1", "mypassword123");
+       StorageServerConnections newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3260", "user1", "mypassword123");
 
        StorageServerConnections connection1 = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3260", "user1", "mypassword123");
        when(iscsiStorageHelper.findConnectionsByAddressPortAndIqn(newISCSIConnection)).thenReturn(Collections.singletonList(connection1));
@@ -652,7 +652,7 @@ public void isConnWithSameDetailsExistBlockDomains() {
 
     @Test
     public void isConnWithSameDetailsExistCheckSameConn() {
-       StorageServerConnections  newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3260", "user1", "mypassword123");
+       StorageServerConnections newISCSIConnection = createISCSIConnection("1.2.3.4", StorageType.ISCSI, "iqn.2013-04.myhat.com:aaa-target1", "3260", "user1", "mypassword123");
        when(iscsiStorageHelper.findConnectionsByAddressPortAndIqn(newISCSIConnection)).thenReturn(Collections.singletonList(newISCSIConnection));
        boolean isExists = !command.isConnWithSameDetailsExists(newISCSIConnection, null).isEmpty();
         assertTrue(isExists);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java
index 93f29944d6e..1e9e935afd5 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/AddDiskCommandTest.java
@@ -897,8 +897,8 @@ public void testValidateQuota() {
         mockEntities(storageId);
 
         Guid quotaId = Guid.newGuid();
-        ((DiskImage)command.getParameters().getDiskInfo()).setSize(1);
-        ((DiskImage)command.getParameters().getDiskInfo()).setQuotaId(quotaId);
+        ((DiskImage) command.getParameters().getDiskInfo()).setSize(1);
+        ((DiskImage) command.getParameters().getDiskInfo()).setQuotaId(quotaId);
 
         doReturn(ValidationResult.VALID).when(quotaValidator).isValid();
         doReturn(ValidationResult.VALID).when(quotaValidator).isDefinedForStoragePool(any(Guid.class));
@@ -927,7 +927,7 @@ public void testValidateFailsForPassDiscard() {
                 command, EngineMessage.ACTION_TYPE_FAILED_PASS_DISCARD_NOT_SUPPORTED_BY_DISK_INTERFACE);
     }
 
-    private void clearValidationMessages(){
+    private void clearValidationMessages() {
         command.getReturnValue()
         .getValidationMessages()
         .clear();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommandTest.java
index 1326384b295..c24c99df080 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/RemoveDiskCommandTest.java
@@ -119,7 +119,7 @@ public void testValidateTemplateEntity() {
         ArrayList<Guid> storageIds = new ArrayList<>();
         storageIds.add(domain.getId());
         storageIds.add(Guid.newGuid());
-        ((DiskImage)disk).setStorageIds(storageIds);
+        ((DiskImage) disk).setStorageIds(storageIds);
 
         doReturn(domain).when(cmd).getStorageDomain();
         doReturn(new VmTemplate()).when(cmd).getVmTemplate();
@@ -138,7 +138,7 @@ public void testValidateTemplateWithNoDomain() {
 
     @Test
     public void testValidateOvfDiskNotIllegal() {
-        ((DiskImage)disk).setImageStatus(ImageStatus.OK);
+        ((DiskImage) disk).setImageStatus(ImageStatus.OK);
         disk.setContentType(DiskContentType.OVF_STORE);
         ValidateTestUtils.runAndAssertValidateFailure(cmd,
                 EngineMessage.ACTION_TYPE_FAILED_OVF_DISK_NOT_IN_APPLICABLE_STATUS);
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommandTest.java
index c5efe559257..db0e226740b 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/UpdateDiskCommandTest.java
@@ -526,7 +526,7 @@ public void testAmendAndUpdate() {
         initializeCommand();
         command.executeVmCommand();
         List<UpdateDiskParameters.Phase> phaseList = command.getParameters().getDiskUpdatePhases();
-        UpdateDiskParameters.Phase phase = phaseList.get(phaseList.size()-1);
+        UpdateDiskParameters.Phase phase = phaseList.get(phaseList.size() - 1);
         assertEquals(UpdateDiskParameters.Phase.UPDATE_DISK, phase);
     }
 
@@ -544,7 +544,7 @@ public void testAmendExtendAndUpdate() {
         initializeCommand();
         command.executeVmCommand();
         List<UpdateDiskParameters.Phase> phaseList = command.getParameters().getDiskUpdatePhases();
-        UpdateDiskParameters.Phase phase = phaseList.get(phaseList.size()-1);
+        UpdateDiskParameters.Phase phase = phaseList.get(phaseList.size() - 1);
         assertEquals(UpdateDiskParameters.Phase.UPDATE_DISK, phase);
     }
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQueryTest.java
index bf0b8ab648c..ced0047d325 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQueryTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/cinder/GetUnregisteredCinderDisksByStorageDomainIdQueryTest.java
@@ -79,7 +79,7 @@ public void executeQueryCommand() {
         assertDiskFromVolume(volumes.get(2), result.get(1));
     }
 
-    private void assertDiskFromVolume(Volume volume, CinderDisk  disk) {
+    private void assertDiskFromVolume(Volume volume, CinderDisk disk) {
         assertEquals(volume.getId(), disk.getId().toString());
         assertEquals(volume.getName(), disk.getDiskAlias());
         assertEquals(volume.getSize().intValue(), disk.getSizeInGigabytes());
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandlerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandlerTest.java
index f709a3d98a9..c61ae54c176 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandlerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/ImagesHandlerTest.java
@@ -211,7 +211,7 @@ public void testAggregateDiskImagesSnapshots() {
 
     @Test
     public void testAggregateDiskImagesSnapshotsWithEmptyList() {
-        Collection<DiskImage> result =  imagesHandler.aggregateDiskImagesSnapshots(Collections.emptyList());
+        Collection<DiskImage> result = imagesHandler.aggregateDiskImagesSnapshots(Collections.emptyList());
         assertTrue(result.isEmpty(), "should return an empty list");
     }
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommandTest.java
index 4a1717e9331..b32627a1676 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/image/TransferDiskImageCommandTest.java
@@ -81,7 +81,7 @@ public class TransferDiskImageCommandTest extends BaseCommandTest {
 
     @Spy
     @InjectMocks
-    private  TransferDiskImageCommand<TransferDiskImageParameters> transferImageCommand =
+    private TransferDiskImageCommand<TransferDiskImageParameters> transferImageCommand =
             new TransferDiskImageCommand<>(new TransferDiskImageParameters(), null);
 
     public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQueryTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQueryTest.java
index 149314b679f..2ac6940771f 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQueryTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/disk/lun/GetLunsByVgIdQueryTest.java
@@ -44,7 +44,7 @@ public class GetLunsByVgIdQueryTest extends AbstractQueryTest<GetLunsByVgIdParam
     private static final String PORT = "123456";
     private static final String[] IQNS = { ADDRESS + ":1", ADDRESS + ":2", ADDRESS + ":3" };
     private static final String PHYSICAL_DEVICE_FIELD = "sda";
-    private static final String DUMMY_LUN_ID = BusinessEntitiesDefinitions.DUMMY_LUN_ID_PREFIX+"89871115-e64d-4754-bacd-556cc249761b";
+    private static final String DUMMY_LUN_ID = BusinessEntitiesDefinitions.DUMMY_LUN_ID_PREFIX + "89871115-e64d-4754-bacd-556cc249761b";
     @Mock
     private VDSBrokerFrontend vdsBrokerFrontendMock;
     @Mock
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommonTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommonTest.java
index 71493c0b63a..2c403a86cc5 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommonTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/domain/AddStorageDomainCommonTest.java
@@ -44,7 +44,7 @@ public class AddStorageDomainCommonTest extends BaseCommandTest {
 
     @InjectMocks
     private AddStorageDomainCommon<StorageDomainManagementParameter> cmd =
-            new AddStorageDomainCommon<>(new StorageDomainManagementParameter(), null){};
+            new AddStorageDomainCommon<>(new StorageDomainManagementParameter(), null) { };
 
     public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
         return Stream.of(MockConfigDescriptor.of(ConfigValues.StorageDomainNameSizeLimit, 10));
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportExportRepoImageCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportExportRepoImageCommandTest.java
index 71314a2fcc4..2aeaef49733 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportExportRepoImageCommandTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/storage/repoimage/ImportExportRepoImageCommandTest.java
@@ -40,7 +40,7 @@ public void setUp() {
         diskStorageDomain.setStoragePoolId(storagePoolId);
         diskStorageDomain.setStatus(StorageDomainStatus.Active);
 
-        storagePool  = new StoragePool();
+        storagePool = new StoragePool();
         storagePool.setId(storagePoolId);
         storagePool.setStatus(StoragePoolStatus.Up);
 
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java
index 51fb89d6ea8..a74776ed644 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/utils/GlusterUtilTest.java
@@ -126,7 +126,7 @@ public void testGetGlusterIpv4address() {
         VdsNetworkInterface vdsNetworkInterfaceClusterHost = new VdsNetworkInterface();
         VdsNetworkInterface vdsNetworkInterfaceClusterHost2 = new VdsNetworkInterface();
         List<VdsNetworkInterface> vdsNetworkInterfaceOldHostList = new ArrayList<>();
-        List<VdsNetworkInterface> vdsNetworkInterfaceClusterHostList= new ArrayList<>();
+        List<VdsNetworkInterface> vdsNetworkInterfaceClusterHostList = new ArrayList<>();
         List<VdsNetworkInterface> vdsNetworkInterfaceClusterHost2List = new ArrayList<>();
 
         VDS vds1 = new VDS();
@@ -178,7 +178,7 @@ public void testGetGlusterIpv6address() {
         VdsNetworkInterface vdsNetworkInterfaceClusterHostIpv6 = new VdsNetworkInterface();
         VdsNetworkInterface vdsNetworkInterfaceClusterHost2Ipv6 = new VdsNetworkInterface();
         List<VdsNetworkInterface> vdsNetworkInterfaceOldHostListIpv6 = new ArrayList<>();
-        List<VdsNetworkInterface> vdsNetworkInterfaceClusterHostListIpv6= new ArrayList<>();
+        List<VdsNetworkInterface> vdsNetworkInterfaceClusterHostListIpv6 = new ArrayList<>();
         List<VdsNetworkInterface> vdsNetworkInterfaceClusterHost2ListIpv6 = new ArrayList<>();
 
         VDS vds1 = new VDS();
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkValidatorTest.java
index 2d91052ea48..737e9049f83 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/NetworkValidatorTest.java
@@ -323,10 +323,10 @@ public void networkInUseByOneVm() {
     @Test
     public void networkInUseByManyVms() {
         VM vm1 = mock(VM.class);
-        when(vm1.getName()).thenReturn(NAMEABLE_NAME+1);
+        when(vm1.getName()).thenReturn(NAMEABLE_NAME + 1);
 
         VM vm2 = mock(VM.class);
-        when(vm2.getName()).thenReturn(NAMEABLE_NAME+2);
+        when(vm2.getName()).thenReturn(NAMEABLE_NAME + 2);
 
         networkNotUsedByVmsTest(failsWithManyNetworkInUse(), Arrays.asList(vm1, vm2));
     }
@@ -352,10 +352,10 @@ public void networkInUseByOneHost() {
     @Test
     public void networkInUseByManyHosts() {
         VDS host1 = mock(VDS.class);
-        when(host1.getName()).thenReturn(NAMEABLE_NAME+1);
+        when(host1.getName()).thenReturn(NAMEABLE_NAME + 1);
 
         VDS host2 = mock(VDS.class);
-        when(host2.getName()).thenReturn(NAMEABLE_NAME+2);
+        when(host2.getName()).thenReturn(NAMEABLE_NAME + 2);
 
         networkNotUsedByHostsTest(failsWithManyNetworkInUse(), Arrays.asList(host1, host2));
     }
@@ -381,10 +381,10 @@ public void networkInUseByOneTemplate() {
     @Test
     public void networkInUseByManyTemplates() {
         VmTemplate template1 = mock(VmTemplate.class);
-        when(template1.getName()).thenReturn(NAMEABLE_NAME+1);
+        when(template1.getName()).thenReturn(NAMEABLE_NAME + 1);
 
         VmTemplate template2 = mock(VmTemplate.class);
-        when(template2.getName()).thenReturn(NAMEABLE_NAME+2);
+        when(template2.getName()).thenReturn(NAMEABLE_NAME + 2);
 
         networkNotUsedByTemplatesTest(failsWithManyNetworkInUse(), Arrays.asList(template1, template2));
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
index dd3e5365eb1..3f72a6ab0c1 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VmNicValidatorTest.java
@@ -235,14 +235,14 @@ private void passthroughIsLinkedCommon(boolean isPassthrough, boolean isLinked,
     }
 
     @Test
-    public void forbidEmptyProfileForHostedEngineVm(){
+    public void forbidEmptyProfileForHostedEngineVm() {
         vm.setOrigin(OriginType.HOSTED_ENGINE);
         assertThat(validator.validateProfileNotEmptyForHostedEngineVm(vm),
                 failsWith(EngineMessage.HOSTED_ENGINE_VM_CANNOT_HAVE_NIC_WITH_EMPTY_PROFILE));
     }
 
     @Test
-    public void allowEmptyProfileForNonHostedEngineVm(){
+    public void allowEmptyProfileForNonHostedEngineVm() {
         vm.setOrigin(OriginType.RHEV);
         assertThat(validator.validateProfileNotEmptyForHostedEngineVm(vm), isValid());
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VnicProfileValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VnicProfileValidatorTest.java
index ce7a7e2a200..cfaa1a1e258 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VnicProfileValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/VnicProfileValidatorTest.java
@@ -429,7 +429,7 @@ public void nonPassthroughProfileContainsPortMirroringAndQos() {
     }
 
     @Test
-    public void testValidNetworkFilterIdUseDefaultNoFilterId(){
+    public void testValidNetworkFilterIdUseDefaultNoFilterId() {
         assertThat(validator.validUseDefaultNetworkFilterFlag(true), isValid());
     }
 
@@ -445,12 +445,12 @@ public void testValidNetworkFilterIdUseDefaultWithFilterId() {
     }
 
     @Test
-    public void testValidNetworkFilterIdNoDefaultNoFilterId(){
+    public void testValidNetworkFilterIdNoDefaultNoFilterId() {
         assertThat(validator.validUseDefaultNetworkFilterFlag(false), isValid());
     }
 
     @Test
-    public void testValidNetworkFilterIdNoDefaultWithFilterId(){
+    public void testValidNetworkFilterIdNoDefaultWithFilterId() {
         when(vnicProfile.getNetworkFilterId()).thenReturn(Guid.newGuid());
         assertThat(validator.validUseDefaultNetworkFilterFlag(false), isValid());
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/MultipleStorageDomainsValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/MultipleStorageDomainsValidatorTest.java
index 87a2c84fa6b..c3c4a4633c6 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/MultipleStorageDomainsValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/MultipleStorageDomainsValidatorTest.java
@@ -116,7 +116,7 @@ public void testAllDomainsNotBackupDomainsOneBackup() {
 
     @Test
     public void testAllDomainsWithinThresholdAllOk() {
-        domain1.getStorageDynamicData().setAvailableDiskSize(CRITICAL_SPACE_THRESHOLD +1);
+        domain1.getStorageDynamicData().setAvailableDiskSize(CRITICAL_SPACE_THRESHOLD + 1);
         domain2.getStorageDynamicData().setAvailableDiskSize(CRITICAL_SPACE_THRESHOLD);
         domain1.setCriticalSpaceActionBlocker(CRITICAL_SPACE_THRESHOLD);
         domain2.setCriticalSpaceActionBlocker(CRITICAL_SPACE_THRESHOLD);
@@ -134,7 +134,7 @@ public void testAllDomainsWithinThresholdsOneLacking() {
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForNewDisksSuccess(){
+    public void testAllDomainsHaveSpaceForNewDisksSuccess() {
         List<Guid> sdIds = Arrays.asList(sdId1, sdId2);
         List<DiskImage> disksList = generateDisksList(NUM_DISKS, sdIds);
 
@@ -146,7 +146,7 @@ public void testAllDomainsHaveSpaceForNewDisksSuccess(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForNewDisksFail(){
+    public void testAllDomainsHaveSpaceForNewDisksFail() {
         List<Guid> sdIds = Arrays.asList(sdId1, sdId2);
         List<DiskImage> disksList = generateDisksList(NUM_DISKS, sdIds);
 
@@ -160,7 +160,7 @@ public void testAllDomainsHaveSpaceForNewDisksFail(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForClonedDisksSuccess(){
+    public void testAllDomainsHaveSpaceForClonedDisksSuccess() {
         List<Guid> sdIds = Arrays.asList(sdId1, sdId2);
         List<DiskImage> disksList = generateDisksList(NUM_DISKS, sdIds);
 
@@ -172,7 +172,7 @@ public void testAllDomainsHaveSpaceForClonedDisksSuccess(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForClonedDisksFail(){
+    public void testAllDomainsHaveSpaceForClonedDisksFail() {
         List<Guid> sdIds = Arrays.asList(sdId1, sdId2);
         List<DiskImage> disksList = generateDisksList(NUM_DISKS, sdIds);
 
@@ -186,7 +186,7 @@ public void testAllDomainsHaveSpaceForClonedDisksFail(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForAllDisksSuccess(){
+    public void testAllDomainsHaveSpaceForAllDisksSuccess() {
         List<Guid> sdIdsForNew = Arrays.asList(sdId1, sdId2);
         List<Guid> sdIdsForCloned = Arrays.asList(sdId2, sdId3);
         List<DiskImage> disksListForNew = generateDisksList(NUM_DISKS, sdIdsForNew);
@@ -200,7 +200,7 @@ public void testAllDomainsHaveSpaceForAllDisksSuccess(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForAllDisksFail(){
+    public void testAllDomainsHaveSpaceForAllDisksFail() {
         List<Guid> sdIdsForNew = Arrays.asList(sdId1, sdId2);
         List<Guid> sdIdsForCloned = Arrays.asList(sdId2, sdId3);
         List<DiskImage> disksListForNew = generateDisksList(NUM_DISKS, sdIdsForNew);
@@ -216,7 +216,7 @@ public void testAllDomainsHaveSpaceForAllDisksFail(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForMergeSuccess(){
+    public void testAllDomainsHaveSpaceForMergeSuccess() {
         StorageDomainValidator storageDomainValidator = mock(StorageDomainValidator.class);
         List<SubchainInfo> subchain = createSubchain(Collections.singletonList(sdId1));
         doReturn(storageDomainValidator).when(validator).getStorageDomainValidator(any());
@@ -226,7 +226,7 @@ public void testAllDomainsHaveSpaceForMergeSuccess(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForMergeFail(){
+    public void testAllDomainsHaveSpaceForMergeFail() {
         StorageDomainValidator storageDomainValidator = mock(StorageDomainValidator.class);
         List<SubchainInfo> subchain = createSubchain(Collections.singletonList(sdId1));
         doReturn(new ValidationResult(EngineMessage.ACTION_TYPE_FAILED_DISK_SPACE_LOW_ON_STORAGE_DOMAIN)).
@@ -238,7 +238,7 @@ public void testAllDomainsHaveSpaceForMergeFail(){
     }
 
     @Test
-    public void testAllDomainsHaveSpaceForMergeBrokenSubchainFail(){
+    public void testAllDomainsHaveSpaceForMergeBrokenSubchainFail() {
         StorageDomainValidator storageDomainValidator = mock(StorageDomainValidator.class);
         List<SubchainInfo> subchain = new ArrayList<>();
         doReturn(new ValidationResult(EngineMessage.ERROR_CANNOT_REMOVE_SNAPSHOT_ILLEGAL_IMAGE)).
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainToPoolRelationValidatorTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainToPoolRelationValidatorTest.java
index b4c97316e62..3be5d0007fa 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainToPoolRelationValidatorTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/validator/storage/StorageDomainToPoolRelationValidatorTest.java
@@ -137,7 +137,7 @@ public void testCanAttachMultipleISOOrExport() {
             ValidationResult attachMultipleISOOrExportResult = validator.validateDomainCanBeAttachedToPool();
             assertThat("Attaching domain of type " + type + " succeeded though another domain of the same type already exists in the pool",
                     attachMultipleISOOrExportResult,
-                    failsWith(type  == StorageDomainType.ISO ? EngineMessage.ERROR_CANNOT_ATTACH_MORE_THAN_ONE_ISO_DOMAIN :
+                    failsWith(type == StorageDomainType.ISO ? EngineMessage.ERROR_CANNOT_ATTACH_MORE_THAN_ONE_ISO_DOMAIN :
                             EngineMessage.ERROR_CANNOT_ATTACH_MORE_THAN_ONE_EXPORT_DOMAIN));
         }
     }
diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
index 8a269abf9e4..9fa9963446d 100644
--- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
+++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/utils/ovf/OvfManagerTest.java
@@ -127,7 +127,7 @@ public void setUp() {
         when(osRepository.getArchitectureFromOS(anyInt())).thenReturn(ArchitectureType.x86_64);
         when(osRepository.getUniqueOsNames()).thenReturn(osIdsToNames);
         when(osRepository.getOsIdByUniqueName(any())).thenAnswer(
-                invocation-> osIdsToNames.entrySet()
+                invocation -> osIdsToNames.entrySet()
                         .stream()
                         .filter(k -> invocation.getArguments()[0].equals(k.getValue()))
                         .map(Map.Entry::getKey)
@@ -180,7 +180,7 @@ public void testVmOvfCreationDefaultGraphicsDeviceFallbackToSupported() throws E
         VM vm = createVM();
         vm.setDefaultDisplayType(DisplayType.qxl);
         vm.setVmOs(EXISTING_OS_ID);
-        String xml = manager.exportVm(vm,  new FullEntityOvfData(vm), Version.getLast());
+        String xml = manager.exportVm(vm, new FullEntityOvfData(vm), Version.getLast());
         assertNotNull(xml);
         final VM newVm = new VM();
         FullEntityOvfData fullEntityOvfData = new FullEntityOvfData(newVm);
diff --git a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingServlet.java b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingServlet.java
index 5355dc66680..c71c7429e94 100644
--- a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingServlet.java
+++ b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingServlet.java
@@ -60,7 +60,7 @@ public void doGet(final HttpServletRequest request,
      */
     File getFile(final File brandingRootPath, final String path) {
         File result = null;
-        String mergedPath = new File(brandingRootPath.getAbsolutePath(), path == null ? "": path).getAbsolutePath();
+        String mergedPath = new File(brandingRootPath.getAbsolutePath(), path == null ? "" : path).getAbsolutePath();
         if (path != null && ServletUtils.isSane(mergedPath)) {
             // Return a result relative to the branding root path.
             result = new File(mergedPath);
diff --git a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java
index cbfaaa6dcae..83c174e1939 100644
--- a/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java
+++ b/backend/manager/modules/branding/src/main/java/org/ovirt/engine/core/branding/BrandingTheme.java
@@ -397,8 +397,8 @@ private String readTemplateFile(final String templateKey) {
             try (
                 InputStream in = new FileInputStream(templateFileName);
                 Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8);
-                BufferedReader bufferedReader= new BufferedReader(reader);
-            ){
+                BufferedReader bufferedReader = new BufferedReader(reader);
+            ) {
                 String currentLine;
                 while ((currentLine = bufferedReader.readLine()) != null) {
                     if (!currentLine.startsWith("#")) { // # is comment.
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActionType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActionType.java
index cf6dfd760ac..dc2bc859569 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActionType.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ActionType.java
@@ -199,7 +199,7 @@ public enum ActionType {
     DestroyImage(239, QuotaDependency.STORAGE),
     MergeExtend(241, QuotaDependency.STORAGE),
     SparsifyImage(244, ActionGroup.SPARSIFY_DISK, QuotaDependency.NONE),
-    AmendImageGroupVolumes(245,  ActionGroup.EDIT_DISK_PROPERTIES, QuotaDependency.NONE),
+    AmendImageGroupVolumes(245, ActionGroup.EDIT_DISK_PROPERTIES, QuotaDependency.NONE),
     ColdMergeSnapshotSingleDisk(246, QuotaDependency.STORAGE),
     PrepareMerge(247, QuotaDependency.STORAGE),
     ColdMerge(248, QuotaDependency.STORAGE),
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
index c0f7ae1b693..abf8e747830 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmFromSnapshotParameters.java
@@ -14,7 +14,7 @@ public class AddVmFromSnapshotParameters extends AddVmParameters implements Seri
     private static final long serialVersionUID = -3400982291165788716L;
 
     //Unique Identifier of Source Snapshot
-    @NotNull(message="VALIDATION_SOURCE_SNAPSHOT_ID_NOT_NULL")
+    @NotNull(message = "VALIDATION_SOURCE_SNAPSHOT_ID_NOT_NULL")
     private Guid sourceSnapshotId;
 
     public AddVmFromSnapshotParameters() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateFromSnapshotParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateFromSnapshotParameters.java
index ef6331d5a83..893101852cd 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateFromSnapshotParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVmTemplateFromSnapshotParameters.java
@@ -11,7 +11,7 @@ public class AddVmTemplateFromSnapshotParameters extends AddVmTemplateParameters
     private static final long serialVersionUID = -486319959050997796L;
 
     //Unique Identifier of Source Snapshot
-    @NotNull(message="VALIDATION_SOURCE_SNAPSHOT_ID_NOT_NULL")
+    @NotNull(message = "VALIDATION_SOURCE_SNAPSHOT_ID_NOT_NULL")
     private Guid sourceSnapshotId;
 
     public AddVmTemplateFromSnapshotParameters() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
index b411f619840..6e2bf4b5be5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CloneVmParameters.java
@@ -88,7 +88,7 @@ public Map<Guid, Map<Guid, DiskImage>> getSrcToDstChainMap() {
         return srcToDstChainMap;
     }
 
-    public void setSrcToDstChainMap(Map<Guid, Map<Guid, DiskImage>>  srcToDstChainMap) {
+    public void setSrcToDstChainMap(Map<Guid, Map<Guid, DiskImage>> srcToDstChainMap) {
         this.srcToDstChainMap = srcToDstChainMap;
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateCinderSnapshotParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateCinderSnapshotParameters.java
index 680c9c6baaa..625471b62a9 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateCinderSnapshotParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/CreateCinderSnapshotParameters.java
@@ -3,7 +3,7 @@
 import org.ovirt.engine.core.common.businessentities.Snapshot.SnapshotType;
 import org.ovirt.engine.core.compat.Guid;
 
-public class CreateCinderSnapshotParameters extends ImagesContainterParametersBase{
+public class CreateCinderSnapshotParameters extends ImagesContainterParametersBase {
     private SnapshotType snapshotType;
 
     public CreateCinderSnapshotParameters(Guid imageId) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
index d3d792c9afe..8d3c39a31cc 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
@@ -13,7 +13,7 @@ public class DestroyImageParameters extends StorageDomainParametersBase {
     private boolean postZero;
     private boolean force;
 
-    private DestroyImageParameters() {}
+    private DestroyImageParameters() { }
 
     public DestroyImageParameters(
             Guid vdsId,
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java
index 00efdc39448..489dbbef7b7 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/FenceVdsActionParameters.java
@@ -5,7 +5,7 @@
 
 public class FenceVdsActionParameters extends VdsActionParameters {
     private static final long serialVersionUID = 6174371941176548263L;
-    private boolean changeHostToMaintenanceOnStart=false;
+    private boolean changeHostToMaintenanceOnStart = false;
 
     /*
      * If the power management policy is responsible for this action
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotSetAmountOfMemoryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotSetAmountOfMemoryParameters.java
index be2e921651d..4ec69cd1116 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotSetAmountOfMemoryParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/HotSetAmountOfMemoryParameters.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.common.businessentities.VmStatic;
 
-public class HotSetAmountOfMemoryParameters extends VmManagementParametersBase  {
+public class HotSetAmountOfMemoryParameters extends VmManagementParametersBase {
 
     private PlugAction plugAction;
     private int numaNode;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromConfParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromConfParameters.java
index db1f20232fc..0c7c57a87f2 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromConfParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmFromConfParameters.java
@@ -27,7 +27,7 @@ public class ImportVmFromConfParameters extends ImportVmParameters implements Im
 
     private List<AffinityGroup> affinityGroups;
     private Set<DbUser> dbUsers;
-    private Map<String, Set<String>> userToRoles  = new HashMap<>();
+    private Map<String, Set<String>> userToRoles = new HashMap<>();
     private List<Label> affinityLabels;
     private Collection<ExternalVnicProfileMapping> externalVnicProfileMappings;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmTemplateFromConfParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmTemplateFromConfParameters.java
index d33171b2e0c..58c7dd67fcf 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmTemplateFromConfParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ImportVmTemplateFromConfParameters.java
@@ -21,7 +21,7 @@ public class ImportVmTemplateFromConfParameters extends ImportVmTemplateParamete
     private Map<Guid, Set<Guid>> imageToAvailableStorageDomains = new HashMap<>();
 
     private Set<DbUser> dbUsers;
-    private Map<String, Set<String>> userToRoles  = new HashMap<>();
+    private Map<String, Set<String>> userToRoles = new HashMap<>();
     private Collection<ExternalVnicProfileMapping> externalVnicProfileMappings;
 
     public ImportVmTemplateFromConfParameters() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LockProperties.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LockProperties.java
index b523ae510ee..39f909b5794 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LockProperties.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LockProperties.java
@@ -47,7 +47,7 @@ public static enum Scope {
      */
     private long timeoutMillis = WAIT_FOREVER;
 
-    private LockProperties() {}
+    private LockProperties() { }
 
     public boolean isNoWait() {
         return timeoutMillis == NO_WAIT;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginOnBehalfParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginOnBehalfParameters.java
index 253a3658219..f9a615d5b69 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginOnBehalfParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/LoginOnBehalfParameters.java
@@ -7,7 +7,7 @@
 public class LoginOnBehalfParameters extends ActionParametersBase implements Serializable {
     private static final long serialVersionUID = -1660445011620552804L;
 
-    public enum QueryType {ByInternalId, ByExternalId, ByPrincipalName, Unknown}
+    public enum QueryType { ByInternalId, ByExternalId, ByPrincipalName, Unknown }
 
     private QueryType queryType = QueryType.Unknown;
     private Guid userId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
index 797825e1a45..96f734eb6de 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
@@ -18,7 +18,7 @@ public class MergeParameters extends StorageDomainParametersBase {
     private Guid vmJobId;
     private Set<Guid> vmVolumeChain;
 
-    private MergeParameters() {}
+    private MergeParameters() { }
 
     public MergeParameters(
             Guid vdsId,
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProfileParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProfileParametersBase.java
index 81486d5234d..77d5d9d1112 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProfileParametersBase.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ProfileParametersBase.java
@@ -27,7 +27,7 @@ public ProfileParametersBase(T profile) {
     @Valid
     private T profile;
 
-    public ProfileParametersBase() {}
+    public ProfileParametersBase() { }
 
     public T getProfile() {
         return profile;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveAuditLogByIdParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveAuditLogByIdParameters.java
index 6c893c9243e..5500f6b6fdf 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveAuditLogByIdParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveAuditLogByIdParameters.java
@@ -6,7 +6,7 @@ public class RemoveAuditLogByIdParameters extends ActionParametersBase implement
     private static final long serialVersionUID = 7211692656127711421L;
     private long auditLogId;
 
-    public RemoveAuditLogByIdParameters() {}
+    public RemoveAuditLogByIdParameters() { }
 
     public RemoveAuditLogByIdParameters(long auditLogId) {
         this.auditLogId = auditLogId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
index 5b4ea7885db..51515679c63 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/RemoveImageParameters.java
@@ -18,7 +18,7 @@ public RemoveImageParameters(Guid imageId) {
         super(imageId, null);
         setForceDelete(false);
         dbOperationScope = ImageDbOperationScope.IMAGE;
-        shouldLockImage= true;
+        shouldLockImage = true;
         setEndProcedure(EndProcedure.COMMAND_MANAGED);
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/SetVmTicketParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/SetVmTicketParameters.java
index 55a7859020f..a0d9dfe152e 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/SetVmTicketParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/SetVmTicketParameters.java
@@ -22,7 +22,7 @@ public SetVmTicketParameters(Guid vmId, String ticket, int validTime, GraphicsTy
         this.validTime = validTime;
     }
 
-    public SetVmTicketParameters(Guid vmId, String ticket, int validTime, GraphicsType graphicsType,  String clientIp) {
+    public SetVmTicketParameters(Guid vmId, String ticket, int validTime, GraphicsType graphicsType, String clientIp) {
         this(vmId, ticket, validTime, graphicsType);
         this.clientIp = clientIp;
     }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/StorageServerConnectionExtensionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/StorageServerConnectionExtensionParameters.java
index 5c031c3702f..dd7f16b17be 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/StorageServerConnectionExtensionParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/StorageServerConnectionExtensionParameters.java
@@ -13,7 +13,7 @@ public StorageServerConnectionExtensionParameters(StorageServerConnectionExtensi
         this.connExt = connExt;
     }
 
-    public StorageServerConnectionExtensionParameters() {}
+    public StorageServerConnectionExtensionParameters() { }
 
     public StorageServerConnectionExtension getStorageServerConnectionExtension() {
         return connExt;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TerminateSessionsForTokenParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TerminateSessionsForTokenParameters.java
index 740a9b0e92e..bbfa503b066 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TerminateSessionsForTokenParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TerminateSessionsForTokenParameters.java
@@ -8,7 +8,7 @@ public class TerminateSessionsForTokenParameters extends ActionParametersBase {
      */
     private String ssoAccessToken;
 
-    public TerminateSessionsForTokenParameters() {}
+    public TerminateSessionsForTokenParameters() { }
 
     public TerminateSessionsForTokenParameters(String ssoAccessToken) {
         this.ssoAccessToken = ssoAccessToken;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TransferDiskImageParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TransferDiskImageParameters.java
index e0deba16dd3..6665e268c3f 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TransferDiskImageParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/TransferDiskImageParameters.java
@@ -28,7 +28,7 @@ public class TransferDiskImageParameters extends ImagesActionsParametersBase {
     // Transfer only specified image data instead of entire image chain.
     private boolean shallow;
 
-    public TransferDiskImageParameters() {}
+    public TransferDiskImageParameters() { }
 
     public TransferDiskImageParameters(Guid storageDomainId, AddDiskParameters addDiskParameters) {
         setStorageDomainId(storageDomainId);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
index f9a5e08479b..c2c1745d891 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java
@@ -190,7 +190,7 @@ public boolean getReconfigureGluster() {
         return reconfigureGluster;
     }
 
-    public void setReconfigureGluster(boolean reconfigureGluster){
+    public void setReconfigureGluster(boolean reconfigureGluster) {
         this.reconfigureGluster = reconfigureGluster;
     }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmLeaseParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmLeaseParameters.java
index 68837cc5681..a554148a771 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmLeaseParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmLeaseParameters.java
@@ -5,7 +5,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class VmLeaseParameters  extends ActionParametersBase implements Serializable {
+public class VmLeaseParameters extends ActionParametersBase implements Serializable {
 
     private Guid storagePoolId;
     private Guid storageDomainId;
@@ -15,7 +15,7 @@ public class VmLeaseParameters  extends ActionParametersBase implements Serializ
     private Map<String, String> vmLeaseInfo;
     private boolean failureExpected;
 
-    public VmLeaseParameters() {}
+    public VmLeaseParameters() { }
 
     public VmLeaseParameters(Guid storagePoolId, Guid storageDomainId, Guid vmId) {
         this.storagePoolId = storagePoolId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java
index ea74aa10d9d..cb11966d6db 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmManagementParametersBase.java
@@ -93,7 +93,7 @@ public void setValue(T value) {
     @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.WATCHDOG, type = VmDeviceType.WATCHDOG)
     private Optional<VmWatchdog> watchdog = new Optional<>();
 
-    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.RNG, type = VmDeviceType.VIRTIO, name="rng")
+    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.RNG, type = VmDeviceType.VIRTIO, name = "rng")
     private Optional<VmRngDevice> rngDevice = new Optional<>();
 
     /*
@@ -102,7 +102,7 @@ public void setValue(T value) {
      * for add vm legacy logic will be used: create device for desktop type
      * for update the current configuration will remain
      */
-    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.SOUND, type = VmDeviceType.UNKNOWN, name="sound", isReadOnly = true)
+    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.SOUND, type = VmDeviceType.UNKNOWN, name = "sound", isReadOnly = true)
     private Boolean soundDeviceEnabled;
 
     /*
@@ -111,7 +111,7 @@ public void setValue(T value) {
      * for unsupported configuration don't add TPM device
      * for other update the current configuration will remain
      */
-    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.TPM, type = VmDeviceType.TPM, name="tpm")
+    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.TPM, type = VmDeviceType.TPM, name = "tpm")
     private Boolean tpmEnabled;
 
     /*
@@ -127,7 +127,7 @@ public void setValue(T value) {
      * - Add VM - defaulted to true for cluster >= 3.3
      * - Update VM - preserve current configuration
      */
-    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.CONTROLLER, type = VmDeviceType.VIRTIOSCSI, name="virtioscsi")
+    @EditableDeviceOnVmStatusField(generalType = VmDeviceGeneralType.CONTROLLER, type = VmDeviceType.VIRTIOSCSI, name = "virtioscsi")
     private Boolean virtioScsiEnabled;
 
     /**
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmNumaNodeOperationParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmNumaNodeOperationParameters.java
index 19048c8a715..5081c17f970 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmNumaNodeOperationParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VmNumaNodeOperationParameters.java
@@ -24,7 +24,7 @@ public VmNumaNodeOperationParameters(Guid vmId, VmNumaNode vmNumaNode) {
 
     public VmNumaNodeOperationParameters(Guid vmId, List<VmNumaNode> vmNumaNodes) {
         super(vmId);
-        if (vmNumaNodes != null){
+        if (vmNumaNodes != null) {
             vmNumaNodeList = vmNumaNodes;
         }
         vm = null;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
index aa2126f0971..25bf8a3940d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/gluster/GlusterVolumeGeoRepSessionParameters.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class GlusterVolumeGeoRepSessionParameters extends GlusterVolumeParameters{
+public class GlusterVolumeGeoRepSessionParameters extends GlusterVolumeParameters {
 
     private static final long serialVersionUID = -881348048838907389L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
index e1395f21f17..d13f538585d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
@@ -7,7 +7,7 @@
 import org.ovirt.engine.core.common.utils.ToStringBuilder;
 import org.ovirt.engine.core.compat.Guid;
 
-public class GlusterAsyncTask implements Serializable{
+public class GlusterAsyncTask implements Serializable {
 
     private static final long serialVersionUID = 5165089908032934194L;
 
@@ -20,7 +20,7 @@ public class GlusterAsyncTask implements Serializable{
     private Guid jobId;
     private JobExecutionStatus jobStatus;
 
-    public GlusterAsyncTask(){
+    public GlusterAsyncTask() {
 
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskParameters.java
index 493e6d2be7e..fba9cfb3adc 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterTaskParameters.java
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-public class GlusterTaskParameters implements Serializable{
+public class GlusterTaskParameters implements Serializable {
 
     private static final long serialVersionUID = 7151931460799410911L;
     private String volumeName;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
index 0046666ec8f..067b80aa42d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
@@ -595,7 +595,7 @@ public String toStringForLogging() {
         sb.append("Correlation ID: ");
         sb.append(correlationId);
         sb.append(", ");
-        if(jobId != null){
+        if (jobId != null) {
             sb.append("Job ID: ");
             sb.append(jobId.toString());
             sb.append(", ");
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java
index c119d9a2947..3d44d27ab4e 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Cluster.java
@@ -453,7 +453,7 @@ public void setHasHostWithMissingCpuFlags(boolean hasHostWithMissingCpuFlags) {
         this.hasHostWithMissingCpuFlags = hasHostWithMissingCpuFlags;
     }
 
-    public boolean isInUpgradeMode(){
+    public boolean isInUpgradeMode() {
         return ClusterPolicy.UPGRADE_POLICY_GUID.equals(clusterPolicyId);
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ConsoleDisconnectAction.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ConsoleDisconnectAction.java
index b4c25fae5b8..7af2a00c762 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ConsoleDisconnectAction.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ConsoleDisconnectAction.java
@@ -8,7 +8,7 @@ public enum ConsoleDisconnectAction {
     REBOOT;
 
     public static ConsoleDisconnectAction fromString(String name) {
-        if(name == null) {
+        if (name == null) {
             return LOCK_SCREEN;
         }
         return ConsoleDisconnectAction.valueOf(name);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DwhHistoryTimekeeping.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DwhHistoryTimekeeping.java
index c5e4848249b..33fb4705089 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DwhHistoryTimekeeping.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DwhHistoryTimekeeping.java
@@ -66,7 +66,7 @@ public boolean equals(Object obj) {
         if (!(obj instanceof DwhHistoryTimekeeping)) {
             return false;
         }
-        return variable == ((DwhHistoryTimekeeping)obj).getVariable();
+        return variable == ((DwhHistoryTimekeeping) obj).getVariable();
     }
 
     @Override
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EngineSession.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EngineSession.java
index 65737cc4cd3..7696f474c47 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EngineSession.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/EngineSession.java
@@ -36,7 +36,7 @@ public class EngineSession implements Queryable {
 
     private Date lastActiveTime;
 
-    public EngineSession() {}
+    public EngineSession() { }
 
     public EngineSession(DbUser dbUser, String engineSessionId, String sourceIp) {
         setUserId(dbUser.getId());
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataCount.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataCount.java
index 6df30e91d44..7c1f1d491a1 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataCount.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataCount.java
@@ -9,7 +9,7 @@ public class ErrataCount implements Serializable {
     private Map<Erratum.ErrataSeverity, Integer> countBySeverity;
     private int totalCount;
 
-    public ErrataCount(){
+    public ErrataCount() {
         countBySeverity = new HashMap<>();
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataData.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataData.java
index 47986b1a3fd..5a94deb73c8 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataData.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ErrataData.java
@@ -11,7 +11,7 @@ public class ErrataData implements Serializable {
     private List<Erratum> errata;
     private ErrataCounts errataCounts;
 
-    public ErrataData(){
+    public ErrataData() {
     }
 
     public List<Erratum> getErrata() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
index c86f037e189..07a1fced4eb 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ExternalDiscoveredHost.java
@@ -53,7 +53,7 @@ public void setName(String name) {
     public String getDescription() {
         return "MAC: " + (mac != null ? mac : "[N/A]") + "\n" +
                 " | DiscoverTime : " + (lastReport != null ? lastReport : "[N/A]") + "\n" +
-                " | Subnet: " +  (subnetName != null ? subnetName : "[N/A]") + "\n" +
+                " | Subnet: " + (subnetName != null ? subnetName : "[N/A]") + "\n" +
                 " | IP: " + (ip != null ? ip : "[N/A]");
     }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java
index 5af38c9df2d..10636904e0d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/MacRange.java
@@ -17,7 +17,7 @@ public class MacRange implements Serializable {
 
     @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT,
             message = VmNic.VALIDATION_MESSAGE_MAC_ADDRESS_INVALID)
-    @NotNull(message= "VALIDATION.VM.NETWORK.MAC.ADDRESS.NOT_NULL")
+    @NotNull(message = "VALIDATION.VM.NETWORK.MAC.ADDRESS.NOT_NULL")
     private String macFrom;
 
     @Pattern(regexp = MacAddressValidationPatterns.VALID_MAC_ADDRESS_FORMAT,
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
index 95ff5f39ebf..f21c4def2f2 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
@@ -12,7 +12,7 @@ public class OpenstackNetworkProviderProperties extends OpenStackProviderPropert
 
     private boolean readOnly = true;
 
-    public boolean getReadOnly(){
+    public boolean getReadOnly() {
         return readOnly;
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ReplaceHostConfiguration.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ReplaceHostConfiguration.java
index 7c46dfe2647..9e4f63518f5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ReplaceHostConfiguration.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ReplaceHostConfiguration.java
@@ -3,7 +3,7 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-public class ReplaceHostConfiguration implements  Serializable {
+public class ReplaceHostConfiguration implements Serializable {
 
     private ReplaceHostConfiguration.Action deployAction;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
index 610e69a2a68..6a3923e3ee9 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/SELinuxMode.java
@@ -15,7 +15,7 @@ public int toInt() {
 
     public static SELinuxMode fromValue(Integer v) {
         try {
-            if (v==null) {
+            if (v == null) {
                 return null;
             }
             if (v.equals(1)) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDR.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDR.java
index 90fcf97656c..bc69b20a718 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDR.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDR.java
@@ -5,7 +5,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class StorageDomainDR implements Serializable{
+public class StorageDomainDR implements Serializable {
 
     private static final long serialVersionUID = 8897241841053545233L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
index 47e7c8d98df..a25b3c1630c 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
@@ -21,7 +21,7 @@ public StorageDomainDynamic(Integer availableDiskSize, Guid id, Integer usedDisk
     private Integer availableDiskSize;
     private Integer confirmedAvailableDiskSize;
     private Integer vdoSavings;
-    private  ExternalStatus externalStatus;
+    private ExternalStatus externalStatus;
     private boolean containsUnregisteredEntities;
 
     public boolean isContainsUnregisteredEntities() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfoStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfoStatus.java
index cd46c58491e..9b2e4e506b7 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfoStatus.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfoStatus.java
@@ -3,7 +3,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public enum StorageDomainOvfInfoStatus implements Identifiable{
+public enum StorageDomainOvfInfoStatus implements Identifiable {
     UPDATED(0), OUTDATED(1), DISABLED(2);
 
     private int value;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java
index 258be15ea3d..a8b33a6f0b9 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatus.java
@@ -5,7 +5,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-public enum StorageDomainStatus implements Identifiable{
+public enum StorageDomainStatus implements Identifiable {
     Unknown(0),
     Uninitialized(1),
     Unattached(2),
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/V2VJobInfo.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/V2VJobInfo.java
index e5f79793793..6e979eaf131 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/V2VJobInfo.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/V2VJobInfo.java
@@ -65,7 +65,7 @@ public boolean equals(Object obj) {
         if (!(obj instanceof V2VJobInfo)) {
             return false;
         }
-        V2VJobInfo other = (V2VJobInfo)obj;
+        V2VJobInfo other = (V2VJobInfo) obj;
         return Objects.equals(vmId, other.vmId);
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 3aced9ce7dc..43da486f928 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -457,7 +457,7 @@ public ExternalStatus getExternalStatus() {
         return vdsDynamic.getExternalStatus();
     }
 
-    public  void setExternalStatus(ExternalStatus externalStatus) {
+    public void setExternalStatus(ExternalStatus externalStatus) {
         vdsDynamic.setExternalStatus(externalStatus);
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
index e561ba9639d..959478cdac5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
@@ -358,11 +358,11 @@ public void setSshKeyFingerprint(String sshKeyFingerprint) {
         this.sshKeyFingerprint = sshKeyFingerprint;
     }
 
-    public String getSshPublicKey(){
+    public String getSshPublicKey() {
         return sshPublicKey;
     }
 
-    public void setSshPublicKey(String sshPublicKey){
+    public void setSshPublicKey(String sshPublicKey) {
         this.sshPublicKey = sshPublicKey;
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index e2fc293c691..0e966046fca 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -1360,7 +1360,7 @@ public void setMigrationSupport(MigrationSupport migrationSupport) {
     }
 
     public List<Guid> getDedicatedVmForVdsList() {
-        if (dedicatedVmForVdsList == null){
+        if (dedicatedVmForVdsList == null) {
             dedicatedVmForVdsList = new LinkedList<>();
         }
         return dedicatedVmForVdsList;
@@ -1537,7 +1537,7 @@ public List<VmNumaNode> getvNumaNodeList() {
     }
 
     public void setvNumaNodeList(List<VmNumaNode> vNumaNodeList) {
-        if (vNumaNodeList != null){
+        if (vNumaNodeList != null) {
             this.vNumaNodeList = vNumaNodeList;
         } else {
             this.vNumaNodeList = new ArrayList<>();
@@ -1623,7 +1623,7 @@ public String getCustomCpuName() {
     }
 
     public void setCustomCpuName(String customCpuName) {
-        this.customCpuName = customCpuName==null || customCpuName.trim().isEmpty() ? null : customCpuName;
+        this.customCpuName = customCpuName == null || customCpuName.trim().isEmpty() ? null : customCpuName;
     }
 
     public boolean isUseHostCpuFlags() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIcon.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIcon.java
index d7c18c7c485..9a474f7b3e2 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIcon.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmIcon.java
@@ -63,7 +63,7 @@ public static Pair<String, String> dataUrlToTypeAndData(String dataUrl) {
      * @return icon in dataurl
      */
     public static String typeAndDataToDataUrl(String mediaType, String data) {
-        return  "data:" + mediaType + ";base64," + data;
+        return "data:" + mediaType + ";base64," + data;
     }
 
     @Override
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmJob.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmJob.java
index 5d45cfa302f..679803552c4 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmJob.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmJob.java
@@ -87,6 +87,6 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "VM Job [" + getId() +"]";
+        return "VM Job [" + getId() + "]";
     }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPayload.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPayload.java
index 7f9133dc17c..fbf4b53c608 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPayload.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPayload.java
@@ -42,9 +42,9 @@ public VmPayload(VmDevice dev) {
                 dev.getLogicalName());
 
         if (dev.getSpecParams() != null) {
-            Map<String, Object> payload = (Map<String, Object>)dev.getSpecParams().get(SpecParamsPayload);
-            this.volumeId = (String)payload.get(SpecParamsVolumeIdType);
-            this.files = (HashMap<String, String>)payload.get(SpecParamsFileType);
+            Map<String, Object> payload = (Map<String, Object>) dev.getSpecParams().get(SpecParamsPayload);
+            this.volumeId = (String) payload.get(SpecParamsVolumeIdType);
+            this.files = (HashMap<String, String>) payload.get(SpecParamsFileType);
         }
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
index 6b76e6b0313..6dd314e79a8 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
@@ -47,7 +47,7 @@ public VmStatic() {
     }
 
     public VmStatic(VmStatic vmStatic) {
-        this((VmBase)vmStatic);
+        this((VmBase) vmStatic);
         vmtGuid = vmStatic.getVmtGuid();
         originalTemplateGuid = vmStatic.originalTemplateGuid;
         originalTemplateName = vmStatic.originalTemplateName;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java
index 4496505878c..9be831635ef 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/aaa/DbUser.java
@@ -72,7 +72,7 @@ public class DbUser implements Queryable, Nameable {
     private Collection<Guid> groupIds;
 
     public DbUser() {
-        this((DbUser)null);
+        this((DbUser) null);
     }
 
     public DbUser(DirectoryUser directoryUser) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
index 98a8e0bfd43..cfa51f039a0 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterBrickEntity.java
@@ -212,7 +212,7 @@ public Guid getId() {
     }
 
     public Guid getId(boolean generateIfNull) {
-        if(id == null && generateIfNull) {
+        if (id == null && generateIfNull) {
             id = Guid.newGuid();
         }
         return id;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
index bf6efb5b750..620cb75383a 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSession.java
@@ -7,7 +7,7 @@
 import org.ovirt.engine.core.common.businessentities.Queryable;
 import org.ovirt.engine.core.compat.Guid;
 
-public class GlusterGeoRepSession implements Queryable, BusinessEntityWithStatus<Guid, GeoRepSessionStatus>{
+public class GlusterGeoRepSession implements Queryable, BusinessEntityWithStatus<Guid, GeoRepSessionStatus> {
 
     private static final long serialVersionUID = 1L;
 
@@ -115,7 +115,7 @@ public void setSessionDetails(ArrayList<GlusterGeoRepSessionDetails> sessionDeta
         this.sessionDetails = sessionDetails;
     }
 
-    public boolean isCheckPointCompleted(){
+    public boolean isCheckPointCompleted() {
         for (GlusterGeoRepSessionDetails details : getSessionDetails()) {
             if (details.getStatus() == GeoRepSessionStatus.ACTIVE && !details.isCheckpointCompleted()) {
                 return false;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionConfiguration.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionConfiguration.java
index 378ea98692f..99f5aa0f06a 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionConfiguration.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionConfiguration.java
@@ -6,7 +6,7 @@
 import org.ovirt.engine.core.common.businessentities.BusinessEntity;
 import org.ovirt.engine.core.compat.Guid;
 
-public class GlusterGeoRepSessionConfiguration extends GlusterVolumeOptionInfo implements BusinessEntity<Guid>{
+public class GlusterGeoRepSessionConfiguration extends GlusterVolumeOptionInfo implements BusinessEntity<Guid> {
 
     private static final long serialVersionUID = -6506417314359159692L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java
index 4d8334c8e03..eef1a1ac8d0 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterGeoRepSessionDetails.java
@@ -6,7 +6,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class GlusterGeoRepSessionDetails implements Serializable{
+public class GlusterGeoRepSessionDetails implements Serializable {
 
     private static final long serialVersionUID = -8084667500866439692L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterHookEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterHookEntity.java
index 3a77b5c950c..fca921a27ca 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterHookEntity.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterHookEntity.java
@@ -236,7 +236,7 @@ public boolean equals(Object obj) {
             return false;
         }
         GlusterHookEntity hook = (GlusterHookEntity) obj;
-        return  Objects.equals(id, hook.id)
+        return Objects.equals(id, hook.id)
                 && Objects.equals(clusterId, hook.clusterId)
                 && Objects.equals(glusterCommand, hook.glusterCommand)
                 && stage == hook.stage
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterLocalVolumeInfo.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterLocalVolumeInfo.java
index 257d73b9ee8..a881f8cfb8b 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterLocalVolumeInfo.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterLocalVolumeInfo.java
@@ -125,7 +125,7 @@ private Integer getVdoSavings(GlusterVDOVolume v) {
         if ( v.getLogicalBlocks() == 0 || v.getPhysicalBlocks() == 0) {
             return 0;
         }
-        return (int)(((v.getLogicalBlocks() - v.getPhysicalBlocks())/v.getLogicalBlocks().doubleValue())*100);
+        return (int) (((v.getLogicalBlocks() - v.getPhysicalBlocks()) / v.getLogicalBlocks().doubleValue()) * 100);
     }
 
     private Function<ThinSize, ThinSize> chooseSmallest(Optional<ThinSize> innerResult) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
index 58bc063f508..85995df78fc 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterServiceStatus.java
@@ -31,7 +31,7 @@ public String getStatusMsg() {
     public GlusterServiceStatus getCompositeStatus(GlusterServiceStatus otherStatus) {
         int compositeStatusCode = this.getStatusCode() | otherStatus.getStatusCode();
 
-        switch(compositeStatusCode) {
+        switch (compositeStatusCode) {
             case 8 : // 1000
                 return GlusterServiceStatus.RUNNING;
             case 12 : // 1100
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
index 93d25d5d4aa..556f6331a56 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeEntity.java
@@ -493,7 +493,7 @@ public boolean equals(Object obj) {
     }
 
     public GlusterBrickEntity getBrickWithId(Guid brickId) {
-        for(GlusterBrickEntity brick : getBricks()) {
+        for (GlusterBrickEntity brick : getBricks()) {
             if (brick.getId().equals(brickId)) {
                 return brick;
             }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java
index ef95f582e8e..6409a78ef45 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeOptionEntity.java
@@ -18,7 +18,7 @@
  *
  * @see GlusterVolumeEntity
  */
-public class GlusterVolumeOptionEntity implements Queryable, BusinessEntity<Guid>, Comparable<GlusterVolumeOptionEntity>{
+public class GlusterVolumeOptionEntity implements Queryable, BusinessEntity<Guid>, Comparable<GlusterVolumeOptionEntity> {
     private static final long serialVersionUID = 5770623263518245638L;
 
     @NotNull(message = "VALIDATION_GLUSTER_OPTION_ID_NOT_NULL", groups = RemoveEntity.class)
@@ -104,7 +104,7 @@ public boolean equals(Object obj) {
      */
     @Override
     public Guid getId() {
-        if(id == null) {
+        if (id == null) {
             id = Guid.newGuid();
         }
         return id;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileInfo.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileInfo.java
index c6f0401fb6f..8d10b56e0bd 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileInfo.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileInfo.java
@@ -49,7 +49,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if(!(obj instanceof GlusterVolumeProfileInfo)) {
+        if (!(obj instanceof GlusterVolumeProfileInfo)) {
             return false;
         }
         GlusterVolumeProfileInfo other = (GlusterVolumeProfileInfo) obj;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileStats.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileStats.java
index f7a174e36c5..0533339aafc 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileStats.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeProfileStats.java
@@ -34,7 +34,7 @@ public boolean equals(Object obj) {
         if (this == obj) {
             return true;
         }
-        if(!(obj instanceof GlusterVolumeProfileStats)) {
+        if (!(obj instanceof GlusterVolumeProfileStats)) {
             return false;
         }
         GlusterVolumeProfileStats other = (GlusterVolumeProfileStats) obj;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeType.java
index 3525b72422f..4557e3792e5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeType.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeType.java
@@ -84,10 +84,10 @@ public boolean isDispersedType() {
         return value().contains("DISPERSE");
     }
 
-    public boolean isSupported(){
-        if(this == GlusterVolumeType.UNKNOWN || this == GlusterVolumeType.TIER){
+    public boolean isSupported() {
+        if (this == GlusterVolumeType.UNKNOWN || this == GlusterVolumeType.TIER) {
             return false;
-        }else{
+        } else {
             return true;
         }
     }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageSyncSchedule.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageSyncSchedule.java
index ada27e92abe..24e193baf1b 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageSyncSchedule.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageSyncSchedule.java
@@ -12,7 +12,7 @@
 import org.ovirt.engine.core.compat.StringFormat;
 
 
-public class StorageSyncSchedule implements Serializable{
+public class StorageSyncSchedule implements Serializable {
 
     private static final long serialVersionUID = -3688076333085745256L;
 
@@ -56,7 +56,7 @@ public StorageSyncSchedule(String cronExpression) {
         } else {
             this.setFrequency(StorageSyncSchedule.Frequency.WEEKLY);
              List<Day> dayList = new ArrayList<>();
-             for(String day: cronParts[5].split(",")) {
+             for (String day: cronParts[5].split(",")) {
                  dayList.add(StorageSyncSchedule.Day.valueOf(day));
             }
             this.setDays(dayList.toArray(new Day[dayList.size()]));
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/BondMode.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/BondMode.java
index ffdc5252ed8..1b85df88649 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/BondMode.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/BondMode.java
@@ -19,30 +19,30 @@ public enum BondMode {
     private String description;
     private boolean isValidForVmNetwork;
 
-    BondMode(String value, String stringValue, String description, boolean isValidForVmNetwork){
+    BondMode(String value, String stringValue, String description, boolean isValidForVmNetwork) {
         this.value = value;
         this.stringValue = stringValue;
         this.description = description;
         this.isValidForVmNetwork = isValidForVmNetwork;
     }
 
-    public String getValue(){
+    public String getValue() {
         return value;
     }
 
-    public String getStringValue(){
+    public String getStringValue() {
         return stringValue;
     }
 
-    public String getDescription(){
+    public String getDescription() {
         return description;
     }
 
-    public String getConfigurationValue(){
+    public String getConfigurationValue() {
         return getConfigurationValue(DEFAULT_MIIMON_VALUE);
     }
 
-    public String getConfigurationValue(String miimonValue){
+    public String getConfigurationValue(String miimonValue) {
         String extraOption;
         if (value.equals(BondMode.BOND4.value)) {
             extraOption = " xmit_hash_policy=" + BOND_XMIT_POLICY_LAYER23;
@@ -52,19 +52,19 @@ public String getConfigurationValue(String miimonValue){
         return MODE + value + extraOption;
     }
 
-    public boolean isBondModeValidForVmNetwork(){
+    public boolean isBondModeValidForVmNetwork() {
         return isValidForVmNetwork;
     }
 
-    public static BondMode parseBondMode(String bondOptions){
+    public static BondMode parseBondMode(String bondOptions) {
         return bondOptions == null ? null : getBondMode(findMode(bondOptions));
     }
 
-    public static BondMode getBondMode(String bondModeValue){
+    public static BondMode getBondMode(String bondModeValue) {
         if (bondModeValue == null) {
             return null;
         }
-        for (BondMode bondMode : BondMode.values()){
+        for (BondMode bondMode : BondMode.values()) {
             if (bondMode.getStringValue().equals(bondModeValue) || bondMode.getValue().equals(bondModeValue)) {
                 return bondMode;
             }
@@ -80,15 +80,15 @@ public static BondMode getBondMode(String bondModeValue){
     // method. Using the ovirt compat package would also not work, as the regexp used
     // here would be a java regexp, and in the UI it would be used the javascript
     // regex engine.
-    private static String findMode(String bondOptions){
+    private static String findMode(String bondOptions) {
 
         char[] bondOptionsChars = bondOptions.toCharArray();
         int length = bondOptions.length();
 
         // Find the start index for "mode"
         int index = 0;
-        if (!bondOptions.startsWith(MODE_FOR_SEARCH)){
-            if ((index = bondOptions.indexOf(" " + MODE_FOR_SEARCH)) == -1){
+        if (!bondOptions.startsWith(MODE_FOR_SEARCH)) {
+            if ((index = bondOptions.indexOf(" " + MODE_FOR_SEARCH)) == -1) {
                 return null;
             }
             index++; // compensate for the extra space in front of "mode"
@@ -97,17 +97,17 @@ private static String findMode(String bondOptions){
         index = index + MODE_FOR_SEARCH.length();
 
         // find "="
-        if (index >= length || bondOptionsChars[index] != '='){
+        if (index >= length || bondOptionsChars[index] != '=') {
             return null;
         }
         index++;
 
-        if (index==length || Character.isSpace(bondOptionsChars[index])) {
+        if (index == length || Character.isSpace(bondOptionsChars[index])) {
             return null;
         }
 
         int startIndex = index;
-        while(index < length && !Character.isSpace(bondOptionsChars[index])){
+        while (index < length && !Character.isSpace(bondOptionsChars[index])) {
             index++;
         }
 
@@ -117,9 +117,9 @@ private static String findMode(String bondOptions){
         return new String(modeChars);
     }
 
-    public static boolean isBondModeValidForVmNetwork(String bondOptions){
+    public static boolean isBondModeValidForVmNetwork(String bondOptions) {
         BondMode bondMode = BondMode.parseBondMode(bondOptions);
-        if (bondMode == null){
+        if (bondMode == null) {
             return false;
         }
         return bondMode.isBondModeValidForVmNetwork();
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
index 75763a3aca3..2195f969a62 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
@@ -240,7 +240,7 @@ public boolean isExternal() {
     }
 
     public boolean isTunnelled() {
-        return isExternal() && getProvidedBy().getPhysicalNetworkId()==null;
+        return isExternal() && getProvidedBy().getPhysicalNetworkId() == null;
     }
 
     public String getLabel() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NicLabel.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NicLabel.java
index 41abff38295..e67457f9f63 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NicLabel.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NicLabel.java
@@ -17,7 +17,7 @@ public class NicLabel implements Serializable, Nameable {
     private Guid nicId;
     private String nicName;
 
-    @NotNull(message="LABEL_ON_NETWORK_LABEL_CANNOT_BE_NULL")
+    @NotNull(message = "LABEL_ON_NETWORK_LABEL_CANNOT_BE_NULL")
     @ValidName(message = "NETWORK_LABEL_FORMAT_INVALID")
     private String label;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/TlvSpecificType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/TlvSpecificType.java
index 8685b58e311..b7034c5e634 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/TlvSpecificType.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/TlvSpecificType.java
@@ -39,7 +39,7 @@ public int getOui() {
         return oui;
     }
 
-    public boolean isSameAsTlv(Tlv tlv){
+    public boolean isSameAsTlv(Tlv tlv) {
         if (type < 127) {
             return type == tlv.getType();
         } else if (type == 127) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
index e4d30ac4603..0640c3d8f93 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
@@ -596,7 +596,7 @@ public void setIpv4DefaultRoute(boolean ipv4DefaultRoute) {
     /**
      * Holds various details about regarding the logical network implementation on the device.
      */
-    public static class NetworkImplementationDetails implements Serializable{
+    public static class NetworkImplementationDetails implements Serializable {
 
         private static final long serialVersionUID = 5213991878221362832L;
         private boolean inSync;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
index 211d4c43432..9b1294a0b5f 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/BaseDisk.java
@@ -155,7 +155,7 @@ public void setWipeAfterDelete(boolean wipeAfterDelete) {
     }
 
     public PropagateErrors getPropagateErrors() {
-        if ((Boolean)(Config.getValue(ConfigValues.PropagateDiskErrors))) {
+        if ((Boolean) (Config.getValue(ConfigValues.PropagateDiskErrors))) {
             return PropagateErrors.On;
         }
         return propagateErrors;
@@ -170,7 +170,7 @@ public String getDiskDescription() {
     }
 
     public void setDiskDescription(String diskDescription) {
-        this.diskDescription =  diskDescription == null ? "" : diskDescription;
+        this.diskDescription = diskDescription == null ? "" : diskDescription;
     }
 
     public String getDiskAlias() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/ImageTransfer.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/ImageTransfer.java
index 0d9a5850b2f..2fe573f5636 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/ImageTransfer.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/ImageTransfer.java
@@ -42,7 +42,7 @@ public ImageTransfer(Guid commandId) {
         this.commandId = commandId;
     }
 
-    public ImageTransfer() {}
+    public ImageTransfer() { }
 
     public Guid getId() {
         return commandId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java
index b4204621279..cba1b6fb58d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/console/ConsoleOptions.java
@@ -9,7 +9,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.StringHelper;
 
-public class ConsoleOptions implements Serializable{
+public class ConsoleOptions implements Serializable {
 
     private Guid vmId;
     private GraphicsType graphicsType;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/eventqueue/Event.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/eventqueue/Event.java
index 426d59e4ac0..ecc88a32a22 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/eventqueue/Event.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/eventqueue/Event.java
@@ -69,7 +69,7 @@ public boolean equals(Object obj) {
     @Override
     public String toString() {
         return ToStringBuilder.forInstance(this)
-                .append("eventType",  eventType)
+                .append("eventType", eventType)
                 .append("storagePoolId", storagePoolId)
                 .append("domainId", domainId)
                 .append("vdsId", vdsId)
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/AbstractHandler.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/AbstractHandler.java
index 55c39c25c7f..baaa018513c 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/AbstractHandler.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/AbstractHandler.java
@@ -79,7 +79,7 @@ protected boolean validateContext(C ctx) {
         return true;
     }
 
-    public abstract HandlerOutcome handle(C ctx)  throws Exception;
+    public abstract HandlerOutcome handle(C ctx) throws Exception;
 
     @Override
     public Handler<C> setOnSuccess(Handler<C> successHandler) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/Handler.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/Handler.java
index 7dd010189b4..b332a67fb99 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/Handler.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/flow/Handler.java
@@ -52,7 +52,7 @@ public interface Handler<C extends Context> {
      * @return an outcome which is used by the process() method to determine
      * which handler to execute next.
      */
-    HandlerOutcome handle(C ctx)  throws Exception;
+    HandlerOutcome handle(C ctx) throws Exception;
 
     /**
      * Process the flow:
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/ExternalSystem.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/ExternalSystem.java
index 021af38b719..3b914675cd8 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/ExternalSystem.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/ExternalSystem.java
@@ -8,7 +8,7 @@
 /**
  * Represents an external system task associated with a Step.
  */
-public class ExternalSystem implements Serializable{
+public class ExternalSystem implements Serializable {
 
     /**
      * Automatic generated serial version ID
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceConfig.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceConfig.java
index 1abfcfa81d1..bae77ecef7f 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceConfig.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceConfig.java
@@ -21,7 +21,7 @@ public class ConvergenceConfig implements Serializable {
      */
     private List<ConvergenceItem> lastItems;
 
-    public ConvergenceConfig() {}
+    public ConvergenceConfig() { }
 
     public List<ConvergenceItemWithStallingLimit> getConvergenceItems() {
         return convergenceItems;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItem.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItem.java
index 332d1c54b72..87eadb66dbd 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItem.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItem.java
@@ -12,7 +12,7 @@ public class ConvergenceItem implements Serializable {
 
     private List<Object> params;
 
-    public ConvergenceItem() {}
+    public ConvergenceItem() { }
 
     public ConvergenceItem(String action, Object... params) {
         this(action, Arrays.asList(params));
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItemWithStallingLimit.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItemWithStallingLimit.java
index 99d30be6f89..581b298ad08 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItemWithStallingLimit.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/ConvergenceItemWithStallingLimit.java
@@ -10,7 +10,7 @@ public class ConvergenceItemWithStallingLimit implements Serializable {
 
     private ConvergenceItem convergenceItem;
 
-    public ConvergenceItemWithStallingLimit() {}
+    public ConvergenceItemWithStallingLimit() { }
 
     public ConvergenceItemWithStallingLimit(int stallingLimit, String action, Object... params) {
         this(stallingLimit, new ConvergenceItem(action, params));
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/MigrationPolicy.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/MigrationPolicy.java
index ecfd29266c0..a120bf8ecef 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/MigrationPolicy.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/migration/MigrationPolicy.java
@@ -25,7 +25,7 @@ public class MigrationPolicy implements Serializable, Nameable {
 
     private ConvergenceConfig config;
 
-    public MigrationPolicy() {}
+    public MigrationPolicy() { }
 
     public MigrationPolicy(Guid id, String name, String description, ConvergenceConfig config) {
         this.id = id;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ErrataFilter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ErrataFilter.java
index 1378431e285..f1dd0fd8d9d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ErrataFilter.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ErrataFilter.java
@@ -11,7 +11,7 @@ public class ErrataFilter implements Serializable {
     private Integer pageNumber;
     private Integer pageSize;
 
-    public ErrataFilter(){
+    public ErrataFilter() {
     }
 
     public Set<Erratum.ErrataType> getErrataTypes() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConnectionsByDataCenterAndStorageTypeParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConnectionsByDataCenterAndStorageTypeParameters.java
index dcc582f86ff..5a819a5bb62 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConnectionsByDataCenterAndStorageTypeParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetConnectionsByDataCenterAndStorageTypeParameters.java
@@ -9,7 +9,7 @@ public class GetConnectionsByDataCenterAndStorageTypeParameters extends IdQueryP
 
     private StorageType storageType;
 
-    public GetConnectionsByDataCenterAndStorageTypeParameters() {}
+    public GetConnectionsByDataCenterAndStorageTypeParameters() { }
 
     public GetConnectionsByDataCenterAndStorageTypeParameters(Guid dataCenterId, StorageType storageType) {
         super(dataCenterId);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetErrataCountsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetErrataCountsParameters.java
index d5aa70077b6..ebfe03d3144 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetErrataCountsParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetErrataCountsParameters.java
@@ -2,14 +2,14 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class GetErrataCountsParameters extends IdQueryParameters{
+public class GetErrataCountsParameters extends IdQueryParameters {
 
     private ErrataFilter errataFilter;
 
-    public GetErrataCountsParameters(){
+    public GetErrataCountsParameters() {
     }
 
-    public GetErrataCountsParameters(Guid id){
+    public GetErrataCountsParameters(Guid id) {
         super(id);
     }
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetFilteredAndSortedParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetFilteredAndSortedParameters.java
index c0405160311..bb7984d839a 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetFilteredAndSortedParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetFilteredAndSortedParameters.java
@@ -34,7 +34,7 @@ public int getMaxResults() {
         return maxResults;
     }
     public void setMaxResults(int maxResults) {
-        this.maxResults= maxResults;
+        this.maxResults = maxResults;
     }
     public int getPageNum() {
         return pageNum;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByCorrelationIdQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByCorrelationIdQueryParameters.java
index d96e17864b6..6bf99820608 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByCorrelationIdQueryParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByCorrelationIdQueryParameters.java
@@ -1,7 +1,7 @@
 package org.ovirt.engine.core.common.queries;
 
 
-public class GetJobsByCorrelationIdQueryParameters  extends QueryParametersBase {
+public class GetJobsByCorrelationIdQueryParameters extends QueryParametersBase {
 
     private static final long serialVersionUID = 758029173419093849L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByOffsetQueryParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByOffsetQueryParameters.java
index fa2440d6a69..89e3be2f7cf 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByOffsetQueryParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetJobsByOffsetQueryParameters.java
@@ -1,7 +1,7 @@
 package org.ovirt.engine.core.common.queries;
 
 
-public class GetJobsByOffsetQueryParameters  extends QueryParametersBase {
+public class GetJobsByOffsetQueryParameters extends QueryParametersBase {
 
     private static final long serialVersionUID = -536423247558047939L;
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetSignedWebsocketProxyTicketParams.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetSignedWebsocketProxyTicketParams.java
index d3eb87d9ef3..4b128004df1 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetSignedWebsocketProxyTicketParams.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetSignedWebsocketProxyTicketParams.java
@@ -16,7 +16,7 @@ public GetSignedWebsocketProxyTicketParams(Guid vmId,
         this.graphicsType = graphicsType;
     }
 
-    private GetSignedWebsocketProxyTicketParams() {}
+    private GetSignedWebsocketProxyTicketParams() { }
 
     public Guid getVmId() {
         return vmId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainDefaultWipeAfterDeleteParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainDefaultWipeAfterDeleteParameters.java
index d1394542b5c..9eb1e845c8f 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainDefaultWipeAfterDeleteParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetStorageDomainDefaultWipeAfterDeleteParameters.java
@@ -7,7 +7,7 @@ public class GetStorageDomainDefaultWipeAfterDeleteParameters extends QueryParam
     private static final long serialVersionUID = 6469435734937894858L;
     private StorageType storageType;
 
-    public GetStorageDomainDefaultWipeAfterDeleteParameters() {}
+    public GetStorageDomainDefaultWipeAfterDeleteParameters() { }
 
     public GetStorageDomainDefaultWipeAfterDeleteParameters(StorageType storageType) {
         this.storageType = storageType;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmIconDefaultParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmIconDefaultParameters.java
index 0a85c5ab23b..a93f9993994 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmIconDefaultParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/GetVmIconDefaultParameters.java
@@ -5,7 +5,7 @@ public class GetVmIconDefaultParameters extends QueryParametersBase {
 
     private int operatingSystemId;
 
-    private GetVmIconDefaultParameters() {}
+    private GetVmIconDefaultParameters() { }
 
     public GetVmIconDefaultParameters(int operatingSystemId) {
         this.operatingSystemId = operatingSystemId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValidateVmMacsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValidateVmMacsParameters.java
index 042365a8979..e9e5c37fcf4 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValidateVmMacsParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/ValidateVmMacsParameters.java
@@ -11,7 +11,7 @@ public class ValidateVmMacsParameters extends QueryParametersBase {
     private Map<Guid, List<VM>> vmsByCluster;
 
     // Hide me. Exists in order to please serialization framework we use.
-    private ValidateVmMacsParameters() {}
+    private ValidateVmMacsParameters() { }
 
     public ValidateVmMacsParameters(Map<Guid, List<VM>> vmsByCluster) {
         // As long as the default constructor exists, calling it is to be on the safe side for the case it'd contain
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/AffinityGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/AffinityGroup.java
index 2aa6d5caf64..5e5613bde66 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/AffinityGroup.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/AffinityGroup.java
@@ -124,7 +124,7 @@ public class AffinityGroup implements BusinessEntity<Guid>, Queryable, Nameable
     // It is computed by queries returning affinity groups
     private Boolean broken;
 
-    public AffinityGroup() {}
+    public AffinityGroup() { }
 
     public AffinityGroup(AffinityGroup other) {
         id = other.id;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/CpuPinningHelper.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/CpuPinningHelper.java
index 5732bf8fec4..86bd7084a6b 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/CpuPinningHelper.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/CpuPinningHelper.java
@@ -120,7 +120,7 @@ public static Map<Integer, Integer> createDedicatedCpuPinningMap(List<VdsCpuUnit
      * @return a map of CPU pinning
      */
     public static Map<Integer, Integer> createExclusiveCpuPinningMap(List<VdsCpuUnit> vdsCpuUnits, CpuPinningPolicy cpuPinningPolicy) {
-        switch(cpuPinningPolicy) {
+        switch (cpuPinningPolicy) {
             case DEDICATED:
                 return createDedicatedCpuPinningMap(vdsCpuUnits);
             case ISOLATE_THREADS:
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/HugePageUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/HugePageUtils.java
index 6a95d960272..a9130a99bdf 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/HugePageUtils.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/HugePageUtils.java
@@ -33,7 +33,7 @@ public static Map<Integer, Integer> getHugePages(VmBase vm) {
         }
 
         // Make sure we do not overflow when big memory VM is used
-        int fullPages = (int)((KIB_IN_MIB * vm.getMemSizeMb() + hugePageSize.get() - 1) / hugePageSize.get());
+        int fullPages = (int) ((KIB_IN_MIB * vm.getMemSizeMb() + hugePageSize.get() - 1) / hugePageSize.get());
         return Collections.singletonMap(hugePageSize.get(), fullPages);
     }
 
@@ -89,7 +89,7 @@ public static int totalHugePageMemMb(Map<Integer, Integer> hugepages) {
                 .mapToLong(entry -> entry.getKey() * entry.getValue())
                 .sum();
 
-        return (int)((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
+        return (int) ((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
     }
 
     public static int totalHugePageMemMb(VDS vds) {
@@ -101,7 +101,7 @@ public static int totalHugePageMemMb(VDS vds) {
                 .mapToLong(hugePage -> hugePage.getTotal() * hugePage.getSizeKB())
                 .sum();
 
-        return (int)((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
+        return (int) ((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
     }
 
     public static int totalHugePageFreeMemMb(VDS vds) {
@@ -113,7 +113,7 @@ public static int totalHugePageFreeMemMb(VDS vds) {
                 .mapToLong(hugePage -> hugePage.getFree() * hugePage.getSizeKB())
                 .sum();
 
-        return (int)((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
+        return (int) ((hugePageMemKb + KIB_IN_MIB - 1) / KIB_IN_MIB);
     }
 
     public static void updateHugePages(List<HugePage> hugePages, Integer sizeKb, Integer amount) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/IPAddressConverter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/IPAddressConverter.java
index f17e5f04ae2..eb1b29d1aae 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/IPAddressConverter.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/IPAddressConverter.java
@@ -162,8 +162,8 @@ public String convertPrefixToIPv4Netmask(String prefix) {
         return stringBuilder.substring(1);
     }
 
-    private String removeLeadingSlashFromNetmaskIfPresent(String prefix){
-        if (prefix != null && prefix.startsWith("/")){
+    private String removeLeadingSlashFromNetmaskIfPresent(String prefix) {
+        if (prefix != null && prefix.startsWith("/")) {
             return prefix.substring(1);
         }
         return prefix;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/LocationInfoHelper.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/LocationInfoHelper.java
index 4cc66e0f772..599b82ea5c5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/LocationInfoHelper.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/LocationInfoHelper.java
@@ -17,7 +17,7 @@ private LocationInfoHelper() {
 
     public static Map<String, Object> prepareLocationInfoForVdsCommand(LocationInfo locationInfo) {
         if (locationInfo instanceof ExternalLocationInfo) {
-            ExternalLocationInfo info = (ExternalLocationInfo)locationInfo;
+            ExternalLocationInfo info = (ExternalLocationInfo) locationInfo;
             if (ConnectionMethod.HTTP.equals(info.getConnectionMethod())) {
                 HttpLocationInfo httpInfo = (HttpLocationInfo) info;
                 Map<String, Object> infoMap = new HashMap<>();
@@ -29,7 +29,7 @@ public static Map<String, Object> prepareLocationInfoForVdsCommand(LocationInfo
         }
 
         if (locationInfo instanceof VdsmImageLocationInfo) {
-            VdsmImageLocationInfo info = (VdsmImageLocationInfo)locationInfo;
+            VdsmImageLocationInfo info = (VdsmImageLocationInfo) locationInfo;
             Map<String, Object> infoMap = new HashMap<>();
             infoMap.put("endpoint_type", "div");
             infoMap.put("sd_id", info.getStorageDomainId().toString());
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/MDevTypesUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/MDevTypesUtils.java
index 0e05c5b429f..e043133156d 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/MDevTypesUtils.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/MDevTypesUtils.java
@@ -68,7 +68,7 @@ public static List<VmDevice> convertDeprecatedCustomPropertyToVmDevices(String p
                 }
             }
             return devices;
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.info("failed to parse deprecated custom property mdev_type: {}", property);
             return Collections.emptyList();
         }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/NumaPinningHelper.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/NumaPinningHelper.java
index 7d81cc28139..0268970c951 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/NumaPinningHelper.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/NumaPinningHelper.java
@@ -239,14 +239,14 @@ public static String getSapHanaCpuPinning(VM vm, VdsDynamic vdsDynamic, List<Vds
             }
             boolean singleThreaded = coresInNuma == cpusInNuma.size();
             for (int i = 1; i <= vCpusPerNumaThread; i++) {
-                final int pinnedCpus = ((i-1) + numaNodeNumber * vCpusPerNumaThread) * hostThreadsPerCore;
+                final int pinnedCpus = ((i - 1) + numaNodeNumber * vCpusPerNumaThread) * hostThreadsPerCore;
                 String pinning;
                 if (singleThreaded) {
                     pinning = String.format("#%d_", cpusInNuma.get(i));
                 } else {
                     pinning = String.format("#%d,%d_", cpusInNuma.get(i), cpusInNuma.get(i + coresInNuma));
                 }
-                IntStream.range(0, hostThreadsPerCore).forEach(idx -> sb.append(pinnedCpus+idx).append(pinning));
+                IntStream.range(0, hostThreadsPerCore).forEach(idx -> sb.append(pinnedCpus + idx).append(pinning));
             }
             numaNodeNumber++;
         }
@@ -348,7 +348,7 @@ private static class HostNumaNodeData {
 
         private List<HugePage> hugePages;
 
-        private  HostNumaNodeData() {
+        private HostNumaNodeData() {
         }
 
         public HostNumaNodeData(VdsNumaNode numaNode, boolean considerCpuPinning) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/PDIVMapBuilder.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/PDIVMapBuilder.java
index c689fa35665..f35129a46b1 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/PDIVMapBuilder.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/PDIVMapBuilder.java
@@ -20,7 +20,7 @@ public static PDIVMapBuilder create() {
     }
 
     public Map<String, String> build() {
-        if (poolId == null || domainId == null || imageGroupId == null || volumeId== null) {
+        if (poolId == null || domainId == null || imageGroupId == null || volumeId == null) {
             throw new IllegalArgumentException("One or more of the PDIV IDs is null");
         }
         Map<String, String> pdivMap = new HashMap<>(8);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
index 0237f9efdad..8eae1e2ecf8 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SecretValue.java
@@ -40,6 +40,6 @@ public boolean equals(Object obj) {
         if (!(obj instanceof SecretValue)) {
             return false;
         }
-        return Objects.equals(value, ((SecretValue<?>)obj).getValue());
+        return Objects.equals(value, ((SecretValue<?>) obj).getValue());
     }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
index ccec17063ec..75e2e680f92 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/SizeConverter.java
@@ -85,8 +85,8 @@ public static Pair<SizeUnit, Double> autoConvert(long size, SizeUnit inUnit) {
 
     public static SizeUnit leastUnitInList(List<Pair<SizeUnit, Double>> operands) {
         SizeUnit leastUnit = SizeUnit.getMaxHandledUnit();
-        for(Pair<SizeUnit, Double> operand : operands) {
-            if(operand.getFirst().getUnitWeight() < leastUnit.getUnitWeight()) {
+        for (Pair<SizeUnit, Double> operand : operands) {
+            if (operand.getFirst().getUnitWeight() < leastUnit.getUnitWeight()) {
                 leastUnit = operand.getFirst();
             }
         }
@@ -95,8 +95,8 @@ public static SizeUnit leastUnitInList(List<Pair<SizeUnit, Double>> operands) {
 
     public static SizeUnit maxUnitInList(List<Pair<SizeUnit, Double>> operands) {
         SizeUnit maxUnit = SizeUnit.getMinHandledUnit();
-        for(Pair<SizeUnit, Double> operand : operands) {
-            if(operand.getFirst().getUnitWeight() > maxUnit.getUnitWeight()) {
+        for (Pair<SizeUnit, Double> operand : operands) {
+            if (operand.getFirst().getUnitWeight() > maxUnit.getUnitWeight()) {
                 maxUnit = operand.getFirst();
             }
         }
@@ -105,7 +105,7 @@ public static SizeUnit maxUnitInList(List<Pair<SizeUnit, Double>> operands) {
 
     @SafeVarargs
     public static List<Pair<SizeUnit, Double>> getMathOperationSafeOperands(Pair<SizeUnit, Double>... operands) {
-        List<Pair<SizeUnit, Double>>  operationReadyOperands = new ArrayList<>();
+        List<Pair<SizeUnit, Double>> operationReadyOperands = new ArrayList<>();
         List<Pair<SizeUnit, Double>> convertedOperands = new ArrayList<>();
         for (Pair<SizeUnit, Double> operand : operands) {
             convertedOperands.add(autoConvert(operand.getSecond().longValue(), operand.getFirst()));
@@ -114,7 +114,7 @@ public static List<Pair<SizeUnit, Double>> getMathOperationSafeOperands(Pair<Siz
         SizeUnit finalUnit = leastUnitInList(convertedOperands);
 
         for (Pair<SizeUnit, Double> operand : convertedOperands) {
-            if(operand.getFirst() != finalUnit) {
+            if (operand.getFirst() != finalUnit) {
                 operationReadyOperands.add(new Pair<>(finalUnit,
                         convert(operand.getSecond().longValue(), operand.getFirst(), finalUnit).doubleValue()));
             } else {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ToStringBuilder.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ToStringBuilder.java
index e3fec30c92f..d4657e2cc6b 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ToStringBuilder.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ToStringBuilder.java
@@ -14,7 +14,7 @@ public class ToStringBuilder {
     static final char CLASS_NAME_SUFFIX = ':';
     static final char ATTRIBUTES_LIST_PREFIX = '{';
     static final char ATTRIBUTES_LIST_SUFFIX = '}';
-    static final String ATTRIBUTES_SEPARATOR =  ", ";
+    static final String ATTRIBUTES_SEPARATOR = ", ";
     static final String NAME_VALUE_SEPARATOR = "='";
     static final char VALUE_SUFFIX = '\'';
     static final String FILTERED_CONTENT = "***";
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java
index 1c346ce4d2f..2ff1c331b4a 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ValidationUtils.java
@@ -23,7 +23,7 @@ public class ValidationUtils {
     public static final String NO_SPECIAL_CHARACTERS_EXTRA_I18N = "^[\\p{L}0-9._\\+-]*$";
     public static final String CUSTOM_CPU_NAME = "^[\\p{L}0-9._\\+\\-,]*$";
     public static final String NO_SPECIAL_CHARACTER_CLASS_I18N = "\\p{L}0-9._-";
-    public static final String NO_SPECIAL_CHARACTERS_I18N = "^["+ NO_SPECIAL_CHARACTER_CLASS_I18N + "]*$";
+    public static final String NO_SPECIAL_CHARACTERS_I18N = "^[" + NO_SPECIAL_CHARACTER_CLASS_I18N + "]*$";
     public static final String NO_SPECIAL_CHARACTERS = "[0-9a-zA-Z_-]+";
     public static final String ONLY_I18N_ASCII_OR_NONE = "[\\p{ASCII}\\p{L}]*";
     public static final String ONLY_ASCII_OR_NONE = "[\\p{ASCII}]*";
@@ -41,7 +41,7 @@ public class ValidationUtils {
     public static final String IPV6_PATTERN = "(?:" + IPV6_STD_PATTERN + "|" + IPV6_HEX_COMPRESSED_PATTERN + ")";
     public static final String IPV4_OR_IPV6_PATTERN = IPV4_PATTERN + "|" + IPV6_PATTERN;
     public static final String IPV6_FOR_URI = "\\[" + IPV6_PATTERN + "\\]";
-    public static final String ANY_IP_PATTERN = "^(" + IPV4_PATTERN_NON_EMPTY + "|" + IPV6_PATTERN +")$";
+    public static final String ANY_IP_PATTERN = "^(" + IPV4_PATTERN_NON_EMPTY + "|" + IPV6_PATTERN + ")$";
     public static final String FQDN_PATTERN =
             "([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*";
     public static final String HOSTNAME_FOR_URI =
@@ -131,7 +131,7 @@ public static <T> List<String> validateInputs(List<Class<?>> validationGroupList
                 //this will extract all violation attributes and will create messages of the type:
                 //${violationkey} violationValue
                 //these values can later be used for formatting the returned messages.
-                if(constraintDescriptor != null) {
+                if (constraintDescriptor != null) {
                     Map<String, Object> violationAttributes = constraintDescriptor.getAttributes();
                     for (Map.Entry violationAttribute : violationAttributes.entrySet()) {
                         String propertyName = violationAttribute.getKey().toString();
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java
index 7a3bde49a95..765ecb93b8b 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java
@@ -266,7 +266,7 @@ private static int setDiskBootOrder(
 
     public static Map<VmDeviceId, DiskVmElement> extractDiskVmElements(VM vm) {
         Map<VmDeviceId, DiskVmElement> result = new HashMap<>();
-        for(Disk disk : vm.getDiskMap().values()) {
+        for (Disk disk : vm.getDiskMap().values()) {
             DiskVmElement element = disk.getDiskVmElementForVm(vm.getId());
             if (element != null) {
                 result.put(element.getId(), element);
@@ -418,7 +418,7 @@ public static void addVideoDevice(VmBase vmBase) {
         vmBase.getManagedDeviceMap().put(vmDevice.getDeviceId(), vmDevice);
     }
 
-    public static void addGraphicsDevice(VmBase vmBase, VmDeviceType vmDeviceType)  {
+    public static void addGraphicsDevice(VmBase vmBase, VmDeviceType vmDeviceType) {
         GraphicsDevice graphicsDevice = new GraphicsDevice(vmDeviceType);
         graphicsDevice.setId(new VmDeviceId(Guid.newGuid(), vmBase.getId()));
         vmBase.getManagedDeviceMap().put(graphicsDevice.getDeviceId(), graphicsDevice);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmInitToOpenStackMetadataAdapter.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmInitToOpenStackMetadataAdapter.java
index d21a3a8cf4a..3c72f542fda 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmInitToOpenStackMetadataAdapter.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmInitToOpenStackMetadataAdapter.java
@@ -41,7 +41,7 @@ public Map<String, Object> asMap(VmInit vmInit) {
 
         if (vmInitNetworks != null) {
             links = new LinkedList<>();
-            networks  = new LinkedList<>();
+            networks = new LinkedList<>();
 
             for (VmInitNetwork vmInitNetwork: vmInitNetworks) {
                 if (!isStartOnBoot(vmInitNetwork)) {
@@ -118,7 +118,7 @@ private Map<String, Object> mapIPv6(VmInitNetwork vmInitNetwork) {
             throw new IllegalArgumentException("IPv6 address must be supplied for a static IPv6 configuration");
         }
 
-        Map<String, Object>  networkIPv6 = new HashMap<>();
+        Map<String, Object> networkIPv6 = new HashMap<>();
         networkIPv6.put("id", vmInitNetwork.getName());
         networkIPv6.put("link", vmInitNetwork.getName());
 
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MaskConstraint.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MaskConstraint.java
index 20fec54a656..0bba9240d61 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MaskConstraint.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/validation/MaskConstraint.java
@@ -25,7 +25,7 @@ public boolean isValid(String mask, ConstraintValidatorContext context) {
                         maskFormatValidation ? isMaskValid(mask) : false,
                         EngineMessage.UPDATE_NETWORK_ADDR_IN_SUBNET_BAD_FORMAT.name(),
                         EngineMessage.UPDATE_NETWORK_ADDR_IN_SUBNET_BAD_VALUE.name());
-        return ValidatorConstraint.getInstance().isValid(args, context, "mask");//$NON-NLS-1$
+        return ValidatorConstraint.getInstance().isValid(args, context, "mask"); //$NON-NLS-1$
     }
 
     private boolean isMaskFormatValid(String mask) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertOvaVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertOvaVDSParameters.java
index ef6721f28a7..e3140e24885 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertOvaVDSParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertOvaVDSParameters.java
@@ -87,7 +87,7 @@ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
                 .append("storageDomainId", getStorageDomainId())
                 .append("storagePoolId", getStoragePoolId())
                 .append("virtioIsoPath", getVirtioIsoPath());
-        for (int i=0; i<getDisks().size(); ++i) {
+        for (int i = 0; i < getDisks().size(); ++i) {
             builder.append(String.format("Disk%d", i), getDisks().get(i).getId());
         }
         return builder;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertVmVDSParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertVmVDSParameters.java
index 40b0956e7a6..637c5c5c598 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertVmVDSParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConvertVmVDSParameters.java
@@ -112,7 +112,7 @@ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
                 .append("storagePoolId", getStoragePoolId())
                 .append("virtioIsoPath", getVirtioIsoPath())
                 .append("compatVersion", getCompatVersion());
-        for (int i=0; i<getDisks().size(); ++i) {
+        for (int i = 0; i < getDisks().size(); ++i) {
             builder.append(String.format("Disk%d", i), getDisks().get(i).getId());
         }
         return builder;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageSizeVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageSizeVDSCommandParameters.java
index d7ed4f8ef86..11d059daed1 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageSizeVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageSizeVDSCommandParameters.java
@@ -10,7 +10,7 @@ public class ExtendImageSizeVDSCommandParameters extends IrsBaseVDSCommandParame
     private Guid imageId;
     private long newSize;
 
-    public ExtendImageSizeVDSCommandParameters() {}
+    public ExtendImageSizeVDSCommandParameters() { }
 
     public ExtendImageSizeVDSCommandParameters(Guid storagePoolId,
                                                Guid storageDomainId,
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageTicketVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageTicketVDSCommandParameters.java
index 46540615246..ccabbd8bdb0 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageTicketVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendImageTicketVDSCommandParameters.java
@@ -9,5 +9,5 @@ public ExtendImageTicketVDSCommandParameters(Guid vdsId,
         super(vdsId, ticketId, timeout);
     }
 
-    public ExtendImageTicketVDSCommandParameters() {}
+    public ExtendImageTicketVDSCommandParameters() { }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
index 015f55c0e76..3f6b33804ac 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetFileStatsParameters.java
@@ -9,7 +9,7 @@ public class GetFileStatsParameters extends IrsBaseVDSCommandParameters {
     private String pattern;
     private boolean caseSensitive;
 
-    public GetFileStatsParameters() {}
+    public GetFileStatsParameters() { }
 
     public GetFileStatsParameters(Guid spUUID, Guid sdUUID, String pattern, boolean caseSensitive) {
         super(spUUID);
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVolumeInfoVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVolumeInfoVDSCommandParameters.java
index 71494aab3ab..32879c468f9 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVolumeInfoVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVolumeInfoVDSCommandParameters.java
@@ -23,7 +23,7 @@ public GetVolumeInfoVDSCommandParameters(Guid storagePoolId, Guid storageDomainI
         this(null, storagePoolId, storageDomainId, imageGroupId, imageId);
     }
 
-    public GetVolumeInfoVDSCommandParameters() {}
+    public GetVolumeInfoVDSCommandParameters() { }
 
     public Guid getStoragePoolId() {
         return storagePoolId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageActionsVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageActionsVDSCommandParameters.java
index 58e828566d5..ee3dc5571db 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageActionsVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageActionsVDSCommandParameters.java
@@ -16,7 +16,7 @@ public ImageActionsVDSCommandParameters(Guid vdsId, Guid spId, Guid sdId, Guid i
         setImageId(imgId);
     }
 
-    public ImageActionsVDSCommandParameters() {}
+    public ImageActionsVDSCommandParameters() { }
 
     public void setStoragePoolId(Guid storagePoolId) {
         this.storagePoolId = storagePoolId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageHttpAccessVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageHttpAccessVDSCommandParameters.java
index 9a859aa0bc4..6bba855285e 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageHttpAccessVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageHttpAccessVDSCommandParameters.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class ImageHttpAccessVDSCommandParameters extends VdsIdVDSCommandParametersBase{
+public class ImageHttpAccessVDSCommandParameters extends VdsIdVDSCommandParametersBase {
     private Guid storagePoolId;
     private Guid storageDomainId;
     private Guid imageGroupId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageTicketVDSCommandParametersBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageTicketVDSCommandParametersBase.java
index ca355f4fa56..15d2ebd2687 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageTicketVDSCommandParametersBase.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ImageTicketVDSCommandParametersBase.java
@@ -13,7 +13,7 @@ public ImageTicketVDSCommandParametersBase(Guid vdsId, Guid ticketId, Long timeo
         this.timeout = timeout;
     }
 
-    public ImageTicketVDSCommandParametersBase() {}
+    public ImageTicketVDSCommandParametersBase() { }
 
     public Guid getTicketId() {
         return ticketId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
index 8d457c890ae..3d6e7f526f5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
@@ -15,7 +15,7 @@ public class MergeVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
     private Guid topImageId;
     private long bandwidth;
 
-    private MergeVDSCommandParameters() {}
+    private MergeVDSCommandParameters() { }
 
     public MergeVDSCommandParameters(
             Guid vdsId,
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/PrepareImageVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/PrepareImageVDSCommandParameters.java
index 22d631e07fe..99cd94789e4 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/PrepareImageVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/PrepareImageVDSCommandParameters.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class PrepareImageVDSCommandParameters extends ImageActionsVDSCommandParameters{
+public class PrepareImageVDSCommandParameters extends ImageActionsVDSCommandParameters {
     private boolean allowIllegal;
 
     public PrepareImageVDSCommandParameters(Guid vdsId, Guid spId, Guid sdId, Guid imgGroupId,
@@ -10,7 +10,7 @@ public PrepareImageVDSCommandParameters(Guid vdsId, Guid spId, Guid sdId, Guid i
         super(vdsId, spId, sdId, imgGroupId, imgId);
         setAllowIllegal(allowIllegal);
     }
-    public PrepareImageVDSCommandParameters() {};
+    public PrepareImageVDSCommandParameters() { };
 
     public void setAllowIllegal(boolean allowIllegal) {
         this.allowIllegal = allowIllegal;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshVolumeVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshVolumeVDSCommandParameters.java
index 0e809e52045..3e218d7e015 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshVolumeVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RefreshVolumeVDSCommandParameters.java
@@ -17,7 +17,7 @@ public RefreshVolumeVDSCommandParameters(Guid vdsId, Guid storagePoolId, Guid st
         this.imageId = imageId;
     }
 
-    public RefreshVolumeVDSCommandParameters() {}
+    public RefreshVolumeVDSCommandParameters() { }
 
     public Guid getStoragePoolId() {
         return storagePoolId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveImageTicketVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveImageTicketVDSCommandParameters.java
index c9af539d532..ec804799a39 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveImageTicketVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveImageTicketVDSCommandParameters.java
@@ -7,5 +7,5 @@ public RemoveImageTicketVDSCommandParameters(Guid vdsId, Guid ticketId) {
         super(vdsId, ticketId, null);
     }
 
-    public RemoveImageTicketVDSCommandParameters() {}
+    public RemoveImageTicketVDSCommandParameters() { }
 }
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMGetVolumeInfoVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMGetVolumeInfoVDSCommandParameters.java
index 7b3c19cdd26..996f502a593 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMGetVolumeInfoVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMGetVolumeInfoVDSCommandParameters.java
@@ -12,7 +12,7 @@ public SPMGetVolumeInfoVDSCommandParameters(Guid storagePoolId, Guid storageDoma
         this.imageId = imageId;
     }
 
-    public SPMGetVolumeInfoVDSCommandParameters() {}
+    public SPMGetVolumeInfoVDSCommandParameters() { }
 
     public Guid getImageId() {
         return imageId;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java
index ec2025ea675..1152338458e 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeDescriptionVDSCommandParameters.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.compat.Guid;
 
-public class SetVolumeDescriptionVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase{
+public class SetVolumeDescriptionVDSCommandParameters extends AllStorageAndImageIdVDSCommandParametersBase {
     private String description;
 
     public SetVolumeDescriptionVDSCommandParameters(Guid storagePoolId, Guid storageDomainId, Guid imageGroupId, Guid imageId, String description) {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeLegalityVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeLegalityVDSCommandParameters.java
index bbcf21c3e8a..5045852c2a2 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeLegalityVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVolumeLegalityVDSCommandParameters.java
@@ -10,7 +10,7 @@ public SetVolumeLegalityVDSCommandParameters(Guid spId, Guid sdId, Guid imgGroup
         super(spId, sdId, imgGroupId, imgId);
         setLegality(legal);
     }
-    public SetVolumeLegalityVDSCommandParameters() {};
+    public SetVolumeLegalityVDSCommandParameters() { };
 
     public void setLegality(boolean legal) {
         this.legal = legal;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
index 6f912d706b4..ff5e27bfce5 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
@@ -3,7 +3,7 @@
 import org.ovirt.engine.core.common.businessentities.VmDynamic;
 import org.ovirt.engine.core.common.utils.ToStringBuilder;
 
-public class UpdateVmDynamicDataVDSCommandParameters extends VdsAndVmIDVDSParametersBase{
+public class UpdateVmDynamicDataVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
     private VmDynamic privateVmDynamic;
 
     public VmDynamic getVmDynamic() {
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
index b6ba33558a7..b1ec653eaa3 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
@@ -12,7 +12,7 @@ public UpgradeStoragePoolVDSCommandParameters(Guid storagePoolId, StorageFormatT
         setCompatibilityVersion(compatibilityVersion.getValue());
     }
 
-    public UpgradeStoragePoolVDSCommandParameters() {}
+    public UpgradeStoragePoolVDSCommandParameters() { }
 
     public String getCompatibilityVersion() {
         return compatibilityVersion;
diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VolumeBitmapVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VolumeBitmapVDSCommandParameters.java
index 498ad71f357..355f95258bf 100644
--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VolumeBitmapVDSCommandParameters.java
+++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VolumeBitmapVDSCommandParameters.java
@@ -8,7 +8,7 @@ public class VolumeBitmapVDSCommandParameters extends StorageJobVdsCommandParame
     private Integer generation;
     private String bitmapName;
 
-    public VolumeBitmapVDSCommandParameters() {}
+    public VolumeBitmapVDSCommandParameters() { }
 
     public VolumeBitmapVDSCommandParameters(Guid storageDomainId, Guid vdsId, Guid jobId, Guid imageGroupId,
                                             Guid imageId, Integer generation, String bitmapName) {
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
index 05cd7f657b0..e78c94aa543 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/StorageFormatTypeTest.java
@@ -8,7 +8,7 @@
 public class StorageFormatTypeTest {
     @Test
     public void forValue() {
-        for(String val : new String[]{"0", "2", "3"}) {
+        for (String val : new String[]{"0", "2", "3"}) {
             assertNotNull(StorageFormatType.forValue(val));
         }
         assertNull(StorageFormatType.forValue(null));
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/network/BondModeTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/network/BondModeTest.java
index cb702217ce3..cdf40a72010 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/network/BondModeTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/businessentities/network/BondModeTest.java
@@ -10,7 +10,7 @@ public class BondModeTest {
     @Test
     public void testParseBondMode() {
 
-        for (BondMode bondMode : BondMode.values()){
+        for (BondMode bondMode : BondMode.values()) {
             assertEquals(bondMode, BondMode.parseBondMode("mode=" + bondMode.getValue()));
             assertEquals(bondMode, BondMode.parseBondMode("mode=" + bondMode.getStringValue()));
             assertEquals(bondMode, BondMode.parseBondMode("  mode=" + bondMode.getValue() + "   "));
@@ -32,7 +32,7 @@ public void testParseBondMode() {
 
     @Test
     public void testGetBondMode() {
-        for (BondMode bondMode : BondMode.values()){
+        for (BondMode bondMode : BondMode.values()) {
             assertEquals(bondMode, BondMode.getBondMode(bondMode.getValue()));
             assertEquals(bondMode, BondMode.getBondMode(bondMode.getStringValue()));
             assertNull(BondMode.getBondMode("mode=" + bondMode.getValue()));
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/console/ConsoleOptionsTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/console/ConsoleOptionsTest.java
index 9f2bb257ad4..64fc99724d5 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/console/ConsoleOptionsTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/console/ConsoleOptionsTest.java
@@ -9,15 +9,15 @@ public class ConsoleOptionsTest {
     @Test
     public void testAdjustLegacySecureChannels() {
         String legacyChannels = "smain,sdisplay,sinputs,scursor,splayback,srecord,ssmartcard,susbredir"; //$NON-NLS-1$
-        String correctChannels = "main,display,inputs,cursor,playback,record,smartcard,usbredir";//$NON-NLS-1$
+        String correctChannels = "main,display,inputs,cursor,playback,record,smartcard,usbredir"; //$NON-NLS-1$
 
         assertEquals(correctChannels, ConsoleOptions.adjustLegacySecureChannels(legacyChannels));
     }
 
     @Test
     public void testAdjustLegacySecureChannelsWithEmptyChannels() {
-        String legacyChannels = "";//$NON-NLS-1$
-        String correctChannels = "";//$NON-NLS-1$
+        String legacyChannels = ""; //$NON-NLS-1$
+        String correctChannels = ""; //$NON-NLS-1$
         assertEquals(correctChannels, ConsoleOptions.adjustLegacySecureChannels(legacyChannels));
     }
 
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/CidrAnnotationTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/CidrAnnotationTest.java
index fac91da7dbf..90d57fec2a0 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/CidrAnnotationTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/CidrAnnotationTest.java
@@ -35,7 +35,7 @@ public void checkCidrFormatAnnotation(String cidr,
         ExternalSubnet container = createContainer(cidr, ipVersion);
         Set<ConstraintViolation<ExternalSubnet>> result = validator.validate(container);
         if (!validNetworkAddressExpectedResult && validCidrFormatExpectedResult) {
-            assertEquals(EngineMessage.CIDR_NOT_NETWORK_ADDRESS.name(),  result.iterator().next().getMessage(),
+            assertEquals(EngineMessage.CIDR_NOT_NETWORK_ADDRESS.name(), result.iterator().next().getMessage(),
                     "Failed to validate CIDR's error format: " + container.getCidr());
         } else if (!validCidrFormatExpectedResult) {
             assertEquals(EngineMessage.BAD_CIDR_FORMAT.name(), result.iterator().next().getMessage(),
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/IPAddressConverterTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/IPAddressConverterTest.java
index 80672d0f1f1..69a8244bb53 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/IPAddressConverterTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/IPAddressConverterTest.java
@@ -60,7 +60,7 @@ private <T> void runTest(String errorMessage, T expected, T actual) {
     }
 
     @Test
-    public void checkConvertPrefixToIpv4Address(){
+    public void checkConvertPrefixToIpv4Address() {
         runConvertPrefixToIpv4Address("255.255.255.255", "32");
         runConvertPrefixToIpv4Address("0.0.0.0", "0");
         runConvertPrefixToIpv4Address("255.255.255.254", "31");
@@ -68,7 +68,7 @@ public void checkConvertPrefixToIpv4Address(){
         runConvertPrefixToIpv4Address("254.0.0.0", "7");
     }
 
-    private void runConvertPrefixToIpv4Address(String expectedIpv4Address, String prefix){
+    private void runConvertPrefixToIpv4Address(String expectedIpv4Address, String prefix) {
         String errorMessage =
                 String.format("Fail to convert prefix %s to IPv4 address: %s.", prefix, expectedIpv4Address);
         String actualIpv4Address = underTest.convertPrefixToIPv4Netmask(prefix);
@@ -86,7 +86,7 @@ public void checkInvalidStringIpv4AddressConversion() {
     }
 
     @Test
-    public void checkConvertPrefixWithTrailingSlashToIpv4Address(){
+    public void checkConvertPrefixWithTrailingSlashToIpv4Address() {
         runConvertPrefixToIpv4Address("255.255.0.0", "/16");
     }
 
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MathUtilsTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MathUtilsTest.java
index f22c032f8af..d2badc7de48 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MathUtilsTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/MathUtilsTest.java
@@ -10,10 +10,10 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 public class MathUtilsTest {
-    private static long[] args1 = {5*3, 7*3, 3, 0, 10};
-    private static long[] args2 = {7*3, 5*3, 5, 10, 0};
+    private static long[] args1 = {5 * 3, 7 * 3, 3, 0, 10};
+    private static long[] args2 = {7 * 3, 5 * 3, 5, 10, 0};
     private static long[] gcds = {3, 3, 1, 10, 10};
-    private static long[] lcms = {5*7*3, 5*7*3, 3*5, 0, 0};
+    private static long[] lcms = {5 * 7 * 3, 5 * 7 * 3, 3 * 5, 0, 0};
 
     @ParameterizedTest
     @MethodSource
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaPinningHelperTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaPinningHelperTest.java
index 5f0c5f9cd1a..a09bab27ea6 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaPinningHelperTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaPinningHelperTest.java
@@ -245,7 +245,7 @@ private VDS createVDS() {
         return host;
     }
      private VdsNumaNode createHostNumaNodeWithCpus(int index, long freeMem, List<Integer> cpus) {
-        VdsNumaNode vdsNumaNode= createHostNumaNode(index, freeMem);
+        VdsNumaNode vdsNumaNode = createHostNumaNode(index, freeMem);
         vdsNumaNode.setCpuIds(cpus);
         return vdsNumaNode;
      }
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaUtilsTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaUtilsTest.java
index ab2d1911b39..acf4ddf8727 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaUtilsTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/NumaUtilsTest.java
@@ -31,7 +31,7 @@ public void testNumaConfigurationSingle() {
         NumaUtils.setNumaListConfiguration(nodeList, 1024, Optional.empty(), 2, NumaTuneMode.STRICT, 1, false);
 
         assertThat(nodeList.get(0).getCpuIds().size(), is(1));
-        assertThat(nodeList.get(0).getMemTotal(), is((long)512));
+        assertThat(nodeList.get(0).getMemTotal(), is((long) 512));
         assertThat(nodeList.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 
@@ -40,7 +40,7 @@ public void testNumaConfigurationDual() {
         NumaUtils.setNumaListConfiguration(nodeList, 1024, Optional.empty(), 4, NumaTuneMode.STRICT, 1, false);
 
         assertThat(nodeList.get(0).getCpuIds().size(), is(2));
-        assertThat(nodeList.get(0).getMemTotal(), is((long)512));
+        assertThat(nodeList.get(0).getMemTotal(), is((long) 512));
         assertThat(nodeList.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 
@@ -49,7 +49,7 @@ public void testNumaConfigurationHugePages() {
         NumaUtils.setNumaListConfiguration(nodeList, 1024, Optional.of(1048576), 2, NumaTuneMode.STRICT, 1, false);
 
         assertThat(nodeList.get(0).getCpuIds().size(), is(1));
-        assertThat(nodeList.get(0).getMemTotal(), is((long)1024));
+        assertThat(nodeList.get(0).getMemTotal(), is((long) 1024));
         assertThat(nodeList.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 
@@ -58,7 +58,7 @@ public void testNumaConfigurationHugePagesBigMemory() {
         NumaUtils.setNumaListConfiguration(nodeList, 8192, Optional.of(1048576), 2, NumaTuneMode.STRICT, 1, false);
 
         assertThat(nodeList.get(0).getCpuIds().size(), is(1));
-        assertThat(nodeList.get(0).getMemTotal(), is((long)4096));
+        assertThat(nodeList.get(0).getMemTotal(), is((long) 4096));
         assertThat(nodeList.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 
@@ -77,7 +77,7 @@ public void testNumaConfigurationUnFit() {
         assertThat(nodes.get(1).getCpuIds().size(), is(12));
         assertThat(nodes.get(2).getCpuIds().size(), is(12));
         assertThat(nodes.get(3).getCpuIds().size(), is(10));
-        assertThat(nodes.get(0).getMemTotal(), is((long)256));
+        assertThat(nodes.get(0).getMemTotal(), is((long) 256));
         assertThat(nodes.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 
@@ -96,8 +96,8 @@ public void testNumaConfigurationSplitMemory() {
         assertThat(nodes.get(1).getCpuIds().size(), is(12));
         assertThat(nodes.get(2).getCpuIds().size(), is(12));
         assertThat(nodes.get(3).getCpuIds().size(), is(10));
-        assertThat(nodes.get(0).getMemTotal(), is((long)12 * 32));
-        assertThat(nodes.get(3).getMemTotal(), is((long)10 * 32));
+        assertThat(nodes.get(0).getMemTotal(), is((long) 12 * 32));
+        assertThat(nodes.get(3).getMemTotal(), is((long) 10 * 32));
         assertThat(nodes.get(0).getNumaTuneMode(), is(NumaTuneMode.STRICT));
     }
 }
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
index d0860a97496..410289fae75 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SizeConverterTest.java
@@ -56,21 +56,21 @@ public void testConvertMegaBytesToTB() {
     @Test
     public void testConvertTiBToYiB() {
         double tib = 100 * Math.pow(1024, 4);
-        int yib = SizeConverter.convert((long)tib, SizeUnit.TiB, SizeUnit.YiB).intValue();
+        int yib = SizeConverter.convert((long) tib, SizeUnit.TiB, SizeUnit.YiB).intValue();
         assertEquals(100, yib);
     }
 
     @Test
     public void testConvertMiBToEiB() {
         double mib = 15 * Math.pow(1024, 4);
-        int eib = SizeConverter.convert((long)mib, SizeUnit.MiB, SizeUnit.EiB).intValue();
+        int eib = SizeConverter.convert((long) mib, SizeUnit.MiB, SizeUnit.EiB).intValue();
         assertEquals(15, eib);
     }
 
     @Test
     public void testConvertPiBToZiB() {
         double pib = 15 * Math.pow(1024, 2);
-        int zib = SizeConverter.convert((long)pib, SizeUnit.PiB, SizeUnit.ZiB).intValue();
+        int zib = SizeConverter.convert((long) pib, SizeUnit.PiB, SizeUnit.ZiB).intValue();
         assertEquals(15, zib);
     }
 
diff --git a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SubnetUtilsTest.java b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SubnetUtilsTest.java
index a53d5e14af0..edfd7cf830f 100644
--- a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SubnetUtilsTest.java
+++ b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/utils/SubnetUtilsTest.java
@@ -39,12 +39,12 @@ public void setup() {
     }
 
     @Test
-    public void checkEqualNetmaskRepresentation(){
+    public void checkEqualNetmaskRepresentation() {
         assertTrue(underTest.equalSubnet("255.255.255.255", "255.255.255.255"));
     }
 
     @Test
-    public void checkEqualPrefixRepresentation(){
+    public void checkEqualPrefixRepresentation() {
         assertTrue(underTest.equalSubnet("8", "8"));
     }
 
diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
index f14a293b09c..2361b590752 100644
--- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
+++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/TimeSpan.java
@@ -10,7 +10,7 @@ public class TimeSpan implements Comparable<TimeSpan>, Serializable {
     public static final int MS_PER_SECOND = 1000;
     public static final int MS_PER_MINUTE = 60 * 1000;
     public static final int MS_PER_HOUR = 60 * 60 * 1000;
-    public static final  int MS_PER_DAY = 24 * 60 * 60 * 1000;
+    public static final int MS_PER_DAY = 24 * 60 * 60 * 1000;
 
     public int Days;
     public int Hours;
@@ -42,9 +42,9 @@ public TimeSpan(int days, int hours, int minutes, int seconds) {
     public TimeSpan(int days, int hours, int minutes, int seconds, int milliseconds) {
         TotalMilliseconds = milliseconds;
         TotalMilliseconds += seconds * MS_PER_SECOND;
-        TotalMilliseconds += (long)minutes * (long)MS_PER_MINUTE;
-        TotalMilliseconds += (long)hours * (long)MS_PER_HOUR;
-        TotalMilliseconds += (long)days * (long)MS_PER_DAY;
+        TotalMilliseconds += (long) minutes * (long) MS_PER_MINUTE;
+        TotalMilliseconds += (long) hours * (long) MS_PER_HOUR;
+        TotalMilliseconds += (long) days * (long) MS_PER_DAY;
         computeProperties();
     }
 
diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
index 8601fc435be..85b90d07d7e 100644
--- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
+++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/backendcompat/TypeCompat.java
@@ -47,7 +47,7 @@ public static void getPropertyValues(Object obj, Set<String> properties, Map<Str
                 if (properties.contains(propertyName)) {
                     Object value = null;
                     hitCount++;
-                    if(!values.containsKey(propertyName))  {
+                    if (!values.containsKey(propertyName)) {
                         try {
                             value = pd.getReadMethod().invoke(obj);
                             String stringValue = value != null ? value.toString() : null;
diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
index 0b44212b649..c9bff9d4856 100644
--- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
+++ b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/TimeSpanTest.java
@@ -67,7 +67,7 @@ public void testParsing() {
 
     @Test
     public void testInvalidParse() {
-        assertThrows(IllegalArgumentException.class, ()  -> TimeSpan.parse("1.02.03"));
+        assertThrows(IllegalArgumentException.class, () -> TimeSpan.parse("1.02.03"));
     }
 
     @Test
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java
index 628cb31fb57..9f5720aecad 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/BatchProcedureExecutionConnectionCallback.java
@@ -216,7 +216,7 @@ private void mapParams(PreparedStatement stmt,
         log.debug("Mapped params: {}", values.keySet());
     }
 
-    private  static class ProcData {
+    private static class ProcData {
         private String colName;
         private int ordinal;
         private int dataType;
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/SimpleJdbcCallsHandler.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/SimpleJdbcCallsHandler.java
index 5cbc4d23297..cfbbd2299bd 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/SimpleJdbcCallsHandler.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/SimpleJdbcCallsHandler.java
@@ -177,7 +177,7 @@ protected <T> SimpleJdbcCall getCall(String procedureName, CallCreator callCreat
         if (call == null) {
             call = callCreator.createCall();
             if (outParamsMap.containsKey(procedureName)) {
-                Pair<String, Integer>  pair = outParamsMap.get(procedureName);
+                Pair<String, Integer> pair = outParamsMap.get(procedureName);
                 call.declareParameters(new SqlOutParameter("v_" + pair.getFirst(), pair.getSecond()));
             }
             call.compile();
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
index fc85214b3c2..420732123a2 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogDirector.java
@@ -25,7 +25,7 @@ public void log(AuditLogable auditLogable, AuditLogType logType) {
         log(auditLogable, logType, "", false);
     }
 
-    public void log(AuditLogable auditLogable, AuditLogType logType, String message){
+    public void log(AuditLogable auditLogable, AuditLogType logType, String message) {
         log(auditLogable, logType, message, false);
     }
 
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
index 4a0b4f785c0..57bc0159ac9 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/generic/DBConfigUtils.java
@@ -68,13 +68,13 @@ private static Object parseValue(String value, String name, Class<?> fieldType)
                  * - if it is enclosed between brackets, then it is handled as json object and a map is returned
                  * - otherwise it is handled as a string, the client code handles parsing it
                  */
-                if(StringUtils.startsWith(value, "{") && StringUtils.endsWith(value, "}")) {
+                if (StringUtils.startsWith(value, "{") && StringUtils.endsWith(value, "}")) {
                     return new JsonObjectDeserializer().deserialize(value, HashMap.class);
                 } else {
                     return value;
                 }
             } else if (fieldType.isEnum()) {
-                return Enum.valueOf((Class<Enum>)fieldType, value.toUpperCase());
+                return Enum.valueOf((Class<Enum>) fieldType, value.toUpperCase());
             } else {
                 return value;
             }
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDaoImpl.java
index 80bf924c381..21e3278ad23 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/AuditLogDaoImpl.java
@@ -153,7 +153,7 @@ public List<AuditLog> getByVolumeIdAndType(Guid volumeId, int type) {
     }
 
     @Override
-    public void removeAllofTypeForBrick(Guid brickId, int logType){
+    public void removeAllofTypeForBrick(Guid brickId, int logType) {
         MapSqlParameterSource parameterSource =
                 getCustomMapSqlParameterSource()
                         .addValue("brick_id", brickId)
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDao.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDao.java
index bea1644bb4d..99cddf567ba 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDao.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/BusinessEntitySnapshotDao.java
@@ -22,7 +22,7 @@ public interface BusinessEntitySnapshotDao extends Dao {
      * Removes all snapshots for a given command
      * @param commandID the command ID to remove  snapshots for
      */
-    public void removeAllForCommandId(Guid   commandID);
+    public void removeAllForCommandId(Guid commandID);
 
     /**
      * Saves a new snapshot
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/HostDeviceDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/HostDeviceDaoImpl.java
index b32c0c6abf6..06dc641eb69 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/HostDeviceDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/HostDeviceDaoImpl.java
@@ -147,7 +147,7 @@ public void cleanDownVms() {
 
     private abstract static class BaseHostDeviceRowMapper<T extends HostDevice> implements RowMapper<T> {
 
-        protected void map(ResultSet rs, HostDevice device) throws SQLException{
+        protected void map(ResultSet rs, HostDevice device) throws SQLException {
             device.setHostId(getGuid(rs, "host_id"));
             device.setDeviceName(rs.getString("device_name"));
             device.setParentDeviceName(rs.getString("parent_device_name"));
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LabelDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LabelDaoImpl.java
index 5674a365bf4..28755bf8951 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LabelDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/LabelDaoImpl.java
@@ -22,10 +22,10 @@
 @Singleton
 public class LabelDaoImpl extends BaseDao implements LabelDao {
     private static final RowMapper<Label> labelRowMapper = (rs, rowNum) -> {
-        String[] rawUuids = (String[])rs.getArray("vm_ids").getArray();
+        String[] rawUuids = (String[]) rs.getArray("vm_ids").getArray();
         List<String> vms = Arrays.asList(rawUuids);
 
-        rawUuids = (String[])rs.getArray("vds_ids").getArray();
+        rawUuids = (String[]) rs.getArray("vds_ids").getArray();
         List<String> hosts = Arrays.asList(rawUuids);
 
         return new LabelBuilder()
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDaoImpl.java
index aebb3a54808..6ac6422770a 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/QuotaDaoImpl.java
@@ -214,7 +214,7 @@ public List<Quota> getAllQuotaIncludingConsumption() {
         // get thin quota (only basic quota meta data)
         List<Quota> allThinQuota = getCallsHandler().executeReadList("getAllThinQuota", getQuotaMetaDataFromResultSet(), parameterSource);
 
-        if (!allThinQuota.isEmpty()){
+        if (!allThinQuota.isEmpty()) {
             Map<Guid, Quota> allQuotaMap = new HashMap<>();
             for (Quota quota : allThinQuota) {
                 allQuotaMap.put(quota.getId(), quota);
@@ -546,7 +546,7 @@ public List<Quota> getAllWithQuery(String query) {
     }
 
     @Override
-    public boolean isQuotaInUse(Quota quota){
+    public boolean isQuotaInUse(Quota quota) {
 
         MapSqlParameterSource parameterSource = getCustomMapSqlParameterSource()
                 .addValue("quota_id", quota.getId());
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDaoImpl.java
index 8a94515021f..7d477ba8ce1 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RepoFileMetaDataDaoImpl.java
@@ -67,7 +67,7 @@ public List<RepoImage> getRepoListForStorageDomain(Guid storageDomainId,
         return getCallsHandler().executeReadList("GetRepo_files_by_storage_domain", repoImageMapper, parameterSource);
     }
 
-    static final RowMapper<RepoImage> repoImageMapper= (rs, rowNum) -> {
+    static final RowMapper<RepoImage> repoImageMapper = (rs, rowNum) -> {
         RepoImage entity = new RepoImage();
         entity.setRepoDomainId(getGuidDefaultEmpty(rs, "repo_domain_id"));
         entity.setRepoImageId(rs.getString("repo_image_id"));
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleGroupMapDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleGroupMapDaoImpl.java
index 646b046e0b8..d0d8b38de42 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleGroupMapDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleGroupMapDaoImpl.java
@@ -17,7 +17,7 @@
 @Named
 @Singleton
 public class RoleGroupMapDaoImpl extends BaseDao implements RoleGroupMapDao {
-    private static final RowMapper<RoleGroupMap> roleGroupMapRowMapper =(rs, rowNum) ->
+    private static final RowMapper<RoleGroupMap> roleGroupMapRowMapper = (rs, rowNum) ->
         new RoleGroupMap(ActionGroup.forValue(rs.getInt("action_group_id")), getGuidDefaultEmpty(rs, "role_id"));
 
     @Override
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDaoImpl.java
index 960fbce904c..4e6e18e8841 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainDynamicDaoImpl.java
@@ -13,7 +13,7 @@
 
 @Named
 @Singleton
-public class StorageDomainDynamicDaoImpl extends BaseDao implements StorageDomainDynamicDao{
+public class StorageDomainDynamicDaoImpl extends BaseDao implements StorageDomainDynamicDao {
 
     private static final RowMapper<StorageDomainDynamic> storageDomainDynamicRowMapper = (rs, rowNum) -> {
         StorageDomainDynamic entity = new StorageDomainDynamic();
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainOvfInfoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainOvfInfoImpl.java
index f3a3b2130a4..5c8265c5cf3 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainOvfInfoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/StorageDomainOvfInfoImpl.java
@@ -18,7 +18,7 @@
 
 @Named
 @Singleton
-public class StorageDomainOvfInfoImpl extends DefaultGenericDao<StorageDomainOvfInfo, Guid> implements StorageDomainOvfInfoDao{
+public class StorageDomainOvfInfoImpl extends DefaultGenericDao<StorageDomainOvfInfo, Guid> implements StorageDomainOvfInfoDao {
 
     public StorageDomainOvfInfoImpl() {
         super("StorageDomainOvfInfo");
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDaoImpl.java
index 9cb495c7d8a..0677466cf0c 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDaoImpl.java
@@ -242,7 +242,7 @@ public List<VDS> getAllForStoragePoolAndStatuses(Guid storagePool, Set<VDSStatus
                 getCustomMapSqlParameterSource()
                         .addValue("storage_pool_id", storagePool)
                         .addValue("statuses",
-                                statuses == null?
+                                statuses == null ?
                                         null :
                                         statuses.stream()
                                                 .map(VDSStatus::getValue)
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsKdumpStatusDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsKdumpStatusDaoImpl.java
index bf9ff8c39d7..aa5e8dc730e 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsKdumpStatusDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsKdumpStatusDaoImpl.java
@@ -12,7 +12,7 @@
 
 @Named
 @Singleton
-public class VdsKdumpStatusDaoImpl  extends BaseDao implements VdsKdumpStatusDao {
+public class VdsKdumpStatusDaoImpl extends BaseDao implements VdsKdumpStatusDao {
     private static RowMapper<VdsKdumpStatus> vdsKdumpStatusMapper = (rs, rowNum) -> {
         VdsKdumpStatus entity = new VdsKdumpStatus();
         entity.setVdsId(Guid.createGuidFromStringDefaultEmpty(rs.getString("vds_id")));
@@ -22,7 +22,7 @@ public class VdsKdumpStatusDaoImpl  extends BaseDao implements VdsKdumpStatusDao
     };
 
     @Override
-    public void update(VdsKdumpStatus vdsKdumpStatus){
+    public void update(VdsKdumpStatus vdsKdumpStatus) {
         getCallsHandler().executeModification(
                 "UpsertKdumpStatus",
                 getCustomMapSqlParameterSource()
@@ -40,7 +40,7 @@ public void update(VdsKdumpStatus vdsKdumpStatus){
      * @param vdsKdumpStatus
      *            updated kdump status
      */
-    public void updateForIp(String ip, VdsKdumpStatus vdsKdumpStatus){
+    public void updateForIp(String ip, VdsKdumpStatus vdsKdumpStatus) {
         getCallsHandler().executeModification(
                 "UpsertKdumpStatusForIp",
                 getCustomMapSqlParameterSource()
@@ -70,7 +70,7 @@ public VdsKdumpStatus get(Guid vdsId) {
     }
 
     @Override
-    public List<VdsKdumpStatus> getAllUnfinishedVdsKdumpStatus(){
+    public List<VdsKdumpStatus> getAllUnfinishedVdsKdumpStatus() {
         return getCallsHandler().executeReadList(
                 "GetAllUnfinishedVdsKdumpStatus",
                 vdsKdumpStatusMapper,
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDaoImpl.java
index c5d8b46bb83..69d67561360 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsSpmIdMapDaoImpl.java
@@ -15,7 +15,7 @@
  */
 @Named
 @Singleton
-public class VdsSpmIdMapDaoImpl extends BaseDao implements VdsSpmIdMapDao{
+public class VdsSpmIdMapDaoImpl extends BaseDao implements VdsSpmIdMapDao {
 
 
     @Override
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDaoImpl.java
index ccf464a61e2..3776c9ab93d 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmDynamicDaoImpl.java
@@ -241,7 +241,7 @@ protected MapSqlParameterSource createFullParametersMapper(VmDynamic vm) {
     private static String toGuestContainersString(VmDynamic vm) {
         try {
             return JSON_MAPPER.writeValueAsString(vm.getGuestContainers());
-        } catch(Exception e) {
+        } catch (Exception e) {
             return "[]";
         }
     }
@@ -249,8 +249,8 @@ private static String toGuestContainersString(VmDynamic vm) {
     @SuppressWarnings("unchecked")
     private static List<GuestContainer> fromContainersString(String s) {
         try {
-            return (List<GuestContainer>) JSON_MAPPER.readValue(s, new TypeReference<List<GuestContainer>>() {});
-        } catch(Exception e) {
+            return (List<GuestContainer>) JSON_MAPPER.readValue(s, new TypeReference<List<GuestContainer>>() { });
+        } catch (Exception e) {
             return new ArrayList<>();
         }
     }
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmGuestAgentInterfaceDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmGuestAgentInterfaceDaoImpl.java
index 9b4a5589602..85bcbd7ae76 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmGuestAgentInterfaceDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmGuestAgentInterfaceDaoImpl.java
@@ -58,7 +58,7 @@ private static String getIpAddressesAsString(List<String> ipAddresses) {
         return StringUtils.join(ipAddresses, DELIMITER);
     }
 
-    protected static final RowMapper<VmGuestAgentInterface>  vmGuestAgentInterfaceRowMapper = (rs, rowNum) -> {
+    protected static final RowMapper<VmGuestAgentInterface> vmGuestAgentInterfaceRowMapper = (rs, rowNum) -> {
         VmGuestAgentInterface vmGuestAgentInterface = new VmGuestAgentInterface();
         vmGuestAgentInterface.setVmId(getGuidDefaultEmpty(rs, "vm_id"));
         vmGuestAgentInterface.setInterfaceName(rs.getString("interface_name"));
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNumaNodeDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNumaNodeDaoImpl.java
index cd2bf338b73..fae21bbf4fe 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNumaNodeDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VmNumaNodeDaoImpl.java
@@ -120,7 +120,7 @@ private Map<Guid, List<Integer>> getAllVmNumaNodePinInfo() {
         return entity;
     };
 
-    private static final RowMapper<VmNumaNode> vmNumaNodeCpuRowMapper =  (rs, rowNum) -> {
+    private static final RowMapper<VmNumaNode> vmNumaNodeCpuRowMapper = (rs, rowNum) -> {
         VmNumaNode entity = vmNumaNodeRowMapper.mapRow(rs, rowNum);
         // We need to copy the array to a normal ArrayList to be GWT compatible. GWT has deserialization
         // problems with the Arrays.asList implementation returned by getArray() (Java8 related?)
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterDBUtils.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterDBUtils.java
index b81a5bb3527..70a5e601d08 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterDBUtils.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterDBUtils.java
@@ -150,9 +150,9 @@ public String getHostNameOrIP(Guid glusterHostUuid) {
         String hostName = null;
         if (glusterHostUuid != null) {
             GlusterServer glusterServer = glusterServerDao.getByGlusterServerUuid(glusterHostUuid);
-            if(glusterServer != null) {
+            if (glusterServer != null) {
                 VdsStatic vds = vdsStaticDao.get(glusterServer.getId());
-                if(vds != null) {
+                if (vds != null) {
                     hostName = vds.getHostName();
                 }
             }
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoImpl.java
index 15e2f53493a..bf11da74274 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterGeoRepDaoImpl.java
@@ -202,7 +202,7 @@ public List<GlusterGeoRepSessionConfiguration> getGeoRepSessionConfig(Guid sessi
 
     @Override
     public List<GlusterGeoRepSessionConfiguration> getGlusterGeoRepSessionUnSetConfig(Guid sessionId) {
-        ((GeoRepSessionConfigMasterRowMapper)geoRepSessionConfigMasterRowMapper).setSessionId(sessionId);
+        ((GeoRepSessionConfigMasterRowMapper) geoRepSessionConfigMasterRowMapper).setSessionId(sessionId);
         return getCallsHandler().executeReadList("GetGlusterGeoRepSessionUnSetConfig", geoRepSessionConfigMasterRowMapper, createIdParameterMapper(sessionId));
     }
 
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoImpl.java
index 0d03b25d626..2ac460ae273 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoImpl.java
@@ -319,7 +319,7 @@ private GlusterAsyncTask getAsyncTaskOfVolume(Guid volumeId) {
                 glusterAsyncTaskRowMapper,
                 createVolumeIdParams(volumeId));
 
-        if(glusterAsyncTasks != null && !glusterAsyncTasks.isEmpty()) {
+        if (glusterAsyncTasks != null && !glusterAsyncTasks.isEmpty()) {
             return glusterAsyncTasks.get(0);
         }
         return null;
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/DnsResolverConfigurationDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/DnsResolverConfigurationDaoImpl.java
index f4ec29908d7..b91d86b9379 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/DnsResolverConfigurationDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/DnsResolverConfigurationDaoImpl.java
@@ -57,7 +57,7 @@ private List<NameServer> getNameServersByDnsResolverConfigurationId(Guid dnsReso
     }
 
     private void saveNameServersByDnsResolverConfigurationId(Guid dnsResolverConfigurationId, List<NameServer> nameServers) {
-        for(int i = 0; i < nameServers.size(); i++) {
+        for (int i = 0; i < nameServers.size(); i++) {
             MapSqlParameterSource mapper = getCustomMapSqlParameterSource()
                     .addValue("dns_resolver_configuration_id", dnsResolverConfigurationId)
                     .addValue("address", nameServers.get(i).getAddress())
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoImpl.java
index 60c4f7f591f..033417c8845 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/InterfaceDaoImpl.java
@@ -152,7 +152,7 @@ private MapSqlParameterSource createInterfaceParametersMapper(VdsNetworkInterfac
                 .addValue("labels", SerializationFactory.getSerializer().serialize(nic.getLabels()))
                 .addValue("ad_partner_mac", nic.getAdPartnerMac())
                 .addValue("ad_aggregator_id", nic.getAdAggregatorId())
-                .addValue("bond_active_slave", nic.isBond() ? ((Bond)nic).getActiveSlave() : null)
+                .addValue("bond_active_slave", nic.isBond() ? ((Bond) nic).getActiveSlave() : null)
                 .addValue("reported_switch_type", nic.getReportedSwitchType() == null ? null : nic.getReportedSwitchType().getOptionValue());
     }
 
@@ -318,7 +318,7 @@ public Optional<VdsNetworkInterface> getActiveMigrationNetworkInterfaceForHost(G
 
     private final VdsNetworkInterfaceRowMapper interfaceWithQosMapper = new VdsNetworkInterfaceRowMapper(qosResultSetMapper);
 
-    private static final class VdsNetworkInterfaceRowMapper  implements RowMapper<VdsNetworkInterface> {
+    private static final class VdsNetworkInterfaceRowMapper implements RowMapper<VdsNetworkInterface> {
 
         private final RowMapper<HostNetworkQos> hostNetworkQosMapper;
 
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImpl.java
index c6beb399502..7edd621baeb 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImpl.java
@@ -62,7 +62,7 @@ public class NetworkAttachmentDaoImpl extends DefaultGenericDao<NetworkAttachmen
             qosResultSetMapper, dnsDaoRetriever
     );
 
-    private static final class NetworkAttachmentRowMapper  implements RowMapper<NetworkAttachment>  {
+    private static final class NetworkAttachmentRowMapper implements RowMapper<NetworkAttachment> {
 
         private final RowMapper<HostNetworkQos> hostNetworkQosMapper;
         private final RowMapper<DnsResolverConfiguration> dnsMapper;
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkQoSDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkQoSDaoImpl.java
index 330f4a3a3a0..aef98502d88 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkQoSDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkQoSDaoImpl.java
@@ -18,7 +18,7 @@ public class NetworkQoSDaoImpl extends QosBaseDaoImpl<NetworkQoS> implements Net
 
     protected final RowMapper<NetworkQoS> mapper = createEntityRowMapper();
 
-    public NetworkQoSDaoImpl(){
+    public NetworkQoSDaoImpl() {
         super(QosType.NETWORK);
     }
 
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoImpl.java
index 90154ea77af..d248f90993a 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoImpl.java
@@ -76,7 +76,7 @@ protected MapSqlParameterSource createFullParametersMapper(VmNicFilterParameter
                 .addValue("value", obj.getValue());
     }
 
-    public static class VmNicFilterParameterRowMapper implements RowMapper<VmNicFilterParameter>  {
+    public static class VmNicFilterParameterRowMapper implements RowMapper<VmNicFilterParameter> {
 
         private static final VmNicFilterParameterRowMapper INSTANCE = new VmNicFilterParameterRowMapper();
 
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/HostProviderBindingDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/HostProviderBindingDaoImpl.java
index 6acbbb309fb..a6cf649b0e7 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/HostProviderBindingDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/provider/HostProviderBindingDaoImpl.java
@@ -19,16 +19,16 @@ public String get(Guid vdsId, String pluginType) {
             .addValue("plugin_type", pluginType);
 
         return getCallsHandler().executeRead("GetHostProviderBinding",
-            (rs, nowNum) ->  rs.getString(1),
+            (rs, nowNum) -> rs.getString(1),
             parameterSource);
     }
 
     public void update(Guid vdsId, Map<String, Object> values) {
-        int entryCount = values!=null ? values.size() : 0;
+        int entryCount = values != null ? values.size() : 0;
         String[] pluginTypes = new String[entryCount];
         String[] bindingIds = new String[entryCount];
-        if (values!=null) {
-            int i=0;
+        if (values != null) {
+            int i = 0;
             for (Map.Entry<String, Object> pair: values.entrySet()) {
                 pluginTypes[i] = pair.getKey();
                 bindingIds[i] = (String) pair.getValue();
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/qos/QosBaseDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/qos/QosBaseDaoImpl.java
index 40133c98884..3959c002169 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/qos/QosBaseDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/qos/QosBaseDaoImpl.java
@@ -43,7 +43,7 @@ public List<T> getAll(Guid userID, boolean isFiltered) {
         }
         if (isFiltered) {
             switch (getQosType()) {
-                case  NETWORK:
+                case NETWORK:
                     return getCallsHandler().executeReadList("GetAllNetworkQos",
                         createEntityRowMapper(),
                         parameterSource);
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/AffinityGroupDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/AffinityGroupDaoImpl.java
index 1ac85b91416..000db1f3d86 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/AffinityGroupDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/AffinityGroupDaoImpl.java
@@ -100,7 +100,7 @@ public void setAffinityGroupsForHost(Guid hostId, List<Guid> groupIds) {
     }
 
     @Override
-    public void insertAffinityVm(Guid affinityId, Guid vmId){
+    public void insertAffinityVm(Guid affinityId, Guid vmId) {
         getCallsHandler().executeModification("InsertAffinityVm",
                 getCustomMapSqlParameterSource()
                         .addValue("affinity_group_id", affinityId)
@@ -108,7 +108,7 @@ public void insertAffinityVm(Guid affinityId, Guid vmId){
     }
 
     @Override
-    public void deleteAffinityVm(Guid affinityId, Guid vmId){
+    public void deleteAffinityVm(Guid affinityId, Guid vmId) {
         getCallsHandler().executeModification("DeleteAffinityVm",
                 getCustomMapSqlParameterSource()
                         .addValue("affinity_group_id", affinityId)
@@ -116,7 +116,7 @@ public void deleteAffinityVm(Guid affinityId, Guid vmId){
     }
 
     @Override
-    public void insertAffinityHost(Guid affinityId, Guid vdsId){
+    public void insertAffinityHost(Guid affinityId, Guid vdsId) {
         getCallsHandler().executeModification("InsertAffinityHost",
                 getCustomMapSqlParameterSource()
                         .addValue("affinity_group_id", affinityId)
diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
index f61291d8cab..a6528abb862 100644
--- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
+++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
@@ -109,7 +109,7 @@ private void fillClusterPolicy(Map<Guid, ClusterPolicy> map, List<ClusterPolicyU
                 }
             }
             if (policyUnitTypeMap.get(clusterPolicyUnit.getPolicyUnitId()) == PolicyUnitType.WEIGHT) {
-                if(clusterPolicy.getFunctions() == null){
+                if (clusterPolicy.getFunctions() == null) {
                     clusterPolicy.setFunctions(new ArrayList<>());
                 }
                 clusterPolicy.getFunctions().add(new Pair<>(clusterPolicyUnit.getPolicyUnitId(),
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
index f791cc8e3a4..f3ce398c4c1 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBaseTest.java
@@ -971,7 +971,7 @@ public void setCustomValuesOverridesExistingValues() {
     public void setCustomValuesOverridesDoesNotAffectsOtherKeys() {
         final String key1 = "foo";
         final String key2 = "bar";
-        b.appendCustomValue(key2,  "test value 2", null);
+        b.appendCustomValue(key2, "test value 2", null);
 
         doSetCustomValuesTest(b, key1);
 
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AffinityGroupDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AffinityGroupDaoTest.java
index 5b5203a4d5d..2ba93a6bf33 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AffinityGroupDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AffinityGroupDaoTest.java
@@ -216,7 +216,7 @@ public void testSetAffinityGroupsForHost() {
 
     @Test
     public void testGetWithFlatLabelsByClusterId() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
         Guid labelId2 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
@@ -252,7 +252,7 @@ public void testGetWithFlatLabelsByClusterId() {
 
     @Test
     public void testGetWithFlatLabelsByVmId() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
         Guid labelId2 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
@@ -326,7 +326,7 @@ public void testRemoveHostForExistingAffinityGroup() {
 
     @Test
     public void testAddVmLabelForExistingAffinityGroup() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
                 .id(labelId1)
@@ -344,7 +344,7 @@ public void testAddVmLabelForExistingAffinityGroup() {
 
     @Test
     public void testRemoveVmLabelForExistingAffinityGroup() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
                 .id(labelId1)
@@ -364,7 +364,7 @@ public void testRemoveVmLabelForExistingAffinityGroup() {
 
     @Test
     public void testAddHostLabelForExistingAffinityGroup() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
                 .id(labelId1)
@@ -381,7 +381,7 @@ public void testAddHostLabelForExistingAffinityGroup() {
 
     @Test
     public void testRemoveHostLabelForExistingAffinityGroup() {
-        Guid labelId1= Guid.newGuid();
+        Guid labelId1 = Guid.newGuid();
 
         labelDao.save(new LabelBuilder()
                 .id(labelId1)
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDaoTestCase.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDaoTestCase.java
index cc95a77f24f..1284f5aac27 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDaoTestCase.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/BaseDaoTestCase.java
@@ -58,7 +58,7 @@ public abstract class BaseDaoTestCase<D extends Dao> {
 
     @BeforeAll
     public static void initTestCase() {
-        if(dataSource == null) {
+        if (dataSource == null) {
             try {
                 dataSource = createDataSource();
 
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterDaoTest.java
index cb4c1491c79..2be7ce54f3b 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/ClusterDaoTest.java
@@ -518,7 +518,7 @@ public void testGetAllClustersWithoutMigratingVMs() {
         // get a cluster with migrating VMs
         List<VM> vms = vmDao.getAllRunningByCluster(FixturesTool.CLUSTER_RHEL6_ISCSI);
         // set every VM to UP
-        for(VM migratingVM : vms) {
+        for (VM migratingVM : vms) {
             vmDynamicDao.updateStatus(migratingVM.getId(), VMStatus.Up);
             migrationFreeClusters = dao.getWithoutMigratingVms();
         }
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskVmElementDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskVmElementDaoTest.java
index 1080d86cc7b..ed4f28c6027 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskVmElementDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskVmElementDaoTest.java
@@ -16,7 +16,7 @@
 import org.ovirt.engine.core.common.businessentities.storage.DiskVmElement;
 import org.ovirt.engine.core.compat.Guid;
 
-public class DiskVmElementDaoTest extends BaseReadDaoTestCase<VmDeviceId, DiskVmElement, DiskVmElementDao>{
+public class DiskVmElementDaoTest extends BaseReadDaoTestCase<VmDeviceId, DiskVmElement, DiskVmElementDao> {
 
     private static final int NUM_OF_DISKS_ATTACHED_TO_VM = 4;
     private static final int NUM_OF_DISKS_PLUGGED_TO_VM = 3;
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
index abc24c5457b..14775091e58 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
@@ -522,13 +522,13 @@ public class FixturesTool {
      */
     protected static final String LUN_ID_OF_DOMAIN_VG_METADATA = "VG_DOMAIN_METADATA_LUN-1";
 
-    protected static final String LUN_ID1= "1IET_00180001";
+    protected static final String LUN_ID1 = "1IET_00180001";
 
-    protected static final String LUN_ID2= "1IET_00180003";
+    protected static final String LUN_ID2 = "1IET_00180003";
 
-    protected static final String ORPHAN_LUN_ID1= "1IET_00180005";
+    protected static final String ORPHAN_LUN_ID1 = "1IET_00180005";
 
-    protected static final String ORPHAN_LUN_ID2= "1IET_00180006";
+    protected static final String ORPHAN_LUN_ID2 = "1IET_00180006";
 
     /**
      * Predefined boot LUN disk attached to VM_RHEL5_POOL_57
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/MacPoolDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/MacPoolDaoTest.java
index d4bf2b638f0..098eb2c9a59 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/MacPoolDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/MacPoolDaoTest.java
@@ -14,7 +14,7 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.utils.RandomUtils;
 
-public class MacPoolDaoTest extends BaseGenericDaoTestCase<Guid, MacPool, MacPoolDao>{
+public class MacPoolDaoTest extends BaseGenericDaoTestCase<Guid, MacPool, MacPoolDao> {
     @Test
     public void testGetDefaultPool() {
         final MacPool defaultPool = dao.getDefaultPool();
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StepDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StepDaoTest.java
index bfdfbda31ab..9a2d76562c8 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StepDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StepDaoTest.java
@@ -116,7 +116,7 @@ public void updateJobStepsCompleted() {
     }
 
     @Test
-    public void getStepsByExternalId(){
+    public void getStepsByExternalId() {
         List<Step> steps = dao.getStepsByExternalId(IN_PROGRESS_REBALANCING_GLUSTER_VOLUME_TASK_ID);
         assertEquals(TOTAL_STEPS_OF_REBALANCING_GLUSTER_VOLUME, steps.size(), "Verify Rebalancing Gluster Volume Job has steps");
         Step step = steps.get(0);
@@ -126,14 +126,14 @@ public void getStepsByExternalId(){
     }
 
     @Test
-    public void getExternalIdsForRunningSteps(){
+    public void getExternalIdsForRunningSteps() {
         List<Guid> externalIds = dao.getExternalIdsForRunningSteps(ExternalSystemType.GLUSTER);
         assertEquals(1, externalIds.size(), "Verify external ids present");
         assertEquals(IN_PROGRESS_REBALANCING_GLUSTER_VOLUME_TASK_ID, externalIds.get(0), "Invalid TaskId");
     }
 
     @Test
-    public void updateStepProgress(){
+    public void updateStepProgress() {
         Integer newProgress = 74;
         Step s = dao.get(FixturesTool.STEP_ID);
         assertNotEquals(newProgress, s.getProgress(), "New progress should be different than the current");
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoTest.java
index baf47d9f060..2031c16694c 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/StorageServerConnectionDaoTest.java
@@ -223,7 +223,7 @@ public void testgetAllForVolumeGroup() {
         List<StorageServerConnections> result =
                 dao.getAllForVolumeGroup(EXISTING_DOMAIN_STORAGE_NAME);
         assertFalse(result.isEmpty());
-        Set<String> connections  = new HashSet<>();
+        Set<String> connections = new HashSet<>();
         for (StorageServerConnections connection : result) {
             assertFalse(connections.contains(connection.getId()));
             connections.add(connection.getId());
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDaoTest.java
index a126c342986..c59da0a44c6 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsDaoTest.java
@@ -527,9 +527,9 @@ public void testGetAllWithMemory() {
             assertNotNull(host.getSwapFree());
             assertNotNull(host.getSwapTotal());
 
-            assertNotEquals(0, (long)host.getMemFree());
-            assertNotEquals(0, (long)host.getSwapFree());
-            assertNotEquals(0, (long)host.getSwapTotal());
+            assertNotEquals(0, (long) host.getMemFree());
+            assertNotEquals(0, (long) host.getSwapFree());
+            assertNotEquals(0, (long) host.getSwapTotal());
         }
     }
 
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsNumaNodeDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsNumaNodeDaoTest.java
index 5209bbf8e5e..8bdee5045fa 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsNumaNodeDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VdsNumaNodeDaoTest.java
@@ -44,7 +44,7 @@ public void testMassSaveNumaNode() {
         assertEquals(0, result.size());
 
         List<VdsNumaNode> newVdsNode = new ArrayList<>();
-        VdsNumaNode newVdsNumaNode= new VdsNumaNode();
+        VdsNumaNode newVdsNumaNode = new VdsNumaNode();
         newVdsNumaNode.setCpuIds(generateCpuList(0, 4));
         newVdsNumaNode.setId(Guid.newGuid());
         newVdsNumaNode.setIndex(0);
@@ -52,7 +52,7 @@ public void testMassSaveNumaNode() {
         newVdsNumaNode.setNumaNodeStatistics(newNodeStatistics);
         newVdsNode.add(newVdsNumaNode);
 
-        newVdsNumaNode= new VdsNumaNode();
+        newVdsNumaNode = new VdsNumaNode();
         newVdsNumaNode.setCpuIds(generateCpuList(4, 4));
         newVdsNumaNode.setId(Guid.newGuid());
         newVdsNumaNode.setIndex(1);
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmJobDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmJobDaoTest.java
index 589e88866ae..a5801cb4197 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmJobDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmJobDaoTest.java
@@ -122,7 +122,7 @@ public void testUpdate() {
         dao.update(job);
 
         // Get the job again
-        VmBlockJob updatedJob =  (VmBlockJob) dao.getAll().stream()
+        VmBlockJob updatedJob = (VmBlockJob) dao.getAll().stream()
                 .filter(j -> j.getId().equals(FixturesTool.EXISTING_VM_BLOCK_JOB))
                 .findFirst().orElse(null);
 
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDaoTest.java
index 9e231b80e77..46721e309c6 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/VmTemplateDaoTest.java
@@ -336,7 +336,7 @@ private static void assertGetResult(VmTemplate result) {
     private static void assertGetAllResult(List<VmTemplate> result) {
         assertNotNull(result);
         assertFalse(result.isEmpty());
-        for (VmTemplate template : result){
+        for (VmTemplate template : result) {
             assertEquals(1, template.getDbGeneration(), "Template generation wasn't loaded as expected");
         }
     }
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoTest.java
index 4f96369d063..8f7c3211a87 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterHooksDaoTest.java
@@ -92,7 +92,7 @@ public void testGetServerHooks() {
                 GlusterHookStatus.ENABLED, GlusterHookContentType.TEXT, CHECKSUM_HOOK1_SERVER1);
         GlusterServerHook serverHook2 = getGlusterServerHook(FixturesTool.GLUSTER_BRICK_SERVER1,
                 GlusterHookStatus.MISSING, null, null);
-        List<GlusterServerHook> serverHooks  = dao.getGlusterServerHooks(FixturesTool.HOOK_ID);
+        List<GlusterServerHook> serverHooks = dao.getGlusterServerHooks(FixturesTool.HOOK_ID);
         assertNotNull(serverHooks);
         assertEquals(2, serverHooks.size());
         assertTrue(serverHooks.contains(serverHook1));
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java
index 293582ec6a2..6437b33e0ff 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/GlusterVolumeDaoTest.java
@@ -208,7 +208,7 @@ public void testUpdateAsyncTaskId() {
         GlusterVolumeEntity volume = dao.getAllWithQuery("select * from gluster_volumes_view where id = '"
                         + existingDistVol.getId() + "'").get(0);
 
-        assertNotNull(volume, "Volume : "+ existingDistVol.getId() +" doesn't exists");
+        assertNotNull(volume, "Volume : " + existingDistVol.getId() + " doesn't exists");
         assertEquals(REBALANCING_VOLUME_TASKID, volume.getAsyncTask().getTaskId(), "Task ID is not getting updated");
         assertEquals(JobExecutionStatus.STARTED, volume.getAsyncTask().getStatus(), "Invalid Task status");
         assertEquals(GlusterTaskType.REBALANCE, volume.getAsyncTask().getType(), "Invalid Task type");
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/StoageDeviceDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/StoageDeviceDaoTest.java
index 215e8a29d18..c35b631f0af 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/StoageDeviceDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/gluster/StoageDeviceDaoTest.java
@@ -37,7 +37,7 @@ private StorageDevice getStorageDevice() {
     }
 
     @Test
-    public void testGetById(){
+    public void testGetById() {
         StorageDevice storageDevice = dao.get(EXISTING_STORAGE_DEVICE_ID_1);
         assertNotNull(storageDevice, "Failed to retrive storage device");
         assertEquals(EXISTING_STORAGE_DEVICE_ID_1, storageDevice.getId(), "Failed to retrive corrective storage device");
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/InterfaceDaoImplTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/InterfaceDaoImplTest.java
index f0d06b9c096..b4c9c082ecf 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/InterfaceDaoImplTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/InterfaceDaoImplTest.java
@@ -106,7 +106,7 @@ public void testGetAllInterfacesForVds() {
     }
 
     private void testQosAppendedToResultSet(List<VdsNetworkInterface> result) {
-        result.forEach(r-> {
+        result.forEach(r -> {
             if (r.getQos() == null) {
                 HostNetworkQos hostNetworkQos = new HostNetworkQos();
                 hostNetworkQos.setId(r.getId());
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImplTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImplTest.java
index 8c4f8091b50..88276b7a46e 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImplTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkAttachmentDaoImplTest.java
@@ -139,7 +139,7 @@ public void testGetAllForHost() {
         assertEquals(2, result.size());
         result.forEach(r -> assertNull(r.getHostNetworkQos()));
 
-        result.forEach(r-> {
+        result.forEach(r -> {
             HostNetworkQos hostNetworkQos = new HostNetworkQos();
             hostNetworkQos.setId(r.getId());
             hostNetworkQos.setOutAverageLinkshare(31);
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoTest.java
index 68dd3fada8f..4a3c0c35eab 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNetworkInterfaceDaoTest.java
@@ -31,7 +31,7 @@ public class VmNetworkInterfaceDaoTest extends BaseDaoTestCase<VmNetworkInterfac
     private static final Guid TEMPLATE_ID = FixturesTool.VM_TEMPLATE_RHEL5;
     private static final Guid VM_ID = FixturesTool.VM_RHEL5_POOL_57;
 
-    protected static final Guid PRIVILEGED_USER_ID   = new Guid("9bf7c640-b620-456f-a550-0348f366544b");
+    protected static final Guid PRIVILEGED_USER_ID = new Guid("9bf7c640-b620-456f-a550-0348f366544b");
     protected static final Guid UNPRIVILEGED_USER_ID = new Guid("9bf7c640-b620-456f-a550-0348f366544a");
 
     private VmNetworkInterface existingVmInterface;
diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoTest.java
index 4a99b3fcfef..44b08e4e429 100644
--- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoTest.java
+++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/VmNicFilterParameterDaoTest.java
@@ -23,7 +23,7 @@ protected VmNicFilterParameter generateNewEntity() {
         parameter.setName("IP");
         parameter.setValue("192.168.122.2");
         parameter.setVmInterfaceId(FixturesTool.VM_NETWORK_INTERFACE);
-        return  parameter;
+        return parameter;
     }
 
     @Override
diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/api/jwk/Base64Codec.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/api/jwk/Base64Codec.java
index a9940b013f3..91a0d99403a 100644
--- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/api/jwk/Base64Codec.java
+++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/api/jwk/Base64Codec.java
@@ -131,7 +131,7 @@ static int tpEq(int a, int b) {
         // if you think about it for 30 minutes
 
         final int bit_diff = a ^ b;
-        final int msb_iff_zero_diff = (bit_diff - 1) & (~bit_diff);
+        final int msb_iff_zero_diff = (bit_diff - 1) & ~bit_diff;
         return msb_iff_zero_diff >>> 31;
     }
 
diff --git a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/service/ExternalOIDCService.java b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/service/ExternalOIDCService.java
index 402ade4e629..ce1936122e4 100644
--- a/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/service/ExternalOIDCService.java
+++ b/backend/manager/modules/enginesso/src/main/java/org/ovirt/engine/core/sso/service/ExternalOIDCService.java
@@ -128,7 +128,7 @@ private static SsoSession login(SsoContext ssoContext,
 
         // We should request this scope by RFC (https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest)
         // to have possibility for working with other oidc endpoints.
-        if( ! scope.contains(OPENID_SCOPE)) {
+        if ( ! scope.contains(OPENID_SCOPE)) {
             scope = scope + " " + OPENID_SCOPE;
         }
 
diff --git a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
index c2a78c82de4..2f076b044e1 100644
--- a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
+++ b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
@@ -73,7 +73,7 @@ public ExtMap invoke(ExtMap input, boolean allowUnsupported, boolean allowFail)
         invoke(input, output);
 
         String message = output.get(Base.InvokeKeys.MESSAGE);
-        switch(output.<Integer>get(Base.InvokeKeys.RESULT, Base.InvokeResult.FAILED)) {
+        switch (output.<Integer>get(Base.InvokeKeys.RESULT, Base.InvokeResult.FAILED)) {
         case Base.InvokeResult.SUCCESS:
             break;
         case Base.InvokeResult.UNSUPPORTED:
diff --git a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
index 92393a07f1e..ff0a6c2b0a8 100644
--- a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
+++ b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
@@ -75,7 +75,7 @@ private <T extends Class> T lookupService(Module module, T serviceInterface, Str
             T serviceClass = null;
             for (Object service : module.loadService(serviceInterface)) {
                 if (service.getClass().getName().equals(serviceClassName)) {
-                    serviceClass = (T)service.getClass();
+                    serviceClass = (T) service.getClass();
                     break;
                 }
             }
diff --git a/backend/manager/modules/logger/src/main/java/org/ovirt/engine/core/logger/LoggerHandler.java b/backend/manager/modules/logger/src/main/java/org/ovirt/engine/core/logger/LoggerHandler.java
index ab444bef135..8813166629d 100644
--- a/backend/manager/modules/logger/src/main/java/org/ovirt/engine/core/logger/LoggerHandler.java
+++ b/backend/manager/modules/logger/src/main/java/org/ovirt/engine/core/logger/LoggerHandler.java
@@ -32,7 +32,7 @@ public void publish(LogRecord record) {
                 extension.invoke(
                         publishInputMap,
                         publishOutputMap);
-            } catch(Exception ex) {
+            } catch (Exception ex) {
                 // ignore, logging this exception will result in infinite loop
             }
         }
@@ -46,7 +46,7 @@ public void flush() {
                         .mput(Base.InvokeKeys.COMMAND, Logger.InvokeCommands.FLUSH),
                         true,
                         true);
-            } catch(Exception ex) {
+            } catch (Exception ex) {
                 // ignore, logging this exception will result in infinite loop
             }
         }
@@ -60,7 +60,7 @@ public void close() throws SecurityException {
                         .mput(Base.InvokeKeys.COMMAND, Logger.InvokeCommands.CLOSE),
                         true,
                         true);
-            } catch(Exception ex) {
+            } catch (Exception ex) {
                 // ignore, logging this exception will result in infinite loop
             }
         }
diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/CompletenessAssertor.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/CompletenessAssertor.java
index bb6d99e74b6..ec99f09e6f5 100644
--- a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/CompletenessAssertor.java
+++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/CompletenessAssertor.java
@@ -161,9 +161,9 @@ private static List<String> doAssertRequired(String reason, String detail, Objec
                         missing.add(r);
                     }
                 }
-            } else if(!isLeaf(r)){
+            } else if (!isLeaf(r)) {
                 Object superType = get(model, superField(r));
-                if(superType != null) {
+                if (superType != null) {
                     missing.addAll(joinSuperType(doAssertRequired(reason, detail, superType, frameOffset, subField(r)), superType));
                 } else {
                     missing.add(r);
@@ -190,7 +190,7 @@ private static List<String> doAssertRequired(String reason, String detail, Objec
      */
     private static Collection<? extends String> joinSuperType(List<String> missing, Object superType) {
         String superTypeName = superType.getClass().getSimpleName().toLowerCase();
-        for(int i = 0; i < missing.size(); i++){
+        for (int i = 0; i < missing.size(); i++) {
             missing.set(i, superTypeName + "." + missing.get(i));
         }
         return missing;
diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/EnumValidator.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/EnumValidator.java
index fdb0f489f2f..b7934ff0889 100644
--- a/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/EnumValidator.java
+++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/EnumValidator.java
@@ -44,7 +44,7 @@ public static <E extends Enum<E>> E validateEnum(Class<E> clz, String name) {
      * @param name the actual value to be looked up. could be the enum member or part of extended list of values
      */
     public static <E extends Enum<E>> String validateEnum(Class<E> clz, Set<String> externalValues, String name, boolean toUppercase) {
-        return validateEnum(INVALID_ENUM_REASON, INVALID_ENUM_DETAIL, clz, externalValues,  name, toUppercase);
+        return validateEnum(INVALID_ENUM_REASON, INVALID_ENUM_DETAIL, clz, externalValues, name, toUppercase);
     }
 
 
@@ -70,7 +70,7 @@ public static <E extends Enum<E>> E validateEnum(String reason, String detail, C
     public static <E extends Enum<E>> E validateEnum(String reason, String detail, Class<E> clz, String name, boolean toUppercase) {
         try {
             return Enum.valueOf(clz, toUppercase ? name.toUpperCase() : name);
-        } catch (IllegalArgumentException|NullPointerException e) {
+        } catch (IllegalArgumentException | NullPointerException e) {
             detail = detail + getPossibleValues(clz);
             throw new WebApplicationException(response(reason, MessageFormat.format(detail, name, clz.getSimpleName())));
         }
@@ -85,7 +85,7 @@ public static <E extends Enum<E>> String validateEnum(String reason, String deta
 
         try {
             return Enum.valueOf(clz, toUppercase ? name.toUpperCase() : name).name();
-        } catch (IllegalArgumentException|NullPointerException e) {
+        } catch (IllegalArgumentException | NullPointerException e) {
             detail = detail + getPossibleValues(clz, OsTypeUtils.getAllValues());
             throw new WebApplicationException(response(reason, MessageFormat.format(detail, name, clz.getSimpleName())));
         }
diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/CompletenessAssertorTest.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/CompletenessAssertorTest.java
index 4fb52efe3b6..fa16149410f 100644
--- a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/CompletenessAssertorTest.java
+++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/CompletenessAssertorTest.java
@@ -299,21 +299,21 @@ public void testMissingListSubFieldAlternatives() {
         }
     }
 
-    private void verifyIncompleteException(WebApplicationException wae, String type,  String... fields) {
+    private void verifyIncompleteException(WebApplicationException wae, String type, String... fields) {
         assertEquals(400, wae.getResponse().getStatus());
-        Fault fault = (Fault)wae.getResponse().getEntity();
+        Fault fault = (Fault) wae.getResponse().getEntity();
         assertNotNull(fault);
         assertEquals("Incomplete parameters", fault.getReason());
         String method = new Throwable().getStackTrace()[1].getMethodName();
-        assertEquals(type + " " +  Arrays.asList(fields) + " required for " + method, fault.getDetail());
+        assertEquals(type + " " + Arrays.asList(fields) + " required for " + method, fault.getDetail());
     }
 
-    private void verifyIncompleteException(String reason, WebApplicationException wae, String type,  String... fields) {
+    private void verifyIncompleteException(String reason, WebApplicationException wae, String type, String... fields) {
         assertEquals(400, wae.getResponse().getStatus());
-        Fault fault = (Fault)wae.getResponse().getEntity();
+        Fault fault = (Fault) wae.getResponse().getEntity();
         assertNotNull(fault);
         assertEquals(reason, fault.getReason());
         String method = new Throwable().getStackTrace()[1].getMethodName();
-        assertEquals(type + " " +  Arrays.asList(fields) + " required for " + method, fault.getDetail());
+        assertEquals(type + " " + Arrays.asList(fields) + " required for " + method, fault.getDetail());
     }
 }
diff --git a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/EnumValidatorTest.java b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/EnumValidatorTest.java
index 765bc900eb7..516fa8d8215 100644
--- a/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/EnumValidatorTest.java
+++ b/backend/manager/modules/restapi/interface/common/jaxrs/src/test/java/org/ovirt/engine/api/common/util/EnumValidatorTest.java
@@ -34,7 +34,7 @@ public void testInvalid() {
 
     private void verifyInvalidValueException(WebApplicationException wae, String value, String typeName) {
         assertEquals(400, wae.getResponse().getStatus());
-        Fault fault = (Fault)wae.getResponse().getEntity();
+        Fault fault = (Fault) wae.getResponse().getEntity();
         assertNotNull(fault);
         assertEquals("Invalid value", fault.getReason());
         assertEquals(value + " is not a member of " + typeName
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Argument.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Argument.java
index f7d5990b8b4..aefc0d4d213 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Argument.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Argument.java
@@ -6,7 +6,7 @@ public Argument(String name, String type) {
         this.name = name;
         this.type = type;
     }
-    public Argument() {}
+    public Argument() { }
 
     private String name;
     private String type;
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
index 6c895b28d2b..a1c555ba62e 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/RsdlBuilder.java
@@ -187,7 +187,7 @@ public LinkBuilder responseType(final String responseType) {
             return this;
         }
         public LinkBuilder httpMethod(HttpMethod httpMethod) {
-            if(!link.isSetRequest()) {
+            if (!link.isSetRequest()) {
                 link.setRequest(new Request());
             }
             link.getRequest().setHttpMethod(httpMethod);
@@ -222,13 +222,13 @@ private Class<?> findResource(String path) throws ClassNotFoundException, IOExce
 
     private String getPath(Method method) {
         Path pathAnnotation = method.getAnnotation(Path.class);
-        return pathAnnotation==null ? null : pathAnnotation.value();
+        return pathAnnotation == null ? null : pathAnnotation.value();
     }
 
     public List<DetailedLink> describe(Class<?> resource, String prefix, Map<String, Type> parametersMap) throws ClassNotFoundException {
         //SortedSet<Link> results = new TreeSet<Link>();
         List<DetailedLink> results = new ArrayList<>();
-        if (resource!=null) {
+        if (resource != null) {
             for (Method m : resource.getMethods()) {
                 if (isConcreteReturnType(m, resource)) {
                     handleMethod(prefix, results, m, resource, parametersMap);
@@ -251,10 +251,10 @@ && parameterTypesEqual(m.getParameterTypes(), method.getParameterTypes())
     }
 
     private boolean parameterTypesEqual(Class<?>[] types1, Class<?>[] types2) {
-        if (types1.length!=types2.length) {
+        if (types1.length != types2.length) {
             return false;
         } else {
-            for (int i=0; i<types1.length; i++) {
+            for (int i = 0; i < types1.length; i++) {
                 if (!(types1[i].isAssignableFrom(types2[i]) || types2[i].isAssignableFrom(types1[i]))) {
                     return false;
                 }
@@ -264,7 +264,7 @@ private boolean parameterTypesEqual(Class<?>[] types1, Class<?>[] types2) {
     }
 
     private void addToGenericParamsMap (Class<?> resource, Type[] paramTypes, Type[] genericParamTypes, Map<String, Type> parametersMap) {
-        for (int i=0; i<genericParamTypes.length; i++) {
+        for (int i = 0; i < genericParamTypes.length; i++) {
             if (paramTypes[i].toString().length() == 1) {
                 //if the parameter type is generic - don't add to map, as it might override a more meaningful value:
                 //for example, without this check we could replace <"R", "Template"> with <"R", "R">, and lose information.
@@ -308,7 +308,7 @@ private void handleMethod(String prefix, Collection<DetailedLink> results, Metho
                         path = "{" + getSingleForm(prefix) + ":id}";
                     }
                     if (m.getGenericReturnType() instanceof ParameterizedType) {
-                        ParameterizedType parameterizedType = (ParameterizedType)m.getGenericReturnType();
+                        ParameterizedType parameterizedType = (ParameterizedType) m.getGenericReturnType();
                         addToGenericParamsMap(resource, parameterizedType.getActualTypeArguments(), m.getReturnType().getTypeParameters(), parametersMap);
                     }
                     results.addAll(describe(concreteReturnType, prefix + "/" + path, new HashMap<>(parametersMap)));
@@ -527,7 +527,7 @@ private Parameter createBodyParam(Entry<Object, Object> mandatoryKeyValuePair, b
     private void handleCollection(Entry<Object, Object> mandatoryKeyValuePair, boolean required, Parameter param) {
         param.setType(COLLECTION_PARAMETER_RSDL);
         @SuppressWarnings("unchecked")
-        Map<Object, Object> listParams = (Map<Object, Object>)mandatoryKeyValuePair.getValue();
+        Map<Object, Object> listParams = (Map<Object, Object>) mandatoryKeyValuePair.getValue();
         param.setParametersSet(new ParametersSet());
         for (Entry<Object, Object> listParamData : listParams.entrySet()) {
             Parameter listParam = createBodyParam(listParamData, required);
@@ -547,7 +547,7 @@ private void addHeaderParams(DetailedLink link, Action action) {
         // Add the parameters that are specified in the metadata:
         if (action.getRequest().getHeaders() != null && !action.getRequest().getHeaders().isEmpty()) {
             link.getRequest().setHeaders(new Headers());
-            for (Object key :  action.getRequest().getHeaders().keySet()) {
+            for (Object key : action.getRequest().getHeaders().keySet()) {
                 Header header = new Header();
                 header.setName(key.toString());
                 Object value = action.getRequest().getHeaders().get(key);
@@ -649,16 +649,16 @@ private void addUrlParams(DetailedLink link, Action action) {
         if (action.getRequest().getUrlparams() != null && !action.getRequest().getUrlparams().isEmpty()) {
             link.getRequest().setUrl(new Url());
             ParametersSet ps = new ParametersSet();
-        for (Object key :  action.getRequest().getUrlparams().keySet()) {
+        for (Object key : action.getRequest().getUrlparams().keySet()) {
                 Parameter param = new Parameter();
                 param.setName(key.toString());
                 Object value = action.getRequest().getUrlparams().get(key);
                 if (value != null) {
-                    ParamData urlParamData = (ParamData)value;
+                    ParamData urlParamData = (ParamData) value;
                     param.setType(urlParamData.getType());
                     param.setContext(urlParamData.getContext());
                     param.setValue(urlParamData.getValue());
-                    param.setRequired(urlParamData.getRequired()==null ? Boolean.FALSE : urlParamData.getRequired());
+                    param.setRequired(urlParamData.getRequired() == null ? Boolean.FALSE : urlParamData.getRequired());
                     param.setDeprecated(urlParamData.getDeprecated());
                 }
                 ps.getParameters().add(param);
@@ -698,17 +698,17 @@ private String handleExcpetionalCases(String s, String prefix) {
      */
     private String getReturnTypeStr(Class<?> returnValue) {
         int lastIndexOf = returnValue.getSimpleName().lastIndexOf(".");
-        String entityType = lastIndexOf==-1 ? returnValue.getSimpleName() : returnValue.getSimpleName().substring(lastIndexOf);
+        String entityType = lastIndexOf == -1 ? returnValue.getSimpleName() : returnValue.getSimpleName().substring(lastIndexOf);
         return entityType;
     }
 
     private Class<?> findConcreteType(Type generic, Class<?> resource, Map<String, Type> parametersMap) throws ClassNotFoundException {
         for (Type superInterface : resource.getGenericInterfaces()) {
             if (superInterface instanceof ParameterizedType) {
-                ParameterizedType p = (ParameterizedType)superInterface;
-                Class<?> clazz = Class.forName(p.getRawType().toString().substring(p.getRawType().toString().lastIndexOf(' ')+1));
+                ParameterizedType p = (ParameterizedType) superInterface;
+                Class<?> clazz = Class.forName(p.getRawType().toString().substring(p.getRawType().toString().lastIndexOf(' ') + 1));
                 Map<String, Type> map = new HashMap<>();
-                for (int i=0; i<p.getActualTypeArguments().length; i++) {
+                for (int i = 0; i < p.getActualTypeArguments().length; i++) {
                     if (!map.containsKey(clazz.getTypeParameters()[i].toString())) {
                         map.put(clazz.getTypeParameters()[i].toString(), p.getActualTypeArguments()[i]);
                     }
@@ -716,7 +716,7 @@ private Class<?> findConcreteType(Type generic, Class<?> resource, Map<String, T
                 if (map.containsKey(generic.toString())) {
                     String type = map.get(generic.toString()).toString();
                     try {
-                        Class<?> returnClass = Class.forName(type.substring(type.lastIndexOf(' ')+1));
+                        Class<?> returnClass = Class.forName(type.substring(type.lastIndexOf(' ') + 1));
                         return returnClass;
                     } catch (ClassNotFoundException e) {
                         break;
@@ -727,7 +727,7 @@ private Class<?> findConcreteType(Type generic, Class<?> resource, Map<String, T
         if (parametersMap.containsKey(generic.toString())) {
             try {
                 Type type = parametersMap.get(generic.toString());
-                Class<?> returnClass = Class.forName(type.toString().substring(type.toString().indexOf(' ') +1));
+                Class<?> returnClass = Class.forName(type.toString().substring(type.toString().indexOf(' ') + 1));
                 return returnClass;
             } catch (ClassNotFoundException e) {
                 return null;
@@ -739,8 +739,8 @@ private Class<?> findConcreteType(Type generic, Class<?> resource, Map<String, T
 
     private boolean isSingleEntityResource(Method m) {
         Annotation[][] parameterAnnotations = m.getParameterAnnotations();
-        for (int i=0; i<parameterAnnotations.length; i++) {
-            for (int j=0; j<parameterAnnotations[j].length; j++) {
+        for (int i = 0; i < parameterAnnotations.length; i++) {
+            for (int j = 0; j < parameterAnnotations[j].length; j++) {
                 if (parameterAnnotations[i][j].annotationType().equals(PathParam.class)) {
                     return true;
                 }
@@ -764,7 +764,7 @@ private boolean isRequiresDescription(Method m) {
     //for "{api}/hosts/{host:id}/nics" return "nic"
     //but for "{api}/hosts/{host:id}/storage" return "storage" (don't truncate last character)
     private String getSingleForm(String prefix) {
-        int startIndex = prefix.lastIndexOf('/')+1;
+        int startIndex = prefix.lastIndexOf('/') + 1;
         prefix = prefix.substring(startIndex);
         if (prefix.endsWith("ies")) {
             return prefix.replaceAll("ies$", "y");
@@ -794,7 +794,7 @@ private void uniteDuplicateLinks(Rsdl rsdl) {
             if (linksMap.containsKey(linkId)) {
               //duplicate found, determine which of the two should be deleted
                 DetailedLink linkToDelete = decideWhichToDelete(linksMap.get(linkId), link);
-                if (linkToDelete!=null) {
+                if (linkToDelete != null) {
                     linksToDelete.add(linkToDelete);
                 }
             } else {
@@ -815,10 +815,10 @@ private DetailedLink decideWhichToDelete(DetailedLink link1, DetailedLink link2)
                 && Boolean.FALSE.equals(link1.getRequest().getBody().isRequired())
                 && Boolean.FALSE.equals(link2.getRequest().getBody().isRequired())
            ) {
-            if (link1ParamType!=null && link2ParamType==null) {
+            if (link1ParamType != null && link2ParamType == null) {
                 return link2;
             }
-            if (link1ParamType==null && link2ParamType!=null) {
+            if (link1ParamType == null && link2ParamType != null) {
                 return link1;
             }
         }
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTree.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTree.java
index 9b5ba4d8fe6..ca7cdb17535 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTree.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTree.java
@@ -64,7 +64,7 @@ private static ServiceTreeNode buildNode(Class<?> resource, String path, String
         if (!nodes.containsKey(resource)) {
             nodes.put(resource, node);
         }
-        if (node.getSubServices()!=null) {
+        if (node.getSubServices() != null) {
             node.setSon(node.getSubService("{id}"));
         }
         return node;
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeCrawler.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeCrawler.java
index e88921ed113..0af568790d1 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeCrawler.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeCrawler.java
@@ -16,7 +16,7 @@
  * 3) next() returns BackendVmNicsResource (initialized with
  *           58cfb470-03b9-01d0-03b9-0000000001e7 as the Vm ID)
  */
-public class ServiceTreeCrawler implements Iterator<ServiceTreeNode>{
+public class ServiceTreeCrawler implements Iterator<ServiceTreeNode> {
 
     private Iterator<String> pathIterator;
     private ServiceTreeNode node;
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeNode.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeNode.java
index 2c4ae8aace7..b3fa8dd9a5d 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeNode.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/ServiceTreeNode.java
@@ -98,7 +98,7 @@ public void setResourceClass(Class<?> resourceclass) {
      * action (purposely ignores case when comparing action names).
      */
     public boolean containsAction(String actionName) {
-        if (actions!=null) {
+        if (actions != null) {
             for (String action : actions) {
                 if (action.toLowerCase().equals(actionName.toLowerCase())) {
                     return true;
@@ -109,7 +109,7 @@ public boolean containsAction(String actionName) {
     }
 
     public boolean containsSubService(String path) {
-        if (subServices!=null) {
+        if (subServices != null) {
             for (ServiceTreeNode node : subServices) {
                 if (node.getPath().equals(path)) {
                     return true;
@@ -120,7 +120,7 @@ public boolean containsSubService(String path) {
     }
 
     public ServiceTreeNode getSubService(String path) {
-        if (subServices!=null) {
+        if (subServices != null) {
             for (ServiceTreeNode node : subServices) {
                 if (node.getPath().equals(path)) {
                     return node;
@@ -131,7 +131,7 @@ public ServiceTreeNode getSubService(String path) {
     }
 
     public boolean isCollection() {
-        return getSon()!=null;
+        return getSon() != null;
     }
 
     public static class Builder {
@@ -186,10 +186,10 @@ private String toString(int tabNum) {
         String tabs = getTabs(tabNum);
         builder.append(tabs).append("name: ").append(name).append("\n")
         .append(tabs).append("path: ").append(path).append("\n")
-        .append(tabs).append("type: ").append(type==null ? "" : type.getSimpleName()).append("\n")
+        .append(tabs).append("type: ").append(type == null ? "" : type.getSimpleName()).append("\n")
         .append(tabs).append("getter: ").append(getter).append("\n")
-        .append(tabs).append("parent: ").append(parent==null ? "" : parent.getName()).append("\n")
-        .append(tabs).append("son: ").append(son==null ? "" : son.getName()).append("\n")
+        .append(tabs).append("parent: ").append(parent == null ? "" : parent.getName()).append("\n")
+        .append(tabs).append("son: ").append(son == null ? "" : son.getName()).append("\n")
         .append(tabs).append("actions: ").append(printActions()).append("\n")
         .append(tabs).append("sub-services:\n").append(printSubServices(++tabNum)).append("\n");
         return builder.toString();
@@ -197,7 +197,7 @@ private String toString(int tabNum) {
 
     private String getTabs(int tabNum) {
         StringBuilder builder = new StringBuilder("");
-        for (int i=0; i<tabNum; i++) {
+        for (int i = 0; i < tabNum; i++) {
             builder.append("\t");
         }
         return builder.toString();
@@ -213,12 +213,12 @@ private String printSubServices(int tabNum) {
 
     private Object printActions() {
         StringBuilder builder = new StringBuilder();
-        for (int i=0; i<actions.size(); i++) {
+        for (int i = 0; i < actions.size(); i++) {
             builder.append(actions.get(i)).append(",");
         }
         String actions = builder.toString();
-        if (actions.length()>0) {
-            actions = actions.substring(0, actions.length()-1);
+        if (actions.length() > 0) {
+            actions = actions.substring(0, actions.length() - 1);
         }
         return actions;
     }
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Signature.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Signature.java
index f031d8ab840..21650c3b235 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Signature.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/rsdl/Signature.java
@@ -37,7 +37,7 @@ public void addMandatoryArgument(Object name, Object type) {
     public void addOptionalArgument(Object name, Object type) {
         optionalArguments.put(name, type);
     }
-    public Signature clone()  throws CloneNotSupportedException {
+    public Signature clone() throws CloneNotSupportedException {
         super.clone();
         Signature clonedSignature = new Signature();
         Map<Object, Object> mandatoryArguments = new HashMap<>();
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/IntegerParser.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/IntegerParser.java
index 726fd194031..b419c23f84a 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/IntegerParser.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/IntegerParser.java
@@ -36,7 +36,7 @@ public static int parseUnsignedShort(String value) {
             throw new InvalidValueException("Value " + value + " is greater than maximum unsigned short " + MAX_UNSIGNED_SHORT);
         }
         if (result.intValue() < 0) {
-            throw new InvalidValueException("Negative value " + value +  " not allowed for unsigned shorts, valid values are between 0 and " + MAX_UNSIGNED_SHORT);
+            throw new InvalidValueException("Negative value " + value + " not allowed for unsigned shorts, valid values are between 0 and " + MAX_UNSIGNED_SHORT);
         }
         return result.intValue();
     }
@@ -47,7 +47,7 @@ public static int parseInt(String value) {
         }
         BigInteger result = DatatypeConverter.parseInteger(value);
         if (result.compareTo(MAX_INT) > 0) {
-            throw new InvalidValueException("Value " + value +  " is greater than maximum integer " + MAX_INT);
+            throw new InvalidValueException("Value " + value + " is greater than maximum integer " + MAX_INT);
         }
         return result.intValue();
     }
@@ -58,10 +58,10 @@ public static long parseUnsignedInt(String value) {
         }
         BigInteger result = DatatypeConverter.parseInteger(value);
         if (result.compareTo(MAX_UNSIGNED_INT) > 0) {
-            throw new InvalidValueException("Value " + value +  " is greater than maximum unsigned integer " + MAX_UNSIGNED_INT);
+            throw new InvalidValueException("Value " + value + " is greater than maximum unsigned integer " + MAX_UNSIGNED_INT);
         }
         if (result.intValue() < 0) {
-            throw new InvalidValueException("Negative value " + value +  " not allowed for unsigned integers, valid values are between 0 and " + MAX_UNSIGNED_INT);
+            throw new InvalidValueException("Negative value " + value + " not allowed for unsigned integers, valid values are between 0 and " + MAX_UNSIGNED_INT);
         }
         return result.longValue();
     }
@@ -72,7 +72,7 @@ public static long parseLong(String value) {
         }
         BigInteger result = DatatypeConverter.parseInteger(value);
         if (result.compareTo(MAX_LONG) > 0) {
-            throw new InvalidValueException("Value " + value +  " is greater than maximum long " + MAX_LONG);
+            throw new InvalidValueException("Value " + value + " is greater than maximum long " + MAX_LONG);
         }
         return result.longValue();
     }
diff --git a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ReflectionHelper.java b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ReflectionHelper.java
index a7f2391d991..5cd37360f29 100644
--- a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ReflectionHelper.java
+++ b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/ReflectionHelper.java
@@ -17,7 +17,7 @@ public class ReflectionHelper {
     private static final String IS_ROOT = "is";
     private static final String IS_SET_ROOT = "isSet";
 
-    private ReflectionHelper() {}
+    private ReflectionHelper() { }
 
     public static <R extends BaseResource> R newModel(Class<R> clz) {
         R ret = null;
@@ -56,7 +56,7 @@ public static String capitalize(String s) {
 
     public static boolean isSet(Object o, String name) {
         boolean set = false;
-        if(o != null){
+        if (o != null) {
             Method m = getMethod(o, IS_SET_ROOT + name);
             Object ret = invoke(o, m);
             if (ret != null && ret instanceof Boolean && ((Boolean) ret).booleanValue()) {
diff --git a/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/BooleanParserTest.java b/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/BooleanParserTest.java
index e6a602ba0b6..7745f30eaab 100644
--- a/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/BooleanParserTest.java
+++ b/backend/manager/modules/restapi/interface/definition/src/test/java/org/ovirt/engine/api/utils/BooleanParserTest.java
@@ -74,7 +74,7 @@ private List<String> getCaseCombinations(String text) {
             for (int bitIndex = 0; bitIndex < length; bitIndex++) {
                 int bitValue = combinationIndex & (1 << bitIndex);
                 char character = characters[bitIndex];
-                character = bitValue == 0? Character.toLowerCase(character): Character.toUpperCase(character);
+                character = bitValue == 0 ? Character.toLowerCase(character) : Character.toUpperCase(character);
                 characters[bitIndex] = character;
             }
             result.add(new String(characters));
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/LocalConfig.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/LocalConfig.java
index 36ccf319dff..648c3a29b4f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/LocalConfig.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/LocalConfig.java
@@ -37,7 +37,7 @@ public class LocalConfig {
      */
     public static LocalConfig getInstance() {
         if (instance == null) {
-            synchronized(LocalConfig.class) {
+            synchronized (LocalConfig.class) {
                 if (instance == null) {
                     LocalConfig tmp = new LocalConfig();
                     tmp.config = EngineLocalConfig.getInstance();
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
index e8185c46b12..6fecf960eb9 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendActionableResource.java
@@ -46,7 +46,7 @@ protected Response doAction(final ActionType task, final ActionParametersBase pa
             if (actionResult.getHasAsyncTasks()) {
                 if (expectBlocking(action)) {
                     CreationStatus status = awaitCompletion(actionResult, pollingType);
-                    if (status != CreationStatus.FAILED){
+                    if (status != CreationStatus.FAILED) {
                         Object model = resolveCreated(actionResult, entityResolver, null);
                         return actionStatus(status, action, model);
                     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
index 9715af73d31..3602f734260 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendNetworksResource.java
@@ -80,7 +80,7 @@ protected class NetworkIdResolver extends EntityIdResolver<Guid> {
 
         protected String name;
 
-        NetworkIdResolver() {}
+        NetworkIdResolver() { }
 
         NetworkIdResolver(String name) {
             this.name = name;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
index b6093ebf714..24f4d73517c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendResource.java
@@ -94,9 +94,9 @@ protected CreationStatus getAsynchronousStatus(ActionReturnValue result) {
 
     protected CreationStatus getAsynchronousStatus(ActionReturnValue result, PollingType pollingType) {
         CreationStatus asyncStatus = null;
-        if (pollingType==PollingType.JOB) {
+        if (pollingType == PollingType.JOB) {
             asyncStatus = getJobIdStatus(result);
-        } else if (pollingType==PollingType.VDSM_TASKS){
+        } else if (pollingType == PollingType.VDSM_TASKS) {
             asyncStatus = getVdsmTasksStatus(result);
         } else {
             throw new IllegalStateException("Unexpected Polling Status");
@@ -130,13 +130,13 @@ private CreationStatus getVdsmTasksStatus(ActionReturnValue result) {
      * IN_PROGRESS status.
      */
     protected boolean isAsyncTaskOrJobExists(PollingType pollingType, ActionReturnValue createResult) {
-        if (pollingType==PollingType.VDSM_TASKS) {
+        if (pollingType == PollingType.VDSM_TASKS) {
             //when the polling-type is vdsm_tasks, check for existing async-tasks
             return createResult.getHasAsyncTasks();
-        } else if (pollingType==PollingType.JOB) {
+        } else if (pollingType == PollingType.JOB) {
             //when the polling-type is job, check if the job is pending or in progress
             CreationStatus status = getJobIdStatus(createResult);
-            return status==CreationStatus.PENDING || status==CreationStatus.IN_PROGRESS;
+            return status == CreationStatus.PENDING || status == CreationStatus.IN_PROGRESS;
         }
         return false; //shouldn't reach here
     }
@@ -150,7 +150,7 @@ protected CreationStatus getJobIdStatus(ActionReturnValue result) {
             QueryReturnValue queryResult = runQuery(QueryType.GetJobByJobId, params);
             if (queryResult != null && queryResult.getSucceeded() && queryResult.getReturnValue() != null) {
                 Job job = queryResult.getReturnValue();
-                return job.getStatus()==JobExecutionStatus.STARTED ? CreationStatus.IN_PROGRESS : CreationStatus.COMPLETE;
+                return job.getStatus() == JobExecutionStatus.STARTED ? CreationStatus.IN_PROGRESS : CreationStatus.COMPLETE;
             } else {
                 //not supposed to happen
                 return CreationStatus.COMPLETE;
@@ -236,7 +236,7 @@ protected R addLinks(R model, Class<? extends BaseResource> suggestedParent, Str
     }
 
     protected R addLinks(R model, Class<? extends BaseResource> suggestedParent, boolean doNotLinkSubCollections) {
-        return doNotLinkSubCollections?
+        return doNotLinkSubCollections ?
                 LinkHelper.addLinks(addParents(model), suggestedParent)
                 :
                 addLinks(model, suggestedParent);
@@ -292,7 +292,7 @@ protected R linkSubCollections(R model, Class<? extends BaseResource> suggestedP
         if (subCollections != null) {
             String path = LinkHelper.getPath(model, suggestedParent);
             for (String relation : subCollections) {
-                if(!shouldExclude(relation, subCollectionMembersToExclude)) {
+                if (!shouldExclude(relation, subCollectionMembersToExclude)) {
                     if (path != null) {
                         String href = String.join("/", path, relation);
                         addOrUpdateLink(model, relation, href);
@@ -306,8 +306,8 @@ protected R linkSubCollections(R model, Class<? extends BaseResource> suggestedP
     }
 
     private boolean shouldExclude(String member, String[] subCollectionMembersToExclude) {
-        if(subCollectionMembersToExclude !=null && subCollectionMembersToExclude.length > 0){
-            for(String excludeMember : subCollectionMembersToExclude){
+        if (subCollectionMembersToExclude != null && subCollectionMembersToExclude.length > 0) {
+            for (String excludeMember : subCollectionMembersToExclude) {
                 if (member.equals(excludeMember)) {
                         return true;
                 }
@@ -316,8 +316,8 @@ private boolean shouldExclude(String member, String[] subCollectionMembersToExcl
         return false;
     }
 
-    protected R injectSearchLinks(R resource, String[] rels){
-        for(String rel : rels){
+    protected R injectSearchLinks(R resource, String[] rels) {
+        for (String rel : rels) {
             resource.getLinks().add(LinkCreator.createSearchLink(resource.getHref(), rel));
         }
         return resource;
@@ -500,7 +500,7 @@ private Set<Class<?>> getInterfaces() {
      */
     private ServiceTreeNode getRequiredNode(Class<?> clazz) {
         ServiceTreeNode node = ServiceTree.getNode(clazz);
-        return node==null ? null : node.getSon()!=null ? node.getSon() : node;
+        return node == null ? null : node.getSon() != null ? node.getSon() : node;
     }
 
     private static void addSubCollections(ServiceTreeNode node, List<String> subCollections) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentResource.java
index e9a151f802f..fb6f99cf5a7 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentResource.java
@@ -22,7 +22,7 @@ public abstract class AbstractBackendStorageDomainContentResource<C extends Base
     protected AbstractBackendStorageDomainContentsResource<C, R, Q> parent;
 
     public AbstractBackendStorageDomainContentResource(String id,
-                                                       AbstractBackendStorageDomainContentsResource<C, R, Q>  parent,
+                                                       AbstractBackendStorageDomainContentsResource<C, R, Q> parent,
                                                        Class<R> modelType,
                                                        Class<Q> entityType) {
         super(id, modelType, entityType);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
index d6f13125fe2..85235f4ff94 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendStorageDomainContentsResource.java
@@ -37,7 +37,7 @@ protected Guid getDataCenterId(Action action) {
     }
 
     public Guid getStoragePoolId(Action action) {
-        if(action.getStorageDomain().isSetId()){
+        if (action.getStorageDomain().isSetId()) {
             return getDataCenterId(Guid.createGuidFromStringDefaultEmpty(action.getStorageDomain().getId()));
         } else {
             return getDataCenterId(lookupStorageDomainIdByName(action.getStorageDomain().getName()));
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBaseHostNicLabelResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBaseHostNicLabelResource.java
index 85d60aa6793..8b4e9eadf7c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBaseHostNicLabelResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBaseHostNicLabelResource.java
@@ -50,7 +50,7 @@ void overrideHref(NetworkLabel label) {
         final String href = label.getHref();
         if (href != null) {
             final String[] hRefSegments = href.split("/");
-            if (hRefSegments.length>=2) {
+            if (hRefSegments.length >= 2) {
                 hRefSegments[hRefSegments.length - 2] = getUriPath();
                 final String fixedHref = StringUtils.join(hRefSegments, '/');
                 label.setHref(fixedHref);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractStatisticalQuery.java
index 9372cfcc1e2..de63cc6459c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractStatisticalQuery.java
@@ -99,7 +99,7 @@ public static Statistic clone(Statistic s) {
     }
 
 
-    public List<Statistic> asList(Statistic...statistics) {
+    public List<Statistic> asList(Statistic ... statistics) {
         List<Statistic> list = new ArrayList<>();
         for (Statistic statistic : statistics) {
             list.add(adopt(statistic));
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
index 260c070e9b1..e378b9da67b 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendApiResource.java
@@ -245,7 +245,7 @@ private Response.ResponseBuilder getResponseBuilder(BaseResource response) {
     public Response head() {
         appMode = getCurrent().getApplicationMode();
         Api api;
-        if(appMode == ApplicationMode.GlusterOnly) {
+        if (appMode == ApplicationMode.GlusterOnly) {
             api = getGlusterApi();
         } else {
             api = getApi();
@@ -297,7 +297,7 @@ public Response get() {
      */
     private void setAuthenticatedUser(Api api) {
         QueryReturnValue returnValue = runQuery(QueryType.GetUserBySessionId, new QueryParametersBase());
-        DbUser authenticatedUser = (DbUser)returnValue.getReturnValue();
+        DbUser authenticatedUser = (DbUser) returnValue.getReturnValue();
         User user = new User();
         user.setId(authenticatedUser.getId().toString());
         LinkHelper.addLinks(user);
@@ -312,7 +312,7 @@ private Response getSchema() {
         String version = getCurrent().getVersion();
         String resourcePath = String.format("/v%s/%s", version, API_SCHEMA);
         try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
-             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath);){
+             InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resourcePath);) {
             int count;
             while ((count = is.read(buffer)) != -1) {
                 baos.write(buffer, 0, count);
@@ -371,7 +371,7 @@ private Map<String, Integer> getSystemStatistics() {
 
     @SuppressWarnings("unchecked")
     private Map<String, Integer> asStatisticsMap(Object result) {
-        return (Map<String, Integer>)result;
+        return (Map<String, Integer>) result;
     }
 
     private Api addSummary(Api api) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java
index e64e91c303d..6b455fb3da0 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java
@@ -74,8 +74,8 @@ public Permissions list() {
     }
 
     private List<org.ovirt.engine.core.common.businessentities.Permission> getInheritedPermissions() {
-        ((GetPermissionsForObjectParameters)queryParams).setVdcObjectType(objectType);
-        ((GetPermissionsForObjectParameters)queryParams).setDirectOnly(false);
+        ((GetPermissionsForObjectParameters) queryParams).setVdcObjectType(objectType);
+        ((GetPermissionsForObjectParameters) queryParams).setDirectOnly(false);
         List<org.ovirt.engine.core.common.businessentities.Permission> inheritedPermissions =
                 getBackendCollection(queryType, queryParams);
         for (org.ovirt.engine.core.common.businessentities.Permission entity : inheritedPermissions) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResource.java
index f41c9e87dbe..8172dd19818 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResource.java
@@ -82,7 +82,7 @@ protected Guid lookupStorageDomainIdByName(String name) {
                 "Storage: name=" + name).getId();
     }
 
-    protected org.ovirt.engine.core.common.businessentities.StorageDomain  lookupStorageDomainById(Guid storageDomainId) {
+    protected org.ovirt.engine.core.common.businessentities.StorageDomain lookupStorageDomainById(Guid storageDomainId) {
         return getEntity(org.ovirt.engine.core.common.businessentities.StorageDomain.class,
                          QueryType.GetStorageDomainByIdAndStoragePoolId,
                          new StorageDomainAndPoolQueryParameters(storageDomainId, dataCenterId),
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterResource.java
index dbec0a7643c..2d5a5a01d0d 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClusterResource.java
@@ -187,7 +187,7 @@ public ClusterExternalProvidersResource getExternalNetworkProvidersResource() {
 
     @Override
     public void follow(ActionableResource entity, LinksTreeNode linksTree) {
-        org.ovirt.engine.api.model.Cluster cluster = (org.ovirt.engine.api.model.Cluster)entity;
+        org.ovirt.engine.api.model.Cluster cluster = (org.ovirt.engine.api.model.Cluster) entity;
         removeGlusterVolumesFromFollowTree(linksTree, cluster);
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
index 3d5bf850758..513c9770daa 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendClustersResource.java
@@ -153,7 +153,7 @@ protected org.ovirt.engine.api.model.Cluster doPopulate(org.ovirt.engine.api.mod
 
     @Override
     public void follow(ActionableResource entity, LinksTreeNode linksTree) {
-        Clusters clusters = (Clusters)entity;
+        Clusters clusters = (Clusters) entity;
         for (org.ovirt.engine.api.model.Cluster cluster : clusters.getClusters()) {
             BackendClusterResource.removeGlusterVolumesFromFollowTree(linksTree, cluster);
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterResource.java
index 4370bab592c..e39d8301fa6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterResource.java
@@ -144,7 +144,7 @@ public static StoragePool getStoragePool(DataCenter dataCenter, AbstractBackendR
      * storagedomain.
      */
     @SuppressWarnings("unchecked")
-    public static  List<StoragePool> getStoragePools(Guid storageDomainId, AbstractBackendResource parent) {
+    public static List<StoragePool> getStoragePools(Guid storageDomainId, AbstractBackendResource parent) {
         return parent.getEntity(List.class,
                 QueryType.GetStoragePoolsByStorageDomainId,
                 new IdQueryParameters(storageDomainId),
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java
index 793a3677da4..72c3c02b105 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDataCentersResource.java
@@ -43,7 +43,7 @@ public DataCenterResource getDataCenterResource(String id) {
     @Override
     public Response add(DataCenter dataCenter) {
         validateParameters(dataCenter, "name");
-        if(!dataCenter.isSetLocal()) {
+        if (!dataCenter.isSetLocal()) {
             validateParameters(dataCenter, "local");
         }
         StoragePool entity = map(dataCenter);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDiskSnapshotsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDiskSnapshotsResource.java
index c74d2575a42..a94313d5196 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDiskSnapshotsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDiskSnapshotsResource.java
@@ -54,11 +54,11 @@ protected DiskSnapshots mapCollection(List<org.ovirt.engine.core.common.business
     }
 
     protected String buildHref(String diskId, String snapshotId) {
-        return  "/ovirt-engine/api/disks/" + diskId + "/disksnapshots/" + snapshotId;
+        return "/ovirt-engine/api/disks/" + diskId + "/disksnapshots/" + snapshotId;
     }
 
     protected String buildParentHref(String diskId, boolean addDiskSnapshots) {
-        return  "/ovirt-engine/api/disks/" + diskId + (addDiskSnapshots ? "/disksnapshots" :"");
+        return "/ovirt-engine/api/disks/" + diskId + (addDiskSnapshots ? "/disksnapshots" : "");
     }
 
     @Override
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
index 2bebdffc12e..8d0f99fa708 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java
@@ -85,7 +85,7 @@ private AddExternalEventParameters getParameters(Event event) {
                 ExternalStatusMapper.map(event.getStorageDomain().getExternalStatus())
             );
         } else {
-            parameters =  new AddExternalEventParameters(map(event), null);
+            parameters = new AddExternalEventParameters(map(event), null);
         }
         return parameters;
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResource.java
index 05da5c12510..3ee63e336e6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResource.java
@@ -52,7 +52,7 @@ private List<Provider> getBackendCollection() {
 
     private ExternalNetworkProviderConfigurations mapCollection(List<Provider> externalNetworkProviders) {
         ExternalNetworkProviderConfigurations result = new ExternalNetworkProviderConfigurations();
-        for(Provider externalNetworkProvider: externalNetworkProviders) {
+        for (Provider externalNetworkProvider: externalNetworkProviders) {
             result.getExternalNetworkProviderConfigurations().add(addLinks(populate(map(externalNetworkProvider), null), Host.class));
         }
         return result;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
index a30cacb7819..a90c9bac089 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResource.java
@@ -101,7 +101,7 @@ protected HostNic deprecatedPopulate(HostNic model, VdsNetworkInterface entity)
 
     private org.ovirt.engine.core.common.businessentities.network.Network getNewNetwork(HostNic nic) {
         org.ovirt.engine.core.common.businessentities.network.Network newNetwork = null;
-        if(nic.isSetNetwork()){
+        if (nic.isSetNetwork()) {
             newNetwork = map(nic.getNetwork(), parent.lookupClusterNetwork(nic.getNetwork()));
         }
         return newNetwork;
@@ -116,7 +116,7 @@ private org.ovirt.engine.core.common.businessentities.network.Network getOldNetw
                                                                     originalInter.getVdsId(),
                                                                     originalInter);
             List<VdsNetworkInterface> vlans = getBackendCollection(VdsNetworkInterface.class, QueryType.GetAllChildVlanInterfaces, params);
-            if (vlans!=null && !vlans.isEmpty()) {
+            if (vlans != null && !vlans.isEmpty()) {
                 return lookupAtachedNetwork(vlans.get(0).getNetworkName());
             } else {
                 return null;
@@ -125,9 +125,9 @@ private org.ovirt.engine.core.common.businessentities.network.Network getOldNetw
     }
 
     private org.ovirt.engine.core.common.businessentities.network.Network lookupAtachedNetwork(String networkName) {
-        if(!StringUtils.isEmpty(networkName)){
-            for(org.ovirt.engine.core.common.businessentities.network.Network nwk : parent.getClusterNetworks()){
-                if(nwk.getName().equals(networkName)) {
+        if (!StringUtils.isEmpty(networkName)) {
+            for (org.ovirt.engine.core.common.businessentities.network.Network nwk : parent.getClusterNetworks()) {
+                if (nwk.getName().equals(networkName)) {
                     return nwk;
                 }
             }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
index 7203cfbc5eb..7561cacc480 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostNicsResource.java
@@ -80,7 +80,7 @@ public HostNics list() {
     private Map<String, Guid> mapNetworkNamesToNetworkIds() {
         List<org.ovirt.engine.core.common.businessentities.network.Network> clusterNetworks = getClusterNetworks();
         Map<String, Guid> networkIdByName = new HashMap<>();
-        for(org.ovirt.engine.core.common.businessentities.network.Network nwk : clusterNetworks) {
+        for (org.ovirt.engine.core.common.businessentities.network.Network nwk : clusterNetworks) {
             networkIdByName.put(nwk.getName(), nwk.getId());
         }
         return networkIdByName;
@@ -309,7 +309,7 @@ protected VdsNetworkInterface map(HostNic entity, VdsNetworkInterface template)
     }
 
     protected HostNic addSlaveLinks(HostNic nic, List<VdsNetworkInterface> ifaces) {
-        if(nic.getBonding() == null) {
+        if (nic.getBonding() == null) {
             nic.setBonding(new Bonding());
         }
         nic.getBonding().setSlaves(new HostNics());
@@ -336,7 +336,7 @@ protected HostNic slave(String id) {
     protected HostNic addActiveSlaveLink(HostNic nic, VdsNetworkInterface iface, List<VdsNetworkInterface> ifaces) {
         if (iface instanceof Bond) {
             Bond bond = (Bond) iface;
-            if(nic.getBonding() == null) {
+            if (nic.getBonding() == null) {
                 nic.setBonding(new Bonding());
             }
             for (VdsNetworkInterface i : ifaces) {
@@ -410,23 +410,23 @@ private void addStatistics(HostNic model, VdsNetworkInterface entity) {
     }
 
     @SuppressWarnings("unchecked")
-    protected List<org.ovirt.engine.core.common.businessentities.network.Network> getClusterNetworks(){
+    protected List<org.ovirt.engine.core.common.businessentities.network.Network> getClusterNetworks() {
         VDS vds = getEntity(VDS.class, QueryType.GetVdsByVdsId, new IdQueryParameters(Guid.createGuidFromStringDefaultEmpty(getHostId())), "Host");
         return getEntity(List.class, QueryType.GetAllNetworksByClusterId, new IdQueryParameters(vds.getClusterId()), "Networks");
     }
 
     public org.ovirt.engine.core.common.businessentities.network.Network lookupClusterNetwork(Network net) {
         List<org.ovirt.engine.core.common.businessentities.network.Network> networks = getClusterNetworks();
-        if(net.isSetId()){
-            for(org.ovirt.engine.core.common.businessentities.network.Network nwk : networks){
+        if (net.isSetId()) {
+            for (org.ovirt.engine.core.common.businessentities.network.Network nwk : networks) {
                 if (nwk.getId().toString().equals(net.getId())) {
                     return nwk;
                 }
             }
-        }else{
+        } else {
             String networkName = net.getName();
-            for(org.ovirt.engine.core.common.businessentities.network.Network nwk : networks){
-                if(nwk.getName().equals(networkName)) {
+            for (org.ovirt.engine.core.common.businessentities.network.Network nwk : networks) {
+                if (nwk.getName().equals(networkName)) {
                     return nwk;
                 }
             }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java
index ab434cb18d3..edfd12b50da 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java
@@ -114,7 +114,7 @@ public Host update(Host incoming) {
         BackendExternalProviderHelper.completeExternalNetworkProviderConfigurations(this,
                 incoming.getExternalNetworkProviderConfigurations());
         // if fence agents list is null set it to null in entity
-        if(incoming.getAgents() == null) {
+        if (incoming.getAgents() == null) {
             entity.setFenceAgents(null);
         }
         if (incoming.isSetCluster() && (incoming.getCluster().isSetId() || incoming.getCluster().isSetName())) {
@@ -349,7 +349,7 @@ private HostSetupNetworksParameters toParameters(Action action) {
     private void completeSlaveNames(BusinessEntityMap<VdsNetworkInterface> nicsFromBackend, HostNic bond) {
         if (bond.isSetBonding() && bond.getBonding().isSetSlaves()) {
             for (HostNic slave : bond.getBonding().getSlaves().getHostNics()) {
-                if (!slave.isSetName() && slave.isSetId()){
+                if (!slave.isSetName() && slave.isSetId()) {
                     Guid slaveId = new Guid(slave.getId());
                     String slaveNameFromBackend = nicsFromBackend.get(slaveId).getName();
                     slave.setName(slaveNameFromBackend);
@@ -398,7 +398,7 @@ public NetworkAttachment mapNetworkAttachment(Map<Guid, NetworkAttachment> attac
             }
         }
 
-        return networkAttachmentMapper.map(model,  attachment);
+        return networkAttachmentMapper.map(model, attachment);
     }
 
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
index 6b24d5a11cd..ae23a5f5a43 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostStorageResource.java
@@ -34,7 +34,7 @@ public HostStorages list() {
         for (LUNs lun : getLogicalUnits()) {
             HostStorage storage = map(lun);
             List<StorageServerConnections> lunConnections = lun.getLunConnections();
-            if (lunConnections!=null && !lunConnections.isEmpty()) {
+            if (lunConnections != null && !lunConnections.isEmpty()) {
                 getMapper(StorageServerConnections.class, LogicalUnit.class).map(lunConnections.get(0),
                         storage.getLogicalUnits().getLogicalUnits().get(0));
             }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeResource.java
index 3e5d5fde9d4..3bf2882584c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeResource.java
@@ -136,7 +136,7 @@ public ActionParametersBase getParameters(InstanceType incoming, org.ovirt.engin
                 updateParams.setUpdateRngDevice(true);
                 updateParams.setRngDevice(RngDeviceMapper.map(incoming.getRngDevice(), null));
             }
-            if(incoming.isSetSoundcardEnabled()) {
+            if (incoming.isSetSoundcardEnabled()) {
                 updateParams.setSoundDeviceEnabled(incoming.isSoundcardEnabled());
             }
             if (incoming.isSetVirtioScsi()) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondResource.java
index bf3f5362b02..cfdc0c5bc07 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendIscsiBondResource.java
@@ -16,7 +16,7 @@ public class BackendIscsiBondResource
     extends AbstractBackendActionableResource<IscsiBond, org.ovirt.engine.core.common.businessentities.IscsiBond>
     implements IscsiBondResource {
 
-    public  BackendIscsiBondResource(String id) {
+    public BackendIscsiBondResource(String id) {
         super(id, IscsiBond.class, org.ovirt.engine.core.common.businessentities.IscsiBond.class);
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobResource.java
index 70d101e456f..b4c0f984eab 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendJobResource.java
@@ -13,7 +13,7 @@
 import org.ovirt.engine.core.common.queries.IdQueryParameters;
 import org.ovirt.engine.core.common.queries.QueryType;
 
-public class BackendJobResource extends AbstractBackendActionableResource<Job, org.ovirt.engine.core.common.job.Job> implements JobResource{
+public class BackendJobResource extends AbstractBackendActionableResource<Job, org.ovirt.engine.core.common.job.Job> implements JobResource {
 
     public BackendJobResource(String id) {
         super(id, Job.class, org.ovirt.engine.core.common.job.Job.class);
@@ -43,7 +43,7 @@ public Response clear(Action action) {
 
     @Override
     public Job get() {
-        IdQueryParameters params =  new IdQueryParameters(guid);
+        IdQueryParameters params = new IdQueryParameters(guid);
         return performGet(QueryType.GetJobByJobId, params);
      }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendMacPoolsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendMacPoolsResource.java
index 49ef3e762b2..3be7dc92ef2 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendMacPoolsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendMacPoolsResource.java
@@ -17,7 +17,7 @@
 
 public class BackendMacPoolsResource
         extends AbstractBackendCollectionResource<MacPool, org.ovirt.engine.core.common.businessentities.MacPool>
-        implements MacPoolsResource{
+        implements MacPoolsResource {
 
     public BackendMacPoolsResource() {
         super(MacPool.class, org.ovirt.engine.core.common.businessentities.MacPool.class);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
index caff49baaa7..78109318ee1 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendResource.java
@@ -151,7 +151,7 @@ protected <T> List<T> getBackendCollection(Class<T> clz, QueryType query, QueryP
         try {
             List<T> results = asCollection(clz, new ArrayList<T>());
             QueryReturnValue result = runQuery(query, queryParams);
-            if (result!=null ) {
+            if (result != null ) {
                 if (!result.getSucceeded()) {
                     backendFailure(result.getExceptionString());
                 }
@@ -224,7 +224,7 @@ protected boolean expectNonBlocking() {
     protected Response performNonBlockingAction(ActionType task, ActionParametersBase params, Action action) {
         try {
             doNonBlockingAction(task, params);
-            if (action!=null) {
+            if (action != null) {
                 action.setStatus(CreationStatus.IN_PROGRESS.value());
                 return Response.status(Response.Status.ACCEPTED).entity(action).build();
             } else {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java
index 5f4d5ae5a17..5686d6e3b90 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotDisksResource.java
@@ -9,7 +9,7 @@
 import org.ovirt.engine.core.common.businessentities.VM;
 import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
 
-public class BackendSnapshotDisksResource extends AbstractBackendCollectionResource<Disk, Snapshot>  implements SnapshotDisksResource {
+public class BackendSnapshotDisksResource extends AbstractBackendCollectionResource<Disk, Snapshot> implements SnapshotDisksResource {
 
     protected BackendSnapshotResource parent;
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java
index f8d55017151..f0e0dff151b 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotResource.java
@@ -48,7 +48,7 @@ public Snapshot get() {
 
     protected org.ovirt.engine.core.common.businessentities.Snapshot getSnapshot() {
         org.ovirt.engine.core.common.businessentities.Snapshot entity = collection.getSnapshotById(guid);
-        if (entity==null) {
+        if (entity == null) {
             notFound();
         }
         return entity;
@@ -83,13 +83,13 @@ public Response restore(Action action) {
                 tryBackParams,
                 action,
                 PollingType.JOB);
-        if (response.getStatus()==Response.Status.OK.getStatusCode()) {
+        if (response.getStatus() == Response.Status.OK.getStatusCode()) {
             RestoreAllSnapshotsParameters restoreParams = new RestoreAllSnapshotsParameters(parentId, SnapshotActionEnum.COMMIT);
             restoreParams.setCorrelationId(RESTORE_SNAPSHOT_CORRELATION_ID);
             Response response2 = doAction(ActionType.RestoreAllSnapshots,
                     restoreParams,
                     action);
-            if (response2.getStatus()!=Response.Status.OK.getStatusCode()) {
+            if (response2.getStatus() != Response.Status.OK.getStatusCode()) {
                 return response2;
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepResource.java
index 56b3d49cdc1..70e642d95d6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepResource.java
@@ -20,7 +20,7 @@
 import org.ovirt.engine.core.common.queries.gluster.GlusterVolumeQueriesParameters;
 import org.ovirt.engine.core.compat.Guid;
 
-public class BackendStepResource extends AbstractBackendActionableResource<org.ovirt.engine.api.model.Step, org.ovirt.engine.core.common.job.Step> implements StepResource{
+public class BackendStepResource extends AbstractBackendActionableResource<org.ovirt.engine.api.model.Step, org.ovirt.engine.core.common.job.Step> implements StepResource {
 
     private BackendStepsResource parent;
 
@@ -47,7 +47,7 @@ protected Step addParents(Step model) {
     public Response end(Action action) {
         EndExternalStepParameters parameters = new EndExternalStepParameters(
             guid,
-            action.isSetSucceeded() ? action.isSucceeded(): true
+            action.isSetSucceeded() ? action.isSucceeded() : true
         );
         return doAction(ActionType.EndExternalStep, parameters, action);
     }
@@ -58,7 +58,7 @@ public Step get() {
     }
 
     private Step getStepById(Guid id) {
-        IdQueryParameters params =  new IdQueryParameters(id);
+        IdQueryParameters params = new IdQueryParameters(id);
         Step step = performGet(QueryType.GetStepWithSubjectEntitiesByStepId, params);
         return step;
     }
@@ -76,7 +76,7 @@ public TaskQueryResolver() {
 
         @Override
         public GlusterVolumeTaskStatusEntity resolve(Guid id) throws BackendFailureException {
-            org.ovirt.engine.core.common.job.Step stepEntity =  getEntity(org.ovirt.engine.core.common.job.Step.class,
+            org.ovirt.engine.core.common.job.Step stepEntity = getEntity(org.ovirt.engine.core.common.job.Step.class,
                     QueryType.GetStepWithSubjectEntitiesByStepId,
                     new IdQueryParameters(id),
                     null,
@@ -108,7 +108,7 @@ public GlusterVolumeTaskStatusEntity resolve(Guid id) throws BackendFailureExcep
             case REMOVING_BRICKS:
                 List<GlusterBrickEntity> bricks = new ArrayList<>();
                 for (GlusterBrickEntity brick: volume.getBricks()) {
-                    if (brick.getAsyncTask()!=null && brick.getAsyncTask().getTaskId()!=null) {
+                    if (brick.getAsyncTask() != null && brick.getAsyncTask().getTaskId() != null) {
                         bricks.add(brick);
                     }
                 }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
index c26758fbde5..83a38374289 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStepsResource.java
@@ -64,7 +64,7 @@ protected Steps mapCollection(List<org.ovirt.engine.core.common.job.Step> entiti
     }
 
     public Step injectParent(Step step) {
-        if (step.getParentStep() !=null) {
+        if (step.getParentStep() != null) {
             step.getParentStep()
             .setHref(step.getHref()
                     .replace(step.getId(), step.getParentStep().getId()));
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskSnapshotResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskSnapshotResource.java
index 02ddd8152c1..6f0d88f812c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskSnapshotResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDiskSnapshotResource.java
@@ -28,7 +28,7 @@ public String getStorageDomainId() {
 
     @Override
     public DiskSnapshot get() {
-        DiskSnapshot diskSnapshot =  performGet(QueryType.GetDiskSnapshotByImageId, new IdQueryParameters(guid), StorageDomain.class);
+        DiskSnapshot diskSnapshot = performGet(QueryType.GetDiskSnapshotByImageId, new IdQueryParameters(guid), StorageDomain.class);
 
         // this code generates back-link to the corresponding SD
         diskSnapshot.setStorageDomain(new StorageDomain());
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
index 52e6c78beaf..a47029f3671 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResource.java
@@ -110,9 +110,9 @@ public Response doImport(Action action) {
         params.setImageToDestinationDomainMap(getDiskToDestinationMap(action));
         params.setForceOverride(action.isSetExclusive() ? action.isExclusive() : false);
 
-        if (action.isSetClone()){
+        if (action.isSetClone()) {
             params.setImportAsNewEntity(action.isClone());
-            if(action.isSetTemplate() && action.getTemplate().isSetName()) {
+            if (action.isSetTemplate() && action.getTemplate().isSetName()) {
                 params.getVmTemplate().setName(action.getTemplate().getName());
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
index 7b6be58dc07..b6fe26aba1f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResource.java
@@ -61,7 +61,7 @@ public Response remove() {
     private Guid getHostId(String host) {
         try {
             return Guid.createGuidFromString(host);
-        } catch(IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             VdsStatic entity = getEntity(
                 VdsStatic.class,
                 QueryType.GetVdsStaticByName,
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSystemPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSystemPermissionsResource.java
index 06af65cd845..f3f5234f367 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSystemPermissionsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendSystemPermissionsResource.java
@@ -16,7 +16,7 @@
  * This resource corresponds to the permissions assigned to the system object.
  */
 public class BackendSystemPermissionsResource extends BackendAssignedPermissionsResource
-    implements SystemPermissionsResource{
+    implements SystemPermissionsResource {
 
     public BackendSystemPermissionsResource() {
         super(
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagResource.java
index 4a6a013c4bc..a90ab85923c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendTagResource.java
@@ -41,7 +41,7 @@ public Tag update(Tag incoming) {
         }
 
         Tag existingTag = get();
-        String existingTagParentId = existingTag.isSetParent()? existingTag.getParent().getId(): null;
+        String existingTagParentId = existingTag.isSetParent() ? existingTag.getParent().getId() : null;
         if (isSetParent(incoming) && !incoming.getParent().getId().equals(existingTagParentId)) {
             moveTag(asGuid(incoming.getParent().getId()));
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDeviceHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDeviceHelper.java
index a89512cff70..5ca1d39d10f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDeviceHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDeviceHelper.java
@@ -39,13 +39,13 @@ public static void setPayload(BackendResource resouce, Vm vm) {
                 payloads.getPayloads().add(p);
                 vm.setPayloads(payloads);
             }
-        } catch(WebApplicationException ex) {
-            if (ex.getResponse().getStatus()== Response.Status.NOT_FOUND.getStatusCode()) {
+        } catch (WebApplicationException ex) {
+            if (ex.getResponse().getStatus() == Response.Status.NOT_FOUND.getStatusCode()) {
                 //It's legal to not receive a payload for this VM, so the exception is caught and ignored.
                 //(TODO: 'getEntity()' should be refactored to make it the programmer's decision,
                 //whether to throw an exception or not in case the entity is not found.) Then
                 //this try-catch won't be necessary.
-            } else{
+            } else {
                 throw ex;
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
index 5ebfb1b612d..cad829db079 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResource.java
@@ -240,7 +240,7 @@ private DiskVmElement updateDiskVmElementFromDisk(Disk disk, DiskVmElement diskV
             diskVmElement.setDiskInterface(DiskMapper.mapInterface(disk.getInterface()));
         }
 
-        if(disk.isSetBootable()) {
+        if (disk.isSetBootable()) {
             diskVmElement.setBoot(disk.isBootable());
         }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java
index 94efe223565..e55fa55eb8a 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResource.java
@@ -174,7 +174,7 @@ private VmTemplate lookupTemplateByName(String name) {
     @Override
     public Response allocateVm(Action action) {
         return doAction(ActionType.AttachUserToVmFromPoolAndRun,
-                        new AttachUserToVmFromPoolAndRunParameters(guid,  getCurrent().getUser().getId()),
+                        new AttachUserToVmFromPoolAndRunParameters(guid, getCurrent().getUser().getId()),
                         action,
                         new VmQueryIdResolver(QueryType.GetVmByVmId,
                                               IdQueryParameters.class));
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java
index 72107a9ca5a..af6b9791416 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolsResource.java
@@ -68,7 +68,7 @@ public VmPools list() {
     private boolean isSortedAndMaxResults() {
         String searchConstraint = QueryHelper.getConstraint(httpHeaders, uriInfo, "", modelType);
         int max = ParametersHelper.getIntegerParameter(httpHeaders, uriInfo, "max", -1, -1);
-        return searchConstraint!=null
+        return searchConstraint != null
                 && !searchConstraint.isEmpty()
                 && searchConstraint.toLowerCase().contains("sortby name asc")
                 && max != -1;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
index 1eec1ed5597..4b7afdf1c70 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmResource.java
@@ -402,7 +402,7 @@ public Response doClone(Action action) {
         }
 
         ActionType actionType = !action.isSetDiscardSnapshots() || action.isDiscardSnapshots() ?
-                ActionType.CloneVm:
+                ActionType.CloneVm :
                 ActionType.CloneVmNoCollapse;
 
         Response response = doAction(actionType,
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
index 58e3069b9b9..5ae7d830845 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmSessionsResource.java
@@ -37,7 +37,7 @@ public BackendVmSessionsResource(Guid vmId) {
     @Override
     public Sessions list() {
         Object obj = getEntity(entityType, QueryType.GetVmByVmId, new IdQueryParameters(vmId), vmId.toString(), true);
-        VM vm = (VM)obj;
+        VM vm = (VM) obj;
         Sessions sessions = VmMapper.map(vm, new Sessions());
         org.ovirt.engine.api.model.Vm vmModel = new org.ovirt.engine.api.model.Vm();
         vmModel.setId(vm.getId().toString());
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
index f801d8ac381..f2b51f25746 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendVmsResource.java
@@ -583,7 +583,7 @@ private boolean shouldCopyDevice(boolean isCompatibleWithCluster, Guid templateI
     private Map<Guid, DiskImage> getDisksToClone(DiskAttachments diskAttachments, Guid templateId) {
         Map<Guid, DiskImage> disksMap = new HashMap<>();
 
-        if (diskAttachments != null && diskAttachments.isSetDiskAttachments() && diskAttachments.getDiskAttachments().size() > 0){
+        if (diskAttachments != null && diskAttachments.isSetDiskAttachments() && diskAttachments.getDiskAttachments().size() > 0) {
             Map<Guid, DiskImage> templatesDisksMap = getTemplateDisks(templateId);
             for (DiskAttachment diskAttachment : diskAttachments.getDiskAttachments()) {
                 Disk disk = diskAttachment.getDisk();
@@ -620,7 +620,7 @@ private Map<Guid, DiskImage> getTemplateDisks(Guid templateId) {
     }
 
     private DiskImage map(Disk entity, DiskImage template) {
-        return (DiskImage)getMapper(Disk.class, org.ovirt.engine.core.common.businessentities.storage.Disk.class).map(entity, template);
+        return (DiskImage) getMapper(Disk.class, org.ovirt.engine.core.common.businessentities.storage.Disk.class).map(entity, template);
     }
 
     protected Response addVm(VmStatic staticVm, Vm vm, Guid storageDomainId, VmTemplate template, InstanceType instanceType, Cluster cluster) {
@@ -669,8 +669,8 @@ protected Response addVmFromScratch(VmStatic staticVm, Vm vm, InstanceType insta
     }
 
     public List<DiskImage> mapDisks(Disks disks) {
-        if (disks!=null && disks.isSetDisks()) {
-            return disks.getDisks().stream().map(d -> (DiskImage)DiskMapper.map(d, null)).collect(Collectors.toList());
+        if (disks != null && disks.isSetDisks()) {
+            return disks.getDisks().stream().map(d -> (DiskImage) DiskMapper.map(d, null)).collect(Collectors.toList());
         }
         return null;
     }
@@ -756,7 +756,7 @@ protected Vms mapCollection(List<org.ovirt.engine.core.common.businessentities.V
     @Override
     public void follow(ActionableResource entity, LinksTreeNode linksTree) {
         super.follow(entity, linksTree);
-        if(DetailHelper.getDetails(httpHeaders, uriInfo).contains(CURRENT_GRAPHICS_CONSOLES)) {
+        if (DetailHelper.getDetails(httpHeaders, uriInfo).contains(CURRENT_GRAPHICS_CONSOLES)) {
             // "?detail=current_graphics_consoles" provides the same output as
             // "?current&follow=graphics_consoles" and similar as "current" flag will
             // overwrite the default output of "?follow=graphics_consoles"
@@ -968,7 +968,7 @@ protected Set<Guid> validateAndUpdateHostsInPlacementPolicy(VmPlacementPolicy pl
     }
 
     private void updateIdForSingleHost(Host host, Set<Guid> guidsSet) {
-        if (host.isSetName() && !host.isSetId()){
+        if (host.isSetName() && !host.isSetId()) {
             // find the corresponding host id
             Guid hostGuid = getHostId(host);
             if (hostGuid != null) {
@@ -976,7 +976,7 @@ private void updateIdForSingleHost(Host host, Set<Guid> guidsSet) {
                 // add hostId element to host
                 host.setId(hostGuid.toString());
             }
-        } else if (host.isSetId()){
+        } else if (host.isSetId()) {
             guidsSet.add(Guid.createGuidFromString(host.getId()));
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
index 1cebb85f142..cd6489a9007 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BaseBackendResource.java
@@ -255,7 +255,7 @@ protected <T> T handleError(Class<T> clz, Exception e, boolean notFoundAs404) {
     protected <T> List<T> asCollection(Class<T> clz, Object o) {
         List<T> collection = null;
         if (o instanceof List) {
-            collection = (List<T>)o;
+            collection = (List<T>) o;
         } else if (clz.isInstance(o)) {
             collection = new ArrayList<>();
             collection.add(clz.cast(o));
@@ -272,7 +272,7 @@ static <T> ArrayList<T> asList(T t) {
     protected Guid asGuid(String id) {
         try {
             return new Guid(id);
-        }catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             throw new MalformedIdException(e);
         }
     }
@@ -288,7 +288,7 @@ protected Guid asGuid(byte[] guid) {
     protected Long asLong(String id) {
         try {
             return Long.valueOf(id);
-        }catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             throw new MalformedIdException(e);
         }
     }
@@ -421,7 +421,7 @@ protected boolean isFiltered() {
      */
     public final void follow (ActionableResource entity) {
         String followValue = ParametersHelper.getParameter(getHttpHeaders(), getUriInfo(), FOLLOW);
-        if (followValue!=null && !followValue.equals("")) {
+        if (followValue != null && !followValue.equals("")) {
             ParametersHelper.removeParameter(FOLLOW);
             ParametersHelper.removeParameter(MAX);
             LinksTreeNode linksTree = linkFollower.createLinksTree(entity.getClass(), followValue);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BrickStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BrickStatisticalQuery.java
index a8573531691..77bb98b50df 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BrickStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BrickStatisticalQuery.java
@@ -14,19 +14,19 @@
 import org.ovirt.engine.core.compat.Guid;
 
 public class BrickStatisticalQuery extends AbstractStatisticalQuery<GlusterBrick, GlusterBrickEntity> {
-    private static final Statistic MEM_TOTAL_SIZE   = create("memory.total.size", "Total size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_FREE_SIZE   = create("memory.free.size", "Free size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_BLOCK_SIZE   = create("memory.block.size", "Block size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_ARENA   = create("malloc.arena", "Total memory allocated - Non mmapped", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_ORDBLKS   = create("malloc.ordblks", "No. of ordinary free blocks", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_SMBLKS   = create("malloc.smblks", "No. of free fastbin blocks", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_HBLKS   = create("malloc.hblks", "No. of mmapped blocks allocated", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_HBLKSHD   = create("malloc.hblkhd", "Space allocated in mmapped blocks", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_USMBLKS   = create("malloc.usmblks", "Maximum total allocated space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_FSMBLKS   = create("malloc.fsmblks", "Space in free fastbin blocks", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_UORDBLKS   = create("malloc.uordblks", "Total allocated space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_FORDBLKS   = create("malloc.fordblks", "Total free space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_MALL_KEEPCOST   = create("malloc.keepcost", "Releasable free space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_TOTAL_SIZE = create("memory.total.size", "Total size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_FREE_SIZE = create("memory.free.size", "Free size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_BLOCK_SIZE = create("memory.block.size", "Block size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_ARENA = create("malloc.arena", "Total memory allocated - Non mmapped", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_ORDBLKS = create("malloc.ordblks", "No. of ordinary free blocks", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_SMBLKS = create("malloc.smblks", "No. of free fastbin blocks", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_HBLKS = create("malloc.hblks", "No. of mmapped blocks allocated", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_HBLKSHD = create("malloc.hblkhd", "Space allocated in mmapped blocks", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_USMBLKS = create("malloc.usmblks", "Maximum total allocated space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_FSMBLKS = create("malloc.fsmblks", "Space in free fastbin blocks", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_UORDBLKS = create("malloc.uordblks", "Total allocated space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_FORDBLKS = create("malloc.fordblks", "Total free space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_MALL_KEEPCOST = create("malloc.keepcost", "Releasable free space", GAUGE, StatisticUnit.BYTES, ValueType.INTEGER);
 
     public BrickStatisticalQuery(GlusterBrick parent ) {
         this(null, parent);
@@ -43,7 +43,7 @@ public List<Statistic> getStatistics(GlusterBrickEntity entity) {
         return asList(setDatum(clone(MEM_TOTAL_SIZE), brickDetails.getBrickProperties().getTotalSize() * Mb),
                       setDatum(clone(MEM_FREE_SIZE), brickDetails.getBrickProperties().getFreeSize() * Mb),
                       setDatum(clone(MEM_BLOCK_SIZE), brickDetails.getBrickProperties().getBlockSize() * Mb),
-                      setDatum(clone(MEM_MALL_ARENA),   mallInfo.getArena()),
+                      setDatum(clone(MEM_MALL_ARENA), mallInfo.getArena()),
                       setDatum(clone(MEM_MALL_ORDBLKS), mallInfo.getOrdblks()),
                       setDatum(clone(MEM_MALL_SMBLKS), mallInfo.getSmblks()),
                       setDatum(clone(MEM_MALL_HBLKS), mallInfo.getHblks()),
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQuery.java
index 79fc07c6b43..4f93b3a4313 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/DiskStatisticalQuery.java
@@ -13,8 +13,8 @@
 
 public class DiskStatisticalQuery extends AbstractStatisticalQuery<Disk, org.ovirt.engine.core.common.businessentities.storage.Disk> {
 
-    static final Statistic DATA_READ  = create("data.current.read",  "Read data rate",  GAUGE, BYTES_PER_SECOND, DECIMAL);
-    static final Statistic DATA_READ_OPS  = create("data.current.read_ops",  "Read data ops",  COUNTER, StatisticUnit.NONE, DECIMAL);
+    static final Statistic DATA_READ = create("data.current.read", "Read data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
+    static final Statistic DATA_READ_OPS = create("data.current.read_ops", "Read data ops", COUNTER, StatisticUnit.NONE, DECIMAL);
     static final Statistic DATA_WRITE = create("data.current.write", "Write data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
     static final Statistic DATA_WRITE_OPS = create("data.current.write_ops", "Write data ops", COUNTER, StatisticUnit.NONE, DECIMAL);
     static final Statistic READ_LATENCY = create("disk.read.latency", "Read latency", GAUGE, StatisticUnit.SECONDS, DECIMAL);
@@ -37,9 +37,9 @@ public List<Statistic> getStatistics(org.ovirt.engine.core.common.businessentiti
                       setDatum(clone(DATA_READ_OPS), disk.getReadOps()),
                       setDatum(clone(DATA_WRITE), disk.getWriteRate()),
                       setDatum(clone(DATA_WRITE_OPS), disk.getWriteOps()),
-                      setDatum(clone(READ_LATENCY), disk.getReadLatency()==null ? 0.0 : disk.getReadLatency()),
-                      setDatum(clone(WRITE_LATENCY), disk.getWriteLatency()==null ? 0.0 : disk.getWriteLatency()),
-                      setDatum(clone(FLUSH_LATENCY), disk.getFlushLatency()==null ? 0.0 : disk.getFlushLatency()));
+                      setDatum(clone(READ_LATENCY), disk.getReadLatency() == null ? 0.0 : disk.getReadLatency()),
+                      setDatum(clone(WRITE_LATENCY), disk.getWriteLatency() == null ? 0.0 : disk.getWriteLatency()),
+                      setDatum(clone(FLUSH_LATENCY), disk.getFlushLatency() == null ? 0.0 : disk.getFlushLatency()));
         }
         return asList(setDatum(clone(DATA_READ), 0), setDatum(clone(DATA_WRITE), 0));
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostNicStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostNicStatisticalQuery.java
index b9a66d40095..61de21ceacb 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostNicStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostNicStatisticalQuery.java
@@ -12,7 +12,7 @@
 
 public class HostNicStatisticalQuery extends AbstractStatisticalQuery<HostNic, VdsNetworkInterface> {
 
-    private static final Statistic DATA_RX = create("data.current.rx", "Receive data rate",  GAUGE, BYTES_PER_SECOND, DECIMAL);
+    private static final Statistic DATA_RX = create("data.current.rx", "Receive data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
     private static final Statistic DATA_TX = create("data.current.tx", "Transmit data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
     private static final Statistic DATA_RX_BITS = create("data.current.rx.bps", "Receive data rate", GAUGE, BITS_PER_SECOND, DECIMAL);
     private static final Statistic DATA_TX_BITS = create("data.current.tx.bps", "Transmit data rate", GAUGE, BITS_PER_SECOND, DECIMAL);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostStatisticalQuery.java
index 0250e97c4db..0239dd70034 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/HostStatisticalQuery.java
@@ -12,23 +12,23 @@
 
 public class HostStatisticalQuery extends AbstractStatisticalQuery<Host, VDS> {
 
-    private static final Statistic MEM_TOTAL   = create("memory.total",       "Total memory",    GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_USED    = create("memory.used",        "Used memory",           GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_FREE    = create("memory.free",        "Free memory",           GAUGE, BYTES,   INTEGER);
+    private static final Statistic MEM_TOTAL = create("memory.total", "Total memory", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_USED = create("memory.used", "Used memory", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_FREE = create("memory.free", "Free memory", GAUGE, BYTES, INTEGER);
     private static final Statistic MEM_SHARED = create("memory.shared",
-            "The amount of memory, in bytes, shared among Virtual-Machines on this Host by Kernel Same-page Merging (KSM)",
-            GAUGE,
-            BYTES,
-            INTEGER);
-    private static final Statistic SWAP_TOTAL  = create("swap.total",         "Total swap",            GAUGE, BYTES,   INTEGER);
-    private static final Statistic SWAP_FREE   = create("swap.free",          "Free swap",             GAUGE, BYTES,   INTEGER);
-    private static final Statistic SWAP_USED   = create("swap.used",          "Used swap",             GAUGE, BYTES,   INTEGER);
-    private static final Statistic CPU_KSM     = create("ksm.cpu.current",    "KSM CPU usage",         GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_USER    = create("cpu.current.user",   "User CPU usage",    GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_SYS     = create("cpu.current.system", "System CPU usage",      GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_IDLE    = create("cpu.current.idle",   "Idle CPU usage",        GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_LOAD    = create("cpu.load.avg.5m",    "CPU 5 minute load average", GAUGE, PERCENT, DECIMAL);
-    private static final Statistic BOOT_TIME   = create("boot.time",          "Boot time of the machine", GAUGE, NONE, INTEGER);
+ "The amount of memory, in bytes, shared among Virtual-Machines on this Host by Kernel Same-page Merging (KSM)",
+ GAUGE,
+ BYTES,
+ INTEGER);
+    private static final Statistic SWAP_TOTAL = create("swap.total", "Total swap", GAUGE, BYTES, INTEGER);
+    private static final Statistic SWAP_FREE = create("swap.free", "Free swap", GAUGE, BYTES, INTEGER);
+    private static final Statistic SWAP_USED = create("swap.used", "Used swap", GAUGE, BYTES, INTEGER);
+    private static final Statistic CPU_KSM = create("ksm.cpu.current", "KSM CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_USER = create("cpu.current.user", "User CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_SYS = create("cpu.current.system", "System CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_IDLE = create("cpu.current.idle", "Idle CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_LOAD = create("cpu.load.avg.5m", "CPU 5 minute load average", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic BOOT_TIME = create("boot.time", "Boot time of the machine", GAUGE, NONE, INTEGER);
 
     protected HostStatisticalQuery(Host parent) {
         this(null, parent);
@@ -41,21 +41,21 @@ protected HostStatisticalQuery(AbstractBackendResource<Host, VDS>.EntityIdResolv
     public List<Statistic> getStatistics(VDS entity) {
         VdsStatistics s = entity.getStatisticsData();
         // if user queries host statistics before host installation completed, null values are possible (therefore added checks).
-        long memTotal = entity.getPhysicalMemMb()==null ? 0 : entity.getPhysicalMemMb() * Mb;
-        long memUsed = (s==null || s.getUsageMemPercent()==null) ? 0 : memTotal * s.getUsageMemPercent() / 100;
-        List<Statistic> statistics = asList(setDatum(clone(MEM_TOTAL),   memTotal),
-                      setDatum(clone(MEM_USED),    memUsed),
-                      setDatum(clone(MEM_FREE),    memTotal-memUsed),
-                      setDatum(clone(MEM_SHARED),  (s==null || s.getMemShared()==null) ? 0 : s.getMemShared()*Mb),
-                      setDatum(clone(SWAP_TOTAL),  (s==null || s.getSwapTotal()==null) ? 0 : s.getSwapTotal()*Mb),
-                      setDatum(clone(SWAP_FREE),   (s==null || s.getSwapFree()==null) ? 0 : s.getSwapFree()*Mb),
-                      setDatum(clone(SWAP_USED),   getSwapUsed(s)*Mb),
-                      setDatum(clone(CPU_KSM),     (s==null || s.getKsmCpuPercent()==null) ? 0 : s.getKsmCpuPercent()),
-                      setDatum(clone(CPU_USER),    (s==null || s.getCpuUser()==null) ? 0 : s.getCpuUser()),
-                      setDatum(clone(CPU_SYS),     (s==null || s.getCpuSys()==null) ? 0 : s.getCpuSys()),
-                      setDatum(clone(CPU_IDLE),    (s==null || s.getCpuIdle()==null) ? 0 : s.getCpuIdle()),
-                      setDatum(clone(CPU_LOAD),    (s==null || s.getCpuLoad()==null) ? 0 : s.getCpuLoad()/100),
-                      setDatum(clone(BOOT_TIME),   (s==null || s.getBootTime()==null) ? 0 : s.getBootTime()));
+        long memTotal = entity.getPhysicalMemMb() == null ? 0 : entity.getPhysicalMemMb() * Mb;
+        long memUsed = (s == null || s.getUsageMemPercent() == null) ? 0 : memTotal * s.getUsageMemPercent() / 100;
+        List<Statistic> statistics = asList(setDatum(clone(MEM_TOTAL), memTotal),
+                      setDatum(clone(MEM_USED), memUsed),
+                      setDatum(clone(MEM_FREE), memTotal - memUsed),
+                      setDatum(clone(MEM_SHARED), (s == null || s.getMemShared() == null) ? 0 : s.getMemShared() * Mb),
+                      setDatum(clone(SWAP_TOTAL), (s == null || s.getSwapTotal() == null) ? 0 : s.getSwapTotal() * Mb),
+                      setDatum(clone(SWAP_FREE), (s == null || s.getSwapFree() == null) ? 0 : s.getSwapFree() * Mb),
+                      setDatum(clone(SWAP_USED), getSwapUsed(s) * Mb),
+                      setDatum(clone(CPU_KSM), (s == null || s.getKsmCpuPercent() == null) ? 0 : s.getKsmCpuPercent()),
+                      setDatum(clone(CPU_USER), (s == null || s.getCpuUser() == null) ? 0 : s.getCpuUser()),
+                      setDatum(clone(CPU_SYS), (s == null || s.getCpuSys() == null) ? 0 : s.getCpuSys()),
+                      setDatum(clone(CPU_IDLE), (s == null || s.getCpuIdle() == null) ? 0 : s.getCpuIdle()),
+                      setDatum(clone(CPU_LOAD), (s == null || s.getCpuLoad() == null) ? 0 : s.getCpuLoad() / 100),
+                      setDatum(clone(BOOT_TIME), (s == null || s.getBootTime() == null) ? 0 : s.getBootTime()));
 
         if (s != null && s.getHugePages() != null) {
             s.getHugePages().stream()
@@ -90,13 +90,13 @@ public Statistic adopt(Statistic statistic) {
     }
 
     private long getSwapUsed(VdsStatistics s) {
-        if (s==null) {
+        if (s == null) {
             return 0;
         } else {
-            if (s.getSwapTotal()==null) {
+            if (s.getSwapTotal() == null) {
                 return 0;
             } else {
-                if (s.getSwapFree()==null) {
+                if (s.getSwapFree() == null) {
                     return s.getSwapTotal();
                 } else {
                     return s.getSwapTotal() - s.getSwapFree();
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NicStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NicStatisticalQuery.java
index a0aa3db3ab5..eb0b12a3fee 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NicStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NicStatisticalQuery.java
@@ -13,8 +13,8 @@
 
 public class NicStatisticalQuery extends AbstractStatisticalQuery<Nic, VmNetworkInterface> {
 
-    private static final Statistic DATA_RX = create("data.current.rx", "Receive data rate",  GAUGE,   BYTES_PER_SECOND, DECIMAL);
-    private static final Statistic DATA_TX = create("data.current.tx", "Transmit data rate", GAUGE,   BYTES_PER_SECOND, DECIMAL);
+    private static final Statistic DATA_RX = create("data.current.rx", "Receive data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
+    private static final Statistic DATA_TX = create("data.current.tx", "Transmit data rate", GAUGE, BYTES_PER_SECOND, DECIMAL);
     private static final Statistic DATA_RX_BITS = create("data.current.rx.bps", "Receive data rate", GAUGE, BITS_PER_SECOND, DECIMAL);
     private static final Statistic DATA_TX_BITS = create("data.current.tx.bps", "Transmit data rate", GAUGE, BITS_PER_SECOND, DECIMAL);
     private static final Statistic ERRS_RX = create("errors.total.rx", "Total receive errors", COUNTER, NONE, INTEGER);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NumaStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NumaStatisticalQuery.java
index ef7f5024099..a40b1b5cfe0 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NumaStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/NumaStatisticalQuery.java
@@ -11,12 +11,12 @@
 
 public class NumaStatisticalQuery extends AbstractStatisticalQuery<NumaNode, VdsNumaNode> {
 
-    private static final Statistic MEM_TOTAL   = create("memory.total",       "Total memory",    GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_USED    = create("memory.used",        "Used memory",           GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_FREE    = create("memory.free",        "Free memory",           GAUGE, BYTES,   INTEGER);
-    private static final Statistic CPU_USER    = create("cpu.current.user",   "User CPU usage",    GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_SYS     = create("cpu.current.system", "System CPU usage",      GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_IDLE    = create("cpu.current.idle",   "Idle CPU usage",        GAUGE, PERCENT, DECIMAL);
+    private static final Statistic MEM_TOTAL = create("memory.total", "Total memory", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_USED = create("memory.used", "Used memory", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_FREE = create("memory.free", "Free memory", GAUGE, BYTES, INTEGER);
+    private static final Statistic CPU_USER = create("cpu.current.user", "User CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_SYS = create("cpu.current.system", "System CPU usage", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_IDLE = create("cpu.current.idle", "Idle CPU usage", GAUGE, PERCENT, DECIMAL);
 
     protected NumaStatisticalQuery(NumaNode parent) {
         this(null, parent);
@@ -30,13 +30,13 @@ protected NumaStatisticalQuery(AbstractBackendResource<NumaNode, VdsNumaNode>.En
     public List<Statistic> getStatistics(VdsNumaNode entity) {
         NumaNodeStatistics s = entity.getNumaNodeStatistics();
         long memTotal = entity.getMemTotal();
-        long memFree = (s==null) ? 0 : s.getMemFree();
-        return asList(setDatum(clone(MEM_TOTAL),   memTotal),
-                setDatum(clone(MEM_USED),    memTotal-memFree),
-                setDatum(clone(MEM_FREE),    memFree),
-                setDatum(clone(CPU_USER),    (s==null) ? 0 : s.getCpuUser()),
-                setDatum(clone(CPU_SYS),     (s==null) ? 0 : s.getCpuSys()),
-                setDatum(clone(CPU_IDLE),    (s==null) ? 0 : s.getCpuIdle()));
+        long memFree = (s == null) ? 0 : s.getMemFree();
+        return asList(setDatum(clone(MEM_TOTAL), memTotal),
+                setDatum(clone(MEM_USED), memTotal - memFree),
+                setDatum(clone(MEM_FREE), memFree),
+                setDatum(clone(CPU_USER), (s == null) ? 0 : s.getCpuUser()),
+                setDatum(clone(CPU_SYS), (s == null) ? 0 : s.getCpuSys()),
+                setDatum(clone(CPU_IDLE), (s == null) ? 0 : s.getCpuIdle()));
     }
 
     @Override
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/ResourceLocator.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/ResourceLocator.java
index b6ffd2c6ca4..6d3f39941f6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/ResourceLocator.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/ResourceLocator.java
@@ -20,7 +20,7 @@ private ResourceLocator() {
     }
 
     public static ResourceLocator getInstance() {
-        if (instance==null) {
+        if (instance == null) {
             instance = new ResourceLocator();
         }
         return instance;
@@ -61,8 +61,8 @@ public BaseBackendResource locateResource(String href) throws Exception {
      */
     private String removePrefix(String href) {
         int index = href.indexOf("/api/");
-        if (index>0) {
-            href = href.substring(index+5);
+        if (index > 0) {
+            href = href.substring(index + 5);
         }
         return href;
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/StepStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/StepStatisticalQuery.java
index c2de43af046..0121b112464 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/StepStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/StepStatisticalQuery.java
@@ -17,13 +17,13 @@
 import org.ovirt.engine.core.compat.Guid;
 
 public class StepStatisticalQuery extends AbstractStatisticalQuery<Step, GlusterVolumeTaskStatusEntity> {
-    public static final Statistic FILES_MOVED   = create("files.moved", "Number of files moved", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    public static final Statistic SIZE_MOVED   = create("size.moved", "size of files moved", GAUGE, BYTES, ValueType.INTEGER);
-    public static final Statistic FILES_SKIPPED   = create("files.skipped", "Number of files skipped", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    public static final Statistic FILES_SCANNED   = create("files.scanned", "Number of files scanned", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    public static final Statistic FILES_FAILED   = create("files.failed", "Number of files failed", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
-    public static final Statistic RUN_TIME   = create("run.time", "Time for which task is running", COUNTER, StatisticUnit.SECONDS, ValueType.DECIMAL);
-    public static final Statistic STATUS   = create("status", "Status of task", GAUGE, StatisticUnit.NONE, ValueType.STRING);
+    public static final Statistic FILES_MOVED = create("files.moved", "Number of files moved", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    public static final Statistic SIZE_MOVED = create("size.moved", "size of files moved", GAUGE, BYTES, ValueType.INTEGER);
+    public static final Statistic FILES_SKIPPED = create("files.skipped", "Number of files skipped", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    public static final Statistic FILES_SCANNED = create("files.scanned", "Number of files scanned", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    public static final Statistic FILES_FAILED = create("files.failed", "Number of files failed", COUNTER, StatisticUnit.NONE, ValueType.INTEGER);
+    public static final Statistic RUN_TIME = create("run.time", "Time for which task is running", COUNTER, StatisticUnit.SECONDS, ValueType.DECIMAL);
+    public static final Statistic STATUS = create("status", "Status of task", GAUGE, StatisticUnit.NONE, ValueType.STRING);
 
 
     protected IResolver<Guid, GlusterVolumeTaskStatusEntity> taskStatusResolver;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java
index 41affb19765..9af7cc7e0b2 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VmStatisticalQuery.java
@@ -12,22 +12,22 @@
 
 public class VmStatisticalQuery extends AbstractStatisticalQuery<Vm, org.ovirt.engine.core.common.businessentities.VM> {
 
-    private static final Statistic MEM_CONFIG            = create("memory.installed",       "Total memory configured", GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_USED              = create("memory.used",            "Memory used (agent)",     GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_FREE              = create("memory.free",            "Memory free (agent)",     GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_BUFFERED          = create("memory.buffered",        "Memory buffered (agent)", GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_CACHED            = create("memory.cached",          "Memory cached (agent)",   GAUGE, BYTES,   INTEGER);
-    private static final Statistic MEM_UNUSED            = create("memory.unused",          "Memory unused (agent)",   GAUGE, BYTES,   INTEGER);
-    private static final Statistic CPU_GUEST             = create("cpu.current.guest",      "CPU used by guest",       GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_OVERHEAD          = create("cpu.current.hypervisor", "CPU overhead",            GAUGE, PERCENT, DECIMAL);
-    private static final Statistic CPU_TOTAL             = create("cpu.current.total",      "Total CPU used",          GAUGE, PERCENT, DECIMAL);
-    private static final Statistic NETWORK_TOTAL         = create("network.current.total",  "Total network used",      GAUGE, PERCENT, DECIMAL);
-    private static final Statistic MIGRATION_PROGRESS    = create("migration.progress",     "Migration Progress",      GAUGE, PERCENT, DECIMAL);
-    private static final Statistic ELAPSED_TIME          = create("elapsed.time",           "Elapsed VM runtime",      COUNTER, SECONDS, INTEGER);
-    private static final Statistic CPU_USAGE_HISTORY     = create("cpu.usage.history",      "List of CPU usage history, sorted by date from newest to oldest, at intervals of 30 seconds",     GAUGE, PERCENT, DECIMAL);
-    private static final Statistic MEM_USAGE_HISTORY     = create("memory.usage.history",   "List of memory usage history, sorted by date from newest to oldest, at intervals of 30 seconds",  GAUGE, PERCENT, DECIMAL);
-    private static final Statistic NETWORK_USAGE_HISTORY = create("network.usage.history",  "List of network usage history, sorted by date from newest to oldest, at intervals of 30 seconds", GAUGE, PERCENT, DECIMAL);
-    private static final Statistic DISKS_USAGE           = create("disks.usage",            "Disk usage, in bytes, per filesystem as JSON (agent)", GAUGE, NONE, STRING);
+    private static final Statistic MEM_CONFIG = create("memory.installed", "Total memory configured", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_USED = create("memory.used", "Memory used (agent)", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_FREE = create("memory.free", "Memory free (agent)", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_BUFFERED = create("memory.buffered", "Memory buffered (agent)", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_CACHED = create("memory.cached", "Memory cached (agent)", GAUGE, BYTES, INTEGER);
+    private static final Statistic MEM_UNUSED = create("memory.unused", "Memory unused (agent)", GAUGE, BYTES, INTEGER);
+    private static final Statistic CPU_GUEST = create("cpu.current.guest", "CPU used by guest", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_OVERHEAD = create("cpu.current.hypervisor", "CPU overhead", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic CPU_TOTAL = create("cpu.current.total", "Total CPU used", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic NETWORK_TOTAL = create("network.current.total", "Total network used", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic MIGRATION_PROGRESS = create("migration.progress", "Migration Progress", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic ELAPSED_TIME = create("elapsed.time", "Elapsed VM runtime", COUNTER, SECONDS, INTEGER);
+    private static final Statistic CPU_USAGE_HISTORY = create("cpu.usage.history", "List of CPU usage history, sorted by date from newest to oldest, at intervals of 30 seconds", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic MEM_USAGE_HISTORY = create("memory.usage.history", "List of memory usage history, sorted by date from newest to oldest, at intervals of 30 seconds", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic NETWORK_USAGE_HISTORY = create("network.usage.history", "List of network usage history, sorted by date from newest to oldest, at intervals of 30 seconds", GAUGE, PERCENT, DECIMAL);
+    private static final Statistic DISKS_USAGE = create("disks.usage", "Disk usage, in bytes, per filesystem as JSON (agent)", GAUGE, NONE, STRING);
 
     protected VmStatisticalQuery(Vm parent) {
         this(null, parent);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VolumeStatisticalQuery.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VolumeStatisticalQuery.java
index 17dc3ffea4d..23857b35df5 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VolumeStatisticalQuery.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/VolumeStatisticalQuery.java
@@ -11,9 +11,9 @@
 import org.ovirt.engine.core.compat.Guid;
 
 public class VolumeStatisticalQuery extends AbstractStatisticalQuery<GlusterVolume, GlusterVolumeEntity> {
-    private static final Statistic MEM_TOTAL_SIZE   = create("memory.total.size", "Total size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_FREE_SIZE   = create("memory.free.size", "Free size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MEM_USED_SIZE   = create("memory.used.size", "Used size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_TOTAL_SIZE = create("memory.total.size", "Total size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_FREE_SIZE = create("memory.free.size", "Free size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MEM_USED_SIZE = create("memory.used.size", "Used size", GAUGE, BYTES, ValueType.INTEGER);
 
     public VolumeStatisticalQuery(GlusterVolume parent ) {
         this(null, parent);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java
index 45109643128..cbcaf92c706 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResource.java
@@ -42,7 +42,7 @@ public Group get() {
         String directoryId;
         try {
             directoryId = DirectoryEntryIdUtils.decode(id);
-        } catch(IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             throw new WebApplicationException(Response.Status.NOT_FOUND);
         }
         String directory = parent.getDirectory().getName();
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java
index 98756ce3346..66956e1788f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupsResource.java
@@ -53,7 +53,7 @@ private String getSearchPattern() {
         String constraint = QueryHelper.getConstraint(httpHeaders, uriInfo, DirectoryGroup.class, false);
         StringBuilder sb = new StringBuilder(128);
         sb.append(MessageFormat.format(ResourceConstants.AAA_GROUPS_SEARCH_TEMPLATE, parent.getDirectory().getName(), ""));
-        sb.append(StringUtils.isEmpty(constraint)? "allnames=*": constraint);
+        sb.append(StringUtils.isEmpty(constraint) ? "allnames=*" : constraint);
         return sb.toString();
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java
index 20d1db8af3a..ddc5dc6a86e 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainResource.java
@@ -43,7 +43,7 @@ public DomainUsersResource getUsersResource() {
 
     @Override
     protected Domain addParents(Domain domain) {
-        if(parent!=null){
+        if (parent != null) {
             assignChildModel(domain, Domain.class).setId(id);
         }
         return domain;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java
index 117be99e4ca..e0fac330b72 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResource.java
@@ -44,7 +44,7 @@ public User get() {
         String directoryId;
         try {
             directoryId = DirectoryEntryIdUtils.decode(id);
-        } catch(IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             throw new WebApplicationException(Response.Status.NOT_FOUND);
         }
         String directory = parent.getDirectory().getName();
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java
index 872d7d9913a..139546d8b95 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUsersResource.java
@@ -54,7 +54,7 @@ private String getSearchPattern() {
         String constraint = QueryHelper.getConstraint(httpHeaders, uriInfo, DirectoryUser.class, false);
         StringBuilder sb = new StringBuilder(128);
         sb.append(MessageFormat.format(ResourceConstants.AAA_PRINCIPALS_SEARCH_TEMPLATE, parent.getDirectory().getName(), ""));
-        sb.append(StringUtils.isEmpty(constraint)? "allnames=*": constraint);
+        sb.append(StringUtils.isEmpty(constraint) ? "allnames=*" : constraint);
         return sb.toString();
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
index e5636e95414..d03543e843d 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainsResource.java
@@ -44,7 +44,7 @@ public DomainResource getDomainResource(String id) {
 
     private List<Directory> getCollection() {
         List<Directory> dsl = new ArrayList<>();
-        for(String domain : getDomainList()){
+        for (String domain : getDomainList()) {
             Directory ds = new Directory();
             ds.setDomain(domain);
             ds.setId(DirectoryEntryIdUtils.encode(domain));
@@ -64,7 +64,7 @@ public Domain lookupDirectoryById(String id, boolean addlinks) {
         for (Directory directoriesService : getCollection()) {
             if (directoriesService.getId().equals(id)) {
                 this.id = id;
-                return addlinks?
+                return addlinks ?
                         addLinks(map(directoriesService))
                         :
                         map(directoriesService);
@@ -75,9 +75,9 @@ public Domain lookupDirectoryById(String id, boolean addlinks) {
 
     public Domain lookupDirectoryByDomain(String domain, boolean addlinks) {
         for (Directory directoriesService : getCollection()) {
-            if (directoriesService.getDomain().equals(domain)){
+            if (directoriesService.getDomain().equals(domain)) {
                 this.id = directoriesService.getId().toString();
-                return addlinks?
+                return addlinks ?
                         addLinks(map(directoriesService))
                         :
                         map(directoriesService);
@@ -88,7 +88,7 @@ public Domain lookupDirectoryByDomain(String domain, boolean addlinks) {
 
     @Override
     protected Domain addParents(Domain domain) {
-        if(id!=null){
+        if (id != null) {
             assignChildModel(domain, Domain.class).setId(id);
         }
         return domain;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
index 5a71b5b4d33..18ed1ec2cda 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendGroupsResource.java
@@ -51,7 +51,7 @@ public BackendGroupsResource() {
      * execution of the {@code list} operation.
      */
     private String getSearchPattern() {
-        String userProvidedPattern = QueryHelper.getConstraint(httpHeaders, uriInfo, "",  modelType);
+        String userProvidedPattern = QueryHelper.getConstraint(httpHeaders, uriInfo, "", modelType);
         return userProvidedPattern.equals("Groups : ") ?
                userProvidedPattern + GROUPS_SEARCH_PATTERN
                :
@@ -184,7 +184,7 @@ private DirectoryGroup findDirectoryGroup(String directoryName, Group groupModel
     private DirectoryGroup getGroupById(String directoryName, String namespace, String groupId) {
         try {
             groupId = DirectoryEntryIdUtils.decode(groupId);
-        } catch(IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             return null;
         }
         return getEntity(
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
index 15e2d36da26..0d00981a81c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/aaa/BackendUsersResource.java
@@ -68,7 +68,7 @@ public BackendUsersResource(Class<User> class1, Class<DbUser> class2) {
      * operation.
      */
     private String getSearchPattern() {
-        String user_defined_pattern = QueryHelper.getConstraint(httpHeaders, uriInfo, "",  modelType);
+        String user_defined_pattern = QueryHelper.getConstraint(httpHeaders, uriInfo, "", modelType);
         return user_defined_pattern.equals("Users : ") ?
                user_defined_pattern + USERS_SEARCH_PATTERN
                :
@@ -105,7 +105,7 @@ private String getDirectoryUserSearchPattern(String username, String namespace,
         final StringBuilder sb = new StringBuilder(128);
 
         sb.append(MessageFormat.format(ResourceConstants.AAA_PRINCIPALS_SEARCH_TEMPLATE,
-                  parent!=null?
+                  parent != null ?
                         parent.getDirectory().getName()
                         :
                         domain,
@@ -132,7 +132,7 @@ protected Users mapDbUserCollection(List<DbUser> entities) {
 
     @Override
     protected User addParents(User user) {
-        if(parent!=null){
+        if (parent != null) {
             assignChildModel(user, User.class).setId(parent.get().getId());
         }
         return user;
@@ -157,7 +157,7 @@ public Response add(User user) {
                 String.class,
                 QueryType.GetDomainList,
                 new QueryParametersBase());
-        if (AuthzUtils.getAuthzNameFromEntityName(user.getUserName(), authzProvidersNames) == null) {// user-name may contain the domain (e.g: oliel@xxx.yyy)
+        if (AuthzUtils.getAuthzNameFromEntityName(user.getUserName(), authzProvidersNames) == null) { // user-name may contain the domain (e.g: oliel@xxx.yyy)
             validateParameters(user, "domain.id|name");
         }
         String domain = getAuthzProviderName(user, authzProvidersNames);
@@ -186,7 +186,7 @@ private DirectoryUser findDirectoryUser(String directoryName, User user) {
             result = getUserById(directoryName, namespace, user.getDomainEntryId());
         } else if (user.isSetId()) {
             result = getUserById(directoryName, namespace, user.getId());
-        } else  if (user.isSetPrincipal()) {
+        } else if (user.isSetPrincipal()) {
             result = getEntity(DirectoryUser.class, QueryType.GetDirectoryUserByPrincipal, new GetDirectoryUserByPrincipalParameters(directoryName, user.getPrincipal()), user.getPrincipal());
         } else if (user.isSetUserName()) {
                 result = getEntity(
@@ -205,7 +205,7 @@ private DirectoryUser getUserById(String directoryName, String namespace, String
         DirectoryUser result;
         try {
             userId = DirectoryEntryIdUtils.decode(userId);
-        } catch(IllegalArgumentException exception) {
+        } catch (IllegalArgumentException exception) {
             return null;
         }
         result = getEntity(
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResource.java
index 88920306786..d1f4b417f84 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResource.java
@@ -43,7 +43,7 @@ public ExternalHostGroup get() {
         ProviderQueryParameters parameters = new ProviderQueryParameters();
         parameters.setProvider(provider);
         QueryReturnValue result = runQuery(QueryType.GetHostGroupsFromExternalProvider, parameters);
-        List<org.ovirt.engine.core.common.businessentities.ExternalHostGroup> entities =  result.getReturnValue();
+        List<org.ovirt.engine.core.common.businessentities.ExternalHostGroup> entities = result.getReturnValue();
         if (entities != null) {
             for (org.ovirt.engine.core.common.businessentities.ExternalHostGroup entity : entities) {
                 if (name.equals(entity.getName())) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
index 2cd84e9e32c..9bce9eb62d5 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupsResource.java
@@ -24,7 +24,7 @@ public class BackendExternalHostGroupsResource
     private String providerId;
 
     public BackendExternalHostGroupsResource(String providerId) {
-        super(ExternalHostGroup.class,  org.ovirt.engine.core.common.businessentities.ExternalHostGroup.class);
+        super(ExternalHostGroup.class, org.ovirt.engine.core.common.businessentities.ExternalHostGroup.class);
         this.providerId = providerId;
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java
index d044a056854..ed6aedc83c2 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterVolumesResource.java
@@ -94,7 +94,7 @@ public Response add(GlusterVolume volume) {
 
     private void mapBricks(GlusterVolume volume, GlusterVolumeEntity volumeEntity) {
         List<GlusterBrickEntity> bricks = new ArrayList<>();
-        for(GlusterBrick brick : volume.getBricks().getGlusterBricks()) {
+        for (GlusterBrick brick : volume.getBricks().getGlusterBricks()) {
             bricks.add(getMapper(GlusterBrick.class, GlusterBrickEntity.class).map(brick, null));
         }
         volumeEntity.setBricks(bricks);
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
index 32fede13ac7..453cdb70862 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProvidersResource.java
@@ -55,7 +55,7 @@ private List<Provider> getBackendCollection() {
             );
         } else {
             List<Provider> openstackCollection = getBackendCollection(SearchType.Provider, getConstraint(ProviderType.OPENSTACK_NETWORK.name()));
-            List<Provider> externalCollection =  getBackendCollection(SearchType.Provider, getConstraint(ProviderType.EXTERNAL_NETWORK.name()));
+            List<Provider> externalCollection = getBackendCollection(SearchType.Provider, getConstraint(ProviderType.EXTERNAL_NETWORK.name()));
             openstackCollection.addAll(externalCollection);
             return openstackCollection;
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResource.java
index e2c98c0583b..6a6063e8203 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResource.java
@@ -132,18 +132,18 @@ private Guid getDataCenterIdByName(String dataCenterName) {
         checkResultAndThrowExceptionIfFailed(result);
 
         List<StoragePool> dataCenters = result.getReturnValue();
-        if (dataCenters.isEmpty()){
+        if (dataCenters.isEmpty()) {
             // This will always throw a WebApplicationException
             notFound();
         }
         return dataCenters.get(0).getId();
     }
 
-    private void checkResultAndThrowExceptionIfFailed(QueryReturnValue result){
+    private void checkResultAndThrowExceptionIfFailed(QueryReturnValue result) {
         if (!result.getSucceeded()) {
             try {
                 backendFailure(result.getExceptionString());
-            } catch (BackendFailureException e){
+            } catch (BackendFailureException e) {
                 handleError(e, false);
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
index 81ce2f4f89e..02b518af221 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworksResource.java
@@ -44,7 +44,7 @@ private Map<Network, Set<Guid>> getBackendCollection() {
                 backendFailure(result.getExceptionString());
             }
             return result.getReturnValue();
-        } catch(Exception exception) {
+        } catch (Exception exception) {
             return handleError(exception, false);
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinkFollower.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinkFollower.java
index ec8a07849b2..5726033e31c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinkFollower.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinkFollower.java
@@ -23,11 +23,11 @@ public class LinkFollower {
     private ResourceLocator resourceLocator;
 
     public LinkFollower() {
-        this.resourceLocator =  ResourceLocator.getInstance();
+        this.resourceLocator = ResourceLocator.getInstance();
     }
 
     public LinkFollower(ResourceLocator resourceLocator) {
-        this.resourceLocator =  resourceLocator;
+        this.resourceLocator = resourceLocator;
     }
 
     /**
@@ -141,9 +141,9 @@ private void followLinks(List<ActionableResource> entities, LinksTreeNode node)
     private void followLink(ActionableResource entity, LinksTreeNode node) {
         List<ActionableResource> nextStepEntities = new LinkedList<>();
         if (EntityHelper.isCollection(entity)) {
-            nextStepEntities.addAll(fetchData((BaseResources)entity, node));
+            nextStepEntities.addAll(fetchData((BaseResources) entity, node));
         } else {
-            nextStepEntities.add(fetchData((BaseResource)entity, node));
+            nextStepEntities.add(fetchData((BaseResource) entity, node));
         }
         for (LinksTreeNode child : node.getChildren()) {
             followLinks(nextStepEntities, child);
@@ -175,7 +175,7 @@ private List<ActionableResource> fetchData(BaseResources collectionEntity, Links
         try {
             //get the actual list of entities in the collection-type, e.g for Nics get List<Nic>
             //(by invoking nics.getNics() using reflection)
-            List<BaseResource> entities = (List<BaseResource>)collectionGetter.invoke(collectionEntity);
+            List<BaseResource> entities = (List<BaseResource>) collectionGetter.invoke(collectionEntity);
             //for each entity in the list, fetch link data.
             for (BaseResource entity : entities) {
                 results.add(fetchData(entity, node));
@@ -204,9 +204,9 @@ private ActionableResource fetchData(BaseResource entity, LinksTreeNode link) {
             String element = underscoreToCamelCase(link.getElement());
             if (link.isFollowed()) {
                 Method getter = ReflectionHelper.getGetter(entity, element);
-                return (ActionableResource)getter.invoke(entity);
+                return (ActionableResource) getter.invoke(entity);
             } else {
-                String href = getHref((BaseResource)entity, link.getElement());
+                String href = getHref((BaseResource) entity, link.getElement());
                 ActionableResource result = fetch(href);
                 Method setter = ReflectionHelper.getSetter(entity, element);
                 setter.invoke(entity, result);
@@ -241,9 +241,9 @@ private String getHref(BaseResource entity, String link) throws IllegalAccessExc
         Optional<Link> optional = entity.getLinks().stream().filter(x -> x.getRel().equals(toRelFormat(link))).findFirst();
         if (optional.isPresent()) {
             return optional.get().getHref();
-        } else {//assume this is not a sub-collection, since it wasn't found among links.
+        } else { //assume this is not a sub-collection, since it wasn't found among links.
             Method getter = ReflectionHelper.getGetter(entity, underscoreToCamelCase(link));
-            BaseResource member = (BaseResource)getter.invoke(entity);
+            BaseResource member = (BaseResource) getter.invoke(entity);
             return member.getHref();
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinksTreeNode.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinksTreeNode.java
index f5edf39c3a8..64fcb79f811 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinksTreeNode.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/utils/LinksTreeNode.java
@@ -12,7 +12,7 @@ public class LinksTreeNode {
     String element;
     LinksTreeNode parent;
     List<LinksTreeNode> children;
-    boolean followed=false;
+    boolean followed = false;
 
     public LinksTreeNode(String element) {
         super();
@@ -48,7 +48,7 @@ public String getElement() {
     }
 
     public boolean isRoot() {
-        return parent==null;
+        return parent == null;
     }
 
     public boolean isFollowed() {
@@ -78,7 +78,7 @@ public Iterator<String> getPathIterator() {
                 path.push(this.element);
                 node = node.parent;
             }
-        } while (node!=null);
+        } while (node != null);
         return path.iterator();
     }
 
@@ -119,7 +119,7 @@ public void markAsFollowed(String... links) {
     }
 
     private boolean pathExists(LinksTreeNode node, Iterator<String> iterator) {
-        while(iterator.hasNext()) {
+        while (iterator.hasNext()) {
             Optional<LinksTreeNode> child = getChild(iterator.next());
             if (!child.isPresent()) {
                 return false;
@@ -138,14 +138,14 @@ public String toString() {
     private String toString(int depth) {
         StringBuilder builder = new StringBuilder(element);
         for (LinksTreeNode node : children) {
-            builder.append("\n").append(getTabs(depth)).append(node.toString(depth+1));
+            builder.append("\n").append(getTabs(depth)).append(node.toString(depth + 1));
         }
         return builder.toString();
     }
 
     private String getTabs(int tabs) {
         StringBuilder builder = new StringBuilder();
-        for (int i=0; i<tabs; i++) {
+        for (int i = 0; i < tabs; i++) {
             builder.append("\t");
         }
         return builder.toString();
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/IOExceptionMapper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/IOExceptionMapper.java
index 11b5cce6359..ba957d16628 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/IOExceptionMapper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/IOExceptionMapper.java
@@ -55,7 +55,7 @@ public Response toResponse(IOException exception) {
             log.error("Exception", exception);
             UsageFinder finder = new UsageFinder();
             return Response.status(Status.BAD_REQUEST).entity(finder.getUsageMessage(uriInfo, request)).build();
-        } catch(Exception error) {
+        } catch (Exception error) {
             throw new WebApplicationException(error, Response.status(Status.INTERNAL_SERVER_ERROR).build());
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/InvalidEnumValueExceptionMapper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/InvalidEnumValueExceptionMapper.java
index fd51c370afb..547d033271d 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/InvalidEnumValueExceptionMapper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/InvalidEnumValueExceptionMapper.java
@@ -8,7 +8,7 @@
 import org.ovirt.engine.api.utils.InvalidEnumValueException;
 
 @Provider
-public class InvalidEnumValueExceptionMapper implements ExceptionMapper<InvalidEnumValueException>{
+public class InvalidEnumValueExceptionMapper implements ExceptionMapper<InvalidEnumValueException> {
 
     @Override
     public Response toResponse(InvalidEnumValueException exception) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinder.java
index bdfa8f3a3d2..8c20c155765 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinder.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinder.java
@@ -36,7 +36,7 @@ private String getUsageLink(UriInfo uriInfo, String httpMethod) {
             node = step(node, pathSegment);
         }
         //check whether the last step in the URL represent an 'action'.
-        PathSegment lastPathSegment = pathSegments.get(pathSegments.size()-1);
+        PathSegment lastPathSegment = pathSegments.get(pathSegments.size() - 1);
         //Get the prefix of the link, with or without 's' appended to the
         //entity name, according to whether this action is on a single entity
         //or on the collection context, e.g:
@@ -92,7 +92,7 @@ private String processNodeName(ServiceTreeNode node) {
             builder.append(part.toLowerCase()).append("_");
         }
         String name = builder.toString();
-        return name.substring(0, name.length() -1);
+        return name.substring(0, name.length() - 1);
     }
 
     private String getMethodName(String httpMethod) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlLoader.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlLoader.java
index 683479b988e..57b31a70d6f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlLoader.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/rsdl/RsdlLoader.java
@@ -39,7 +39,7 @@ public class RsdlLoader {
     public static <RSDL> RSDL loadRsdl(Class<RSDL> clazz) throws IOException {
         // Decide what version of the RSDL document to load:
         Current current = CurrentManager.get();
-        String fileName = current.getApplicationMode() == ApplicationMode.GlusterOnly? "rsdl_gluster.xml": "rsdl.xml";
+        String fileName = current.getApplicationMode() == ApplicationMode.GlusterOnly ? "rsdl_gluster.xml" : "rsdl.xml";
         String resourcePath = String.format("/v%s/%s", current.getVersion(), fileName);
 
         // Calculate the prefix that will be used in the "href" attributes:
@@ -65,7 +65,7 @@ public static <RSDL> RSDL loadRsdl(Class<RSDL> clazz) throws IOException {
                 }
                 node.setNodeValue(href);
             }
-        } catch(Exception exception) {
+        } catch (Exception exception) {
             throw new IOException(exception);
         }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java
index 88255a33e68..aea36018a1e 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ActionsBuilder.java
@@ -16,7 +16,7 @@
 
 public class ActionsBuilder {
 
-    private static final String URL_SEPARATOR  = "/";
+    private static final String URL_SEPARATOR = "/";
     private Class<?> service;
     private Class<?> collection;
     private String base;
@@ -55,8 +55,8 @@ public Actions build() {
 
     private Method[] getInterfaceSignatures(Class<?> collection) {
         Method[] methods = new Method[0];
-        if (collection != null){
-            for (Class<?> inter : collection.getInterfaces()){
+        if (collection != null) {
+            for (Class<?> inter : collection.getInterfaces()) {
                 methods = ArrayUtils.concat(methods, inter.getMethods());
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/IconHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/IconHelper.java
index 514c8c2aa10..0b4ab3be682 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/IconHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/IconHelper.java
@@ -8,7 +8,7 @@
 
 public class IconHelper {
 
-    private IconHelper() {}
+    private IconHelper() { }
 
     public static boolean validateIconParameters(VmBase incoming) {
         final boolean isLargeIconUpload = incoming.isSetLargeIcon()
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java
index 24f0c3d740a..e3bf829ac99 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/LinkHelper.java
@@ -106,7 +106,7 @@ private static String getRelativePath(Class<?> service) {
     private static String getRelativePath(Class<?> service, Class<?> parentService) {
         PathKey key = new PathKey(service, parentService);
         String path = pathCache.get(key);
-        if (path!=null) {
+        if (path != null) {
             return path;
         } else {
             for (Method method : parentService.getMethods()) {
@@ -149,7 +149,7 @@ private static List<BaseResource> getInlineResources(Object obj) {
                 if (inline instanceof BaseResource) {
                     ret.add((BaseResource) inline);
                 } else if (inline instanceof BaseResources) {
-                    BaseResources entities = (BaseResources)inline;
+                    BaseResources entities = (BaseResources) inline;
                     Method getter = EntityHelper.getCollectionGetter(entities);
                     try {
                         List<BaseResource> entitiesList = (List<BaseResource>) getter.invoke(entities);
@@ -407,7 +407,7 @@ public static <R extends BaseResource> R addLinks(R model, Class<? extends BaseR
         for (BaseResource inline : getInlineResources(model)) {
             if (inline.getId() != null) {
                 path = getPath(inline, null);
-                if (path!=null) {
+                if (path != null) {
                     inline.setHref(path);
                 }
             }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ParametersHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ParametersHelper.java
index 26634440bd1..8c83a3bec70 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ParametersHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/ParametersHelper.java
@@ -174,7 +174,7 @@ public static int getIntegerParameter(HttpHeaders headers, UriInfo uri, String n
         }
         try {
             return Integer.parseInt(text);
-        } catch(NumberFormatException exception) {
+        } catch (NumberFormatException exception) {
             log.error("The value \"{}\" of parameter \"{}\" isn't a valid integer, it will be ignored.", text, name);
             return missing;
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/QueryHelper.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/QueryHelper.java
index a31b606ddc0..7a650d18b43 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/QueryHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/QueryHelper.java
@@ -35,7 +35,7 @@
 public class QueryHelper {
     public static final String CONSTRAINT_PARAMETER = "search";
 
-    private QueryHelper() {}
+    private QueryHelper() { }
 
     /**
      * Map return types per-collection-class, as there's no logical pattern
@@ -120,7 +120,7 @@ public static String getConstraint(HttpHeaders headers, UriInfo ui, String defau
      * @return constraint in correct format
      */
     public static String getConstraint(HttpHeaders headers, UriInfo ui, String defaultQuery, Class<?> clz, boolean typePrefix) {
-        String prefix = typePrefix? RETURN_TYPES.get(clz) : "";
+        String prefix = typePrefix ? RETURN_TYPES.get(clz) : "";
         String search = ParametersHelper.getParameter(headers, ui, CONSTRAINT_PARAMETER);
         if (search != null) {
             return prefix + search;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/EntityLocationMap.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/EntityLocationMap.java
index 24005b67c2b..e4b0051954c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/EntityLocationMap.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/EntityLocationMap.java
@@ -89,7 +89,7 @@ private static void handleNode(ServiceTreeNode node, EntityLocationMap map) {
                 Class<?> collectionResource = node.getParent().getResourceClass();
                 @SuppressWarnings("unchecked")
                 Class<? extends BaseResource> parentType = node.getParent().getParent().getResourceClass().equals(SystemResource.class) ? LinkHelper.NO_PARENT
-                        : (Class<? extends BaseResource>)(node.getParent().getParent().getType());
+                        : (Class<? extends BaseResource>) (node.getParent().getParent().getType());
                 innerMap.add(singleEntityResource, collectionResource, parentType);
             }
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/PathKey.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/PathKey.java
index 1f54611d5c0..70d5bb12951 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/PathKey.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/util/links/PathKey.java
@@ -19,7 +19,7 @@ public PathKey(Class<?> service, Class<?> parentService) {
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof PathKey) {
-            PathKey key = (PathKey)obj;
+            PathKey key = (PathKey) obj;
             return equals(service, key.service) && equals(parentService, key.parentService);
         } else {
             return false;
diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
index 64b1ddf56aa..621eb980737 100644
--- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
+++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/xml/JAXBProvider.java
@@ -103,7 +103,7 @@ public JAXBProvider() {
         // Create a JAXB context for the tyeps package:
         try {
             jaxbContext = JAXBContext.newInstance(typesPackage.getName());
-        } catch(JAXBException exception) {
+        } catch (JAXBException exception) {
             log.error("Can't create JAXB context for package \"{}\"", typesPackage.getName(), exception);
         }
     }
@@ -143,7 +143,7 @@ public Object readFrom(Class<Object> type, Type genericType, Annotation[] annota
         try {
             reader = parserFactory.createXMLStreamReader(entityStream, "UTF-8");
             return readFrom(reader);
-        } catch(XMLStreamException exception) {
+        } catch (XMLStreamException exception) {
             throw new IOException(exception);
         } finally {
             if (reader != null) {
@@ -169,7 +169,7 @@ private Object readFrom(XMLStreamReader reader) throws IOException {
                 result = ((JAXBElement) result).getValue();
             }
             return result;
-        } catch(JAXBException exception) {
+        } catch (JAXBException exception) {
             Throwable linked = exception.getLinkedException();
             if (linked != null) {
                 Throwable cause = linked;
@@ -196,8 +196,8 @@ public void writeTo(Object object, Class<?> type, Type genericType, Annotation[]
         JAXBElement<Object> element;
         try {
             element = (JAXBElement<Object>) factoryMethod.invoke(objectFactory, object);
-        } catch(IllegalAccessException|InvocationTargetException exception) {
-            throw new IOException("Error invoking factory method for type \"" +  type.getName() + "\".", exception);
+        } catch (IllegalAccessException | InvocationTargetException exception) {
+            throw new IOException("Error invoking factory method for type \"" + type.getName() + "\".", exception);
         }
 
         // Marshal the element:
@@ -206,7 +206,7 @@ public void writeTo(Object object, Class<?> type, Type genericType, Annotation[]
             marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
             marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
             marshaller.marshal(element, entityStream);
-        } catch(JAXBException exception) {
+        } catch (JAXBException exception) {
             throw new IOException("Can't marshall JAXB element of type \"" + type.getName() + "\".", exception);
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedTagsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedTagsResourceTest.java
index 5b64f789705..4bed96a1aa9 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedTagsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendAssignedTagsResourceTest.java
@@ -73,7 +73,7 @@ public void testAddTag() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Tag);
-        verifyModel((Tag)response.getEntity(), 0);
+        verifyModel((Tag) response.getEntity(), 0);
     }
 
     @Test
@@ -105,7 +105,7 @@ public void testAddTagByName() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Tag);
-        verifyModel((Tag)response.getEntity(), 0);
+        verifyModel((Tag) response.getEntity(), 0);
     }
 
     @Test
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
index 785db25d7c8..68fe95e8b98 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResourceTest.java
@@ -130,7 +130,7 @@ public void testSubResourceInjection() throws Exception {
                 if (method.isAnnotationPresent(Path.class) && isSubResourceLocator(method)) {
                     Object rawSubResource = method.invoke(collection, getSubResourceId());
                     if (rawSubResource instanceof AbstractBackendResource) {
-                        AbstractBackendResource<R, Q> subResource = (AbstractBackendResource<R, Q>)rawSubResource;
+                        AbstractBackendResource<R, Q> subResource = (AbstractBackendResource<R, Q>) rawSubResource;
                         assertNotNull(subResource.getBackend());
                         assertNotNull(subResource.getMappingLocator());
                     }
@@ -187,7 +187,7 @@ protected void setUpQueryExpectations(String query, Object failure) throws Excep
         } else {
             if (failure instanceof String) {
                 queryResult.setExceptionString((String) failure);
-                setUpL10nExpectations((String)failure);
+                setUpL10nExpectations((String) failure);
                 when(backend.runQuery(eq(QueryType.Search), eqSearchParams(params))).thenReturn(
                         queryResult);
             } else if (failure instanceof Exception) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
index eb1cb693f73..26b01f0ebe4 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/AbstractBackendSubResourceTest.java
@@ -30,7 +30,7 @@ public abstract class AbstractBackendSubResourceTest<R extends BaseResource, Q /
     protected static final String IMMUTABLE_ID_DETAIL_SERVER_LOCALE = "Versuchte Anderung der unveranderlichen Eigenschaft: id";
     protected static int CONFLICT = 409;
     protected static long Kb = 1024L;
-    protected static long Mb = 1024*Kb;
+    protected static long Mb = 1024 * Kb;
 
     protected S resource;
 
@@ -59,7 +59,7 @@ protected void injectSubCollectionAndTest() throws IllegalAccessException, Invoc
                 if (method.isAnnotationPresent(Path.class) && isSubCollectionLocator(method)) {
                     Object rawSubResource = method.invoke(resource);
                     if (rawSubResource instanceof AbstractBackendResource) {
-                        AbstractBackendResource<R, Q> subResource = (AbstractBackendResource<R, Q>)rawSubResource;
+                        AbstractBackendResource<R, Q> subResource = (AbstractBackendResource<R, Q>) rawSubResource;
                         assertNotNull(subResource.getBackend());
                         assertNotNull(subResource.getMappingLocator());
                     }
@@ -83,7 +83,7 @@ protected void verifyActionResponse(Response r, String baseUri, boolean async, S
         assertEquals(async ? 202 : 200, r.getStatus(), "unexpected status");
         Object entity = r.getEntity();
         assertTrue(entity instanceof Action, "expect Action response entity");
-        Action action = (Action)entity;
+        Action action = (Action) entity;
         if (async) {
             assertTrue(action.isAsync());
             assertNotNull(action.getHref());
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
index c64022111c1..b55a043dfd4 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendApiResourceTest.java
@@ -359,19 +359,19 @@ protected void verifyApi(Api api) {
         assertNotNull(api.getProductInfo());
         assertNotNull(api.getProductInfo().getVersion());
         assertNotNull(api.getProductInfo().getVersion().getFullVersion());
-        assertEquals(MAJOR,    api.getProductInfo().getVersion().getMajor().intValue());
-        assertEquals(MINOR,    api.getProductInfo().getVersion().getMinor().intValue());
-        assertEquals(BUILD,    api.getProductInfo().getVersion().getBuild().intValue());
+        assertEquals(MAJOR, api.getProductInfo().getVersion().getMajor().intValue());
+        assertEquals(MINOR, api.getProductInfo().getVersion().getMinor().intValue());
+        assertEquals(BUILD, api.getProductInfo().getVersion().getBuild().intValue());
         assertEquals(REVISION, api.getProductInfo().getVersion().getRevision().intValue());
 
         assertNotNull(api.getSummary());
-        assertEquals(TOTAL_VMS,              api.getSummary().getVms().getTotal().intValue());
-        assertEquals(ACTIVE_VMS,             api.getSummary().getVms().getActive().intValue());
-        assertEquals(TOTAL_HOSTS,            api.getSummary().getHosts().getTotal().intValue());
-        assertEquals(ACTIVE_HOSTS,           api.getSummary().getHosts().getActive().intValue());
-        assertEquals(TOTAL_USERS,            api.getSummary().getUsers().getTotal().intValue());
-        assertEquals(ACTIVE_USERS,           api.getSummary().getUsers().getActive().intValue());
-        assertEquals(TOTAL_STORAGE_DOMAINS,  api.getSummary().getStorageDomains().getTotal().intValue());
+        assertEquals(TOTAL_VMS, api.getSummary().getVms().getTotal().intValue());
+        assertEquals(ACTIVE_VMS, api.getSummary().getVms().getActive().intValue());
+        assertEquals(TOTAL_HOSTS, api.getSummary().getHosts().getTotal().intValue());
+        assertEquals(ACTIVE_HOSTS, api.getSummary().getHosts().getActive().intValue());
+        assertEquals(TOTAL_USERS, api.getSummary().getUsers().getTotal().intValue());
+        assertEquals(ACTIVE_USERS, api.getSummary().getUsers().getActive().intValue());
+        assertEquals(TOTAL_STORAGE_DOMAINS, api.getSummary().getStorageDomains().getTotal().intValue());
         assertEquals(ACTIVE_STORAGE_DOMAINS, api.getSummary().getStorageDomains().getActive().intValue());
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResourceTest.java
index 898c8bc1d22..7ccac74a2e3 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendAttachedStorageDomainsResourceTest.java
@@ -42,7 +42,7 @@ public class BackendAttachedStorageDomainsResourceTest
                                                   BackendAttachedStorageDomainsResource> {
 
     public BackendAttachedStorageDomainsResourceTest() {
-        super(new BackendAttachedStorageDomainsResource(GUIDS[NAMES.length-1].toString()), null, null);
+        super(new BackendAttachedStorageDomainsResource(GUIDS[NAMES.length - 1].toString()), null, null);
     }
 
     @Override
@@ -60,14 +60,14 @@ public void testAdd() {
         setUpCreationExpectations(ActionType.AttachStorageDomainToPool,
                                   AttachStorageDomainToPoolParameters.class,
                                   new String[] { "StorageDomainId", "StoragePoolId" },
-                                  new Object[] { GUIDS[0], GUIDS[NAMES.length-1] },
+                                  new Object[] { GUIDS[0], GUIDS[NAMES.length - 1] },
                                   true,
                                   true,
                                   null,
                                   QueryType.GetStorageDomainByIdAndStoragePoolId,
                                   StorageDomainAndPoolQueryParameters.class,
                                   new String[] { "StorageDomainId", "StoragePoolId" },
-                                  new Object[] { GUIDS[0], GUIDS[NAMES.length-1] },
+                                  new Object[] { GUIDS[0], GUIDS[NAMES.length - 1] },
                                   getEntity(0));
 
         StorageDomain model = new StorageDomain();
@@ -101,14 +101,14 @@ public void testAddByName() {
         setUpCreationExpectations(ActionType.AttachStorageDomainToPool,
                                   AttachStorageDomainToPoolParameters.class,
                                   new String[] { "StorageDomainId", "StoragePoolId" },
-                                  new Object[] { GUIDS[0], GUIDS[NAMES.length-1] },
+                                  new Object[] { GUIDS[0], GUIDS[NAMES.length - 1] },
                                   true,
                                   true,
                                   null,
                                   QueryType.GetStorageDomainByIdAndStoragePoolId,
                                   StorageDomainAndPoolQueryParameters.class,
                                   new String[] { "StorageDomainId", "StoragePoolId" },
-                                  new Object[] { GUIDS[0], GUIDS[NAMES.length-1] },
+                                  new Object[] { GUIDS[0], GUIDS[NAMES.length - 1] },
                 getEntity(0));
 
         StorageDomain model = new StorageDomain();
@@ -134,7 +134,7 @@ private void doTestBadAdd(boolean valid, boolean success, String detail) {
         setUriInfo(setUpActionExpectations(ActionType.AttachStorageDomainToPool,
                                            AttachStorageDomainToPoolParameters.class,
                                            new String[] { "StorageDomainId", "StoragePoolId" },
-                                           new Object[] { GUIDS[0], GUIDS[NAMES.length-1] },
+                                           new Object[] { GUIDS[0], GUIDS[NAMES.length - 1] },
                                            valid,
                                            success));
 
@@ -155,7 +155,7 @@ public void testAddIncompleteParameters() {
 
 
     private void setUpGetConnection(int times) {
-        for (int i=0; i<times; i++) {
+        for (int i = 0; i < times; i++) {
             setUpGetEntityExpectations(QueryType.GetStorageServerConnectionById,
                     StorageServerConnectionQueryParametersBase.class,
                     new String[] { "ServerConnectionId" },
@@ -188,7 +188,7 @@ protected void setUpQueryExpectations(String query, Object failure) {
         setUpEntityQueryExpectations(QueryType.GetStorageDomainsByStoragePoolId,
                                      IdQueryParameters.class,
                                      new String[] { "Id" },
-                                     new Object[] { GUIDS[NAMES.length-1] },
+                                     new Object[] { GUIDS[NAMES.length - 1] },
                                      setUpStorageDomains(),
                                      failure);
 
@@ -243,7 +243,7 @@ protected void verifyModel(StorageDomain model, int index) {
     private static void verifyStorageDomain(StorageDomain model, int index) {
         assertEquals(GUIDS[index].toString(), model.getId());
         assertNotNull(model.getDataCenter());
-        assertEquals(GUIDS[NAMES.length-1].toString(), model.getDataCenter().getId());
+        assertEquals(GUIDS[NAMES.length - 1].toString(), model.getDataCenter().getId());
         assertEquals(org.ovirt.engine.api.model.StorageDomainStatus.ACTIVE, model.getStatus());
         assertEquals(true, model.isMaster());
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendBookmarksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendBookmarksResourceTest.java
index 2544c4b3315..4f2fff581da 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendBookmarksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendBookmarksResourceTest.java
@@ -41,7 +41,7 @@ public void testAddBookmark() {
         Response response = collection.add(getModel(0));
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Bookmark);
-        verifyModel((Bookmark)response.getEntity(), 0);
+        verifyModel((Bookmark) response.getEntity(), 0);
     }
 
     @Test
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterExternalNetworkProvidersResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterExternalNetworkProvidersResourceTest.java
index d629323d9ae..8f5f88538ae 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterExternalNetworkProvidersResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendClusterExternalNetworkProvidersResourceTest.java
@@ -25,7 +25,7 @@ public class BackendClusterExternalNetworkProvidersResourceTest
 
     private static final int PROVIDER_INDEX = 0;
     private static final Guid PROVIDER_ID = GUIDS[PROVIDER_INDEX];
-    private static final Guid CLUSTER_ID = GUIDS[PROVIDER_INDEX +1];
+    private static final Guid CLUSTER_ID = GUIDS[PROVIDER_INDEX + 1];
 
     public BackendClusterExternalNetworkProvidersResourceTest() {
         super(new BackendClusterExternalNetworkProvidersResource(CLUSTER_ID), null, null);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClusterResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClusterResourceTest.java
index 2c7664d5701..1beaad19c56 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClusterResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDataCenterClusterResourceTest.java
@@ -51,13 +51,13 @@ public void initParent() {
     @Override
     protected void setUriInfo(UriInfo uriInfo) {
         resource.setUriInfo(uriInfo);
-        ((BackendDataCenterClusterResource)resource).getParent().setUriInfo(uriInfo);
+        ((BackendDataCenterClusterResource) resource).getParent().setUriInfo(uriInfo);
     }
 
     @Override
     protected void init() {
         initResource(resource);
-        initResource(((BackendDataCenterClusterResource)resource).getParent());
+        initResource(((BackendDataCenterClusterResource) resource).getParent());
     }
 
     @Test
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
index 56c6091e435..293669e9ef5 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDiskResourceTest.java
@@ -37,7 +37,7 @@
 
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class BackendDiskResourceTest
-        extends AbstractBackendSubResourceTest<Disk, org.ovirt.engine.core.common.businessentities.storage.Disk, BackendDiskResource>{
+        extends AbstractBackendSubResourceTest<Disk, org.ovirt.engine.core.common.businessentities.storage.Disk, BackendDiskResource> {
 
     protected static final Guid DISK_ID = GUIDS[1];
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
index aa47f0995f4..7a6cb496248 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendDisksResourceTest.java
@@ -62,7 +62,7 @@ protected org.ovirt.engine.core.common.businessentities.storage.Disk getEntity(i
         entity.setVolumeType(VolumeType.Sparse);
         entity.setShareable(false);
         entity.setPropagateErrors(PropagateErrors.On);
-        return setUpStatisticalEntityExpectations(entity);    }
+        return setUpStatisticalEntityExpectations(entity); }
 
     static org.ovirt.engine.core.common.businessentities.storage.Disk setUpStatisticalEntityExpectations(DiskImage entity) {
         entity.setReadRate(1L);
@@ -108,8 +108,8 @@ public void testAdd() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -152,8 +152,8 @@ public void testAddIdentifyStorageDomainByName() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     private List<org.ovirt.engine.core.common.businessentities.StorageDomain> getStorageDomains() {
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
index 9969249e56c..7c9fc1b9be2 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDiskResourceTest.java
@@ -45,7 +45,7 @@ public class BackendExportDomainDiskResourceTest
     private static final Guid TEMPLATE_ID = GUIDS[1];
     private static final Guid DISK_ID = GUIDS[2];
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
         return Stream.of(MockConfigDescriptor.of(ConfigValues.PropagateDiskErrors, false));
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
index b73287a3495..4f2e7a53b0b 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExportDomainDisksResourceTest.java
@@ -47,7 +47,7 @@ public class BackendExportDomainDisksResourceTest
 
     private static final Guid TEMPLATE_ID = GUIDS[1];
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     public BackendExportDomainDisksResourceTest() {
         super(new BackendExportDomainDisksResource(
@@ -91,7 +91,7 @@ protected org.ovirt.engine.core.common.businessentities.storage.Disk getEntity(i
         entity.setVolumeType(VolumeType.Sparse);
         entity.setShareable(false);
         entity.setPropagateErrors(PropagateErrors.On);
-        return setUpStatisticalEntityExpectations(entity);    }
+        return setUpStatisticalEntityExpectations(entity); }
 
     static org.ovirt.engine.core.common.businessentities.storage.Disk setUpStatisticalEntityExpectations(DiskImage entity) {
         entity.setReadRate(1L);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderHelperTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderHelperTest.java
index bb2b4cb07d9..1935dc06553 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderHelperTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendExternalProviderHelperTest.java
@@ -48,7 +48,7 @@ public void completeExternalNetworkProviderConfigurationsTest() {
         List<ExternalNetworkProviderConfiguration> configurationList =
                 configurations.getExternalNetworkProviderConfigurations();
 
-        for(int i = 0; i< PROVIDER_COUNT; i++) {
+        for (int i = 0; i < PROVIDER_COUNT; i++) {
             verifyModel(configurationList.get(i).getExternalNetworkProvider(), i);
         }
     }
@@ -74,7 +74,7 @@ public void completeExternalProvidersTest() {
         BackendExternalProviderHelper.completeExternalProviders(resource, providers);
         List<ExternalProvider> providerList = providers.getExternalProviders();
 
-        for(int i = 0; i< PROVIDER_COUNT; i++) {
+        for (int i = 0; i < PROVIDER_COUNT; i++) {
             verifyModel(providerList.get(i), i);
         }
     }
@@ -92,7 +92,7 @@ public void completeExternalProvidersNoNameTest() {
     }
 
     private void setUpQueryExpectations() {
-        for(int i = 0; i < LAST_PROVIDER_INDEX; i++) {
+        for (int i = 0; i < LAST_PROVIDER_INDEX; i++) {
             setUpEntityQueryExpectations(QueryType.GetProviderByName,
                     NameQueryParameters.class,
                     new String[]{"Name"},
@@ -109,7 +109,7 @@ private Provider setUpProvider(Guid id) {
 
     private ExternalNetworkProviderConfigurations getExternalNetworkProviderConfigurations(int count) {
         ExternalNetworkProviderConfigurations configurations = new ExternalNetworkProviderConfigurations();
-        for(int i = 0; i< PROVIDER_COUNT; i++) {
+        for (int i = 0; i < PROVIDER_COUNT; i++) {
             configurations.getExternalNetworkProviderConfigurations().add(getExternalNetworkProviderConfiguration(i));
         }
         return configurations;
@@ -124,7 +124,7 @@ private ExternalNetworkProviderConfiguration getExternalNetworkProviderConfigura
 
     private ExternalProviders getExternalProviders(int cont) {
         ExternalProviders providers = new ExternalProviders();
-        for(int i = 0; i < PROVIDER_COUNT; i++) {
+        for (int i = 0; i < PROVIDER_COUNT; i++) {
             providers.getExternalProviders().add(getExternalProvider(i));
         }
         return providers;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
index 27cab553e23..055cbdd1e36 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendFilesResourceTest.java
@@ -147,7 +147,7 @@ private void setupGetStorageDomainExpectations(org.ovirt.engine.core.common.busi
     }
 
     private org.ovirt.engine.core.common.businessentities.StorageDomain getStorageDomain(Guid id, StorageDomainType type) {
-        org.ovirt.engine.core.common.businessentities.StorageDomain sd =  new org.ovirt.engine.core.common.businessentities.StorageDomain();
+        org.ovirt.engine.core.common.businessentities.StorageDomain sd = new org.ovirt.engine.core.common.businessentities.StorageDomain();
         sd.setId(id);
         sd.setStorageDomainType(type);
         return sd;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagResourceTest.java
index 355c659dfdf..454bd97e11a 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendGroupTagResourceTest.java
@@ -82,7 +82,7 @@ private void setUpGetTagExpectations(boolean succeed) {
             GetTagsByUserGroupIdParameters.class,
             new String[] { "GroupId" },
             new Object[] { GROUP_ID.toString() },
-            succeed? setUpTagsExpectations(): Collections.emptyList()
+            succeed ? setUpTagsExpectations() : Collections.emptyList()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationResourceTest.java
index 364a32447d1..ab42f8d0eb3 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationResourceTest.java
@@ -28,7 +28,7 @@ public class BackendHostExternalNetworkProviderConfigurationResourceTest
 
     private static final int PROVIDER_INDEX = 0;
     private static final Guid PROVIDER_ID = GUIDS[PROVIDER_INDEX];
-    private static final Guid HOST_ID = GUIDS[PROVIDER_INDEX +1];
+    private static final Guid HOST_ID = GUIDS[PROVIDER_INDEX + 1];
 
     public BackendHostExternalNetworkProviderConfigurationResourceTest() {
         super(new BackendHostExternalNetworkProviderConfigurationResource(PROVIDER_ID.toString(), HOST_ID));
@@ -85,7 +85,7 @@ private Provider setUpEntityExpectations(
     @Override
     protected void verifyModel(ExternalNetworkProviderConfiguration model, int index) {
         assertEquals(HexUtils.string2hex(GUIDS[index].toString()), model.getId());
-        assertEquals(GUIDS[index+1].toString(), model.getHost().getId());
+        assertEquals(GUIDS[index + 1].toString(), model.getHost().getId());
         assertEquals(GUIDS[index].toString(), model.getExternalNetworkProvider().getId());
         verifyLinks(model);
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResourceTest.java
index 6ce440f79d7..1c934ec2f2f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostExternalNetworkProviderConfigurationsResourceTest.java
@@ -26,8 +26,8 @@ public class BackendHostExternalNetworkProviderConfigurationsResourceTest
 
     private static final int PROVIDER_INDEX = 0;
     private static final Guid PROVIDER_ID = GUIDS[PROVIDER_INDEX];
-    private static final Guid HOST_ID = GUIDS[PROVIDER_INDEX +1];
-    private static final Guid CLUSTER_ID = GUIDS[PROVIDER_INDEX +1];
+    private static final Guid HOST_ID = GUIDS[PROVIDER_INDEX + 1];
+    private static final Guid CLUSTER_ID = GUIDS[PROVIDER_INDEX + 1];
 
     public BackendHostExternalNetworkProviderConfigurationsResourceTest() {
         super(new BackendHostExternalNetworkProviderConfigurationsResource(HOST_ID), null, null);
@@ -128,7 +128,7 @@ protected void verifyCollection(List<ExternalNetworkProviderConfiguration> colle
     @Override
     protected void verifyModel(ExternalNetworkProviderConfiguration model, int index) {
         assertEquals(HexUtils.string2hex(GUIDS[index].toString()), model.getId());
-        assertEquals(GUIDS[index+1].toString(), model.getHost().getId());
+        assertEquals(GUIDS[index + 1].toString(), model.getHost().getId());
         assertEquals(GUIDS[index].toString(), model.getExternalNetworkProvider().getId());
         verifyLinks(model);
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
index 29bb004dacc..f40bd76273b 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostNicResourceTest.java
@@ -119,7 +119,7 @@ public void testStatisticalQuery() throws Exception {
 
         @SuppressWarnings("unchecked")
         BackendStatisticsResource<HostNic, VdsNetworkInterface> statisticsResource =
-            (BackendStatisticsResource<HostNic, VdsNetworkInterface>)resource.getStatisticsResource();
+            (BackendStatisticsResource<HostNic, VdsNetworkInterface>) resource.getStatisticsResource();
         assertNotNull(statisticsResource);
 
         verifyQuery(statisticsResource.getQuery(), entity);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java
index 61b153eacba..1e3e30ffe14 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java
@@ -150,7 +150,7 @@ public void testUpdateWithClusterId() {
         setUriInfo(setUpActionExpectations(ActionType.ChangeVDSCluster,
                 ChangeVDSClusterParameters.class,
                 new String[] { "ClusterId", "VdsId" },
-                new Object[] { GUIDS[1],  GUIDS[0]},
+                new Object[] { GUIDS[1], GUIDS[0]},
                 true,
                 true,
                 new ActionReturnValue(),
@@ -278,7 +278,7 @@ private void doTestActivateAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus
 
         Response response = resource.activate(new Action());
         verifyActionResponse(response, "hosts/" + GUIDS[0], true, null);
-        Action action = (Action)response.getEntity();
+        Action action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(actionStatus.value(), action.getStatus());
 
@@ -301,7 +301,7 @@ public void testApproveChangingCluster() {
         setUriInfo(setUpActionExpectations(ActionType.ChangeVDSCluster,
                                            ChangeVDSClusterParameters.class,
                                            new String[] { "ClusterId", "VdsId" },
-                                           new Object[] { GUIDS[0],  GUIDS[0]},
+                                           new Object[] { GUIDS[0], GUIDS[0]},
                                            true,
                                            true,
                                            new ActionReturnValue(),
@@ -511,7 +511,7 @@ public void testStatisticalQuery() throws Exception {
 
         @SuppressWarnings("unchecked")
         BackendStatisticsResource<Host, VDS> statisticsResource =
-            (BackendStatisticsResource<Host, VDS>)resource.getStatisticsResource();
+            (BackendStatisticsResource<Host, VDS>) resource.getStatisticsResource();
         assertNotNull(statisticsResource);
 
         verifyQuery(statisticsResource.getQuery(), entity);
@@ -544,7 +544,7 @@ public void testFenceStatusFailure() {
         Action action = new Action();
         action.setFenceType(FenceType.STATUS.value());
         Response response = resource.fence(action);
-        Action actionReturned = (Action)response.getEntity();
+        Action actionReturned = (Action) response.getEntity();
         assertEquals(actionReturned.getStatus(), CreationStatus.FAILED.value());
         assertNotNull(actionReturned.getFault());
         assertEquals("some_error", actionReturned.getFault().getReason());
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagResourceTest.java
index 8dd124b48d0..e8e75008274 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostTagResourceTest.java
@@ -82,7 +82,7 @@ private void setUpGetTagExpectations(boolean succeed) {
             GetTagsByVdsIdParameters.class,
             new String[] { "VdsId" },
             new Object[] { HOST_ID.toString() },
-            succeed? setUpTagsExpectations(): Collections.emptyList()
+            succeed ? setUpTagsExpectations() : Collections.emptyList()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResourceTest.java
index 4e669c350d2..2e0df848950 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendInstanceTypeWatchdogsResourceTest.java
@@ -105,7 +105,7 @@ private Watchdog getModel() {
     protected void verifyCollection(List<Watchdog> collection) {
         assertNotNull(collection);
         assertEquals(1, collection.size());
-        if(!collection.isEmpty()) {
+        if (!collection.isEmpty()) {
             verifyModel(collection.get(0));
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendLinkLayerDiscoveryProtocolResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendLinkLayerDiscoveryProtocolResourceTest.java
index 35171e75769..e39da497afe 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendLinkLayerDiscoveryProtocolResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendLinkLayerDiscoveryProtocolResourceTest.java
@@ -19,7 +19,7 @@
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class BackendLinkLayerDiscoveryProtocolResourceTest
         extends AbstractBackendCollectionResourceTest<LinkLayerDiscoveryProtocolElement, Tlv,
-        BackendLinkLayerDiscoveryProtocolResource>{
+        BackendLinkLayerDiscoveryProtocolResource> {
 
     private static final Guid NIC_ID = GUIDS[0];
     private static final String PROPERTY_NAME = "propertyName";
@@ -79,7 +79,7 @@ public static Nic getNic() {
 
     protected List<Tlv> getEntityList() {
         List<Tlv> entities = new ArrayList<>();
-        for(int index=0; index< NAMES.length; index++) {
+        for (int index = 0; index < NAMES.length; index++) {
             Tlv tlv = new Tlv();
             tlv.setName(NAMES[index]);
             tlv.setType(getType(index));
@@ -110,14 +110,14 @@ private int getType(int index) {
     }
 
     private int getOui(int index) {
-        return 2*index;
+        return 2 * index;
     }
 
     private int getSubType(int index) {
-        return 3*index;
+        return 3 * index;
     }
 
     private String getPropertyValue(int index) {
-        return Integer.toString(4*index);
+        return Integer.toString(4 * index);
     }
 }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java
index e2e7920c5c7..f908f18e872 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermissionResourceTest.java
@@ -183,7 +183,7 @@ protected void verifyModel(Permission model, int index) {
 
     protected ArrayList<DbUser> getUsers() {
         ArrayList<DbUser> users = new ArrayList<>();
-        for (int i=0; i < NAMES.length; i++) {
+        for (int i = 0; i < NAMES.length; i++) {
             DbUser user = new DbUser();
             user.setId(GUIDS[i]);
             user.setLoginName(NAMES[i]);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermitsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermitsResourceTest.java
index 7bdda47317a..a69dd2b03a0 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermitsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendPermitsResourceTest.java
@@ -54,7 +54,7 @@ public void testAddPermit() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Permit);
-        verifyModel((Permit)response.getEntity(), 0);
+        verifyModel((Permit) response.getEntity(), 0);
     }
 
     @Override
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResourceTest.java
index cfea9288ac8..8ff6671ae10 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendQuotasResourceTest.java
@@ -41,7 +41,7 @@ protected List<Quota> getCollection() {
 
     protected List<org.ovirt.engine.core.common.businessentities.Quota> getQuotas() {
         List<org.ovirt.engine.core.common.businessentities.Quota> quotas = new LinkedList<>();
-        for (int index=0; index<NAMES.length; index++) {
+        for (int index = 0; index < NAMES.length; index++) {
             quotas.add(getEntity(index));
         }
         return quotas;
@@ -113,20 +113,20 @@ private void setGetQuotasExpectations() {
     @Test
     @Disabled
     @Override
-    public void testListFailure() {}
+    public void testListFailure() { }
 
     @Test
     @Disabled
     @Override
-    public void testListCrash() {}
+    public void testListCrash() { }
 
     @Test
     @Disabled
     @Override
-    public void testListCrashClientLocale() {}
+    public void testListCrashClientLocale() { }
 
     @Test
     @Disabled
     @Override
-    public void testQuery() {} //queries on quotas not supported by API yet.
+    public void testQuery() { } //queries on quotas not supported by API yet.
 }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRoleResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRoleResourceTest.java
index 5d5b29bf034..700e5de6b39 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRoleResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRoleResourceTest.java
@@ -93,7 +93,7 @@ private Role getModel() {
     }
 
     protected void setUpGetEntityExpectations(int times) {
-        for (int i=0; i<times; i++) {
+        for (int i = 0; i < times; i++) {
             setUpGetEntityExpectations(QueryType.GetRoleById,
                                        IdQueryParameters.class,
                                        new String[] { "Id" },
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java
index 7bfdca19b40..7ef3af751cf 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendRolesResourceTest.java
@@ -58,7 +58,7 @@ public void testAddRole() {
         model.setName(NAMES[0]);
         model.setPermits(new Permits());
         model.getPermits().getPermits().add(new Permit());
-        model.getPermits().getPermits().get(0).setId(""+ActionGroup.CREATE_VM.getId());
+        model.getPermits().getPermits().get(0).setId("" + ActionGroup.CREATE_VM.getId());
 
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotsResourceTest.java
index 0ca6615e4fa..b40a0c6976e 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendSnapshotsResourceTest.java
@@ -123,7 +123,7 @@ public void testGetWithPopulate() {
                 new Object[]{SNAPSHOT_IDS[0]},
                 resultSnapshot1);
         collection.setUriInfo(uriInfo);
-        List<Snapshot> snapshots =  getCollection();
+        List<Snapshot> snapshots = getCollection();
         verifyCollection(snapshots);
         for (int i = 0; i < 2; i++) {
             verifyAllContent(snapshots.get(i), ConfigurationType.OVF, ovfData);
@@ -181,7 +181,7 @@ private void doTestAddAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus crea
         Response response = collection.add(snapshot);
         assertEquals(202, response.getStatus());
         assertTrue(response.getEntity() instanceof Snapshot);
-        Snapshot responseSnapshot = (Snapshot)response.getEntity();
+        Snapshot responseSnapshot = (Snapshot) response.getEntity();
         verifyModel(responseSnapshot, 0);
         verifyAllContent(responseSnapshot, ConfigurationType.OVF, ovfData);
         assertNotNull(responseSnapshot.getCreationStatus());
@@ -208,7 +208,7 @@ protected void setUpGetSnapshotVmConfiguration(Guid snpashotId) {
 
     protected List<org.ovirt.engine.core.common.businessentities.Snapshot> getEntities() {
         List<org.ovirt.engine.core.common.businessentities.Snapshot> entities = new ArrayList<>();
-        for (int i = 0; i<2; i++) {
+        for (int i = 0; i < 2; i++) {
             entities.add(getEntity(i));
         }
         return entities;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResourceTest.java
index 4c60cb1d998..30a8f3d12db 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStatisticsResourceTest.java
@@ -93,10 +93,10 @@ protected void setUpQueryExpectations(String unused, final Object failure) throw
             }
             when(query.getStatistics(same(entity))).thenReturn(statistics);
             when(query.getParentType()).thenReturn(Host.class);
-        } else  if (failure instanceof String) {
-            String detail = mockl10n((String)failure);
+        } else if (failure instanceof String) {
+            String detail = mockl10n((String) failure);
             when(query.resolve(eq(GUIDS[1]))).thenThrow(new BaseBackendResource.BackendFailureException(detail, Status.CONFLICT));
-        } else  if (failure instanceof Exception) {
+        } else if (failure instanceof Exception) {
             when(query.resolve(eq(GUIDS[1]))).thenThrow((Exception) failure);
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepResourceTest.java
index 1a4aafff38a..08794024c60 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepResourceTest.java
@@ -89,7 +89,7 @@ protected void verifyModel(Step model, int index) {
     }
 
     private void verifyActionResponse(Response r) {
-        verifyActionResponse(r, "jobs/" + GUIDS[1] + "/steps/" + GUIDS[0]  , false);
+        verifyActionResponse(r, "jobs/" + GUIDS[1] + "/steps/" + GUIDS[0] , false);
     }
 }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
index e49c825b744..e22fec673b5 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStepsResourceTest.java
@@ -55,7 +55,7 @@ protected void setUpQueryExpectations(String query, Object failure) {
 
     @Override
     protected org.ovirt.engine.core.common.job.Step getEntity(int index) {
-        int jobIndex = index == 0 ? 1 : index -1;
+        int jobIndex = index == 0 ? 1 : index - 1;
         org.ovirt.engine.core.common.job.Step step = new org.ovirt.engine.core.common.job.Step();
         step.setId(GUIDS[index]);
         step.setJobId(GUIDS[jobIndex]);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
index 49aa6348de6..833e4b14fd3 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainDisksResourceTest.java
@@ -61,7 +61,7 @@ protected org.ovirt.engine.core.common.businessentities.storage.Disk getEntity(i
         entity.setVolumeType(VolumeType.Sparse);
         entity.setShareable(false);
         entity.setPropagateErrors(PropagateErrors.On);
-        return setUpStatisticalEntityExpectations(entity);    }
+        return setUpStatisticalEntityExpectations(entity); }
 
     static org.ovirt.engine.core.common.businessentities.storage.Disk setUpStatisticalEntityExpectations(DiskImage entity) {
         entity.setReadRate(1L);
@@ -101,8 +101,8 @@ public void testAdd() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -141,8 +141,8 @@ public void testAddUnregistered() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -174,8 +174,8 @@ public void testAddIdentifyStorageDomainByName() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Override
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResourceTest.java
index db0d55cc635..413f2014532 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainResourceTest.java
@@ -351,7 +351,7 @@ public void testRefreshLunsSize() {
                 true,
                 true));
         Action action = new Action();
-        LogicalUnits luns= new LogicalUnits();
+        LogicalUnits luns = new LogicalUnits();
         LogicalUnit lun = new LogicalUnit();
         lun.setId(GUIDS[2].toString());
         luns.getLogicalUnits().add(lun);
@@ -371,7 +371,7 @@ public void reduceLuns() {
                 true,
                 true));
         Action action = new Action();
-        LogicalUnits luns= new LogicalUnits();
+        LogicalUnits luns = new LogicalUnits();
 
         paramsLuns.forEach(s -> {
             LogicalUnit lun = new LogicalUnit();
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
index 334ac1320ef..3ab2ca53f04 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplateResourceTest.java
@@ -57,7 +57,7 @@ public class BackendStorageDomainTemplateResourceTest
 
     private static final Guid TEMPLATE_ID = GUIDS[1];
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     private static final String URL_BASE = "storagedomains/" + STORAGE_DOMAIN_ID + "/templates/" + TEMPLATE_ID;
 
@@ -248,7 +248,7 @@ protected void doTestBadRemove(boolean valid, boolean success, String detail) {
     }
 
     private void setUpGetDataCenterByStorageDomainExpectations(Guid id, int times) {
-        while (times-->0) {
+        while (times-- > 0) {
             setUpEntityQueryExpectations(QueryType.GetStoragePoolsByStorageDomainId,
                     IdQueryParameters.class,
                     new String[] { "Id" },
@@ -314,7 +314,7 @@ private void doTestImportAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus a
 
         Response response = resource.doImport(action);
         verifyActionResponse(response, URL_BASE, true, null);
-        action = (Action)response.getEntity();
+        action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(actionStatus.value(), action.getStatus());
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
index ecc884a889c..d418a60a9ea 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainTemplatesResourceTest.java
@@ -35,7 +35,7 @@ public class BackendStorageDomainTemplatesResourceTest
     extends AbstractBackendCollectionResourceTest<Template, VmTemplate, BackendStorageDomainTemplatesResource> {
 
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     public BackendStorageDomainTemplatesResourceTest() {
         super(new BackendStorageDomainTemplatesResource(STORAGE_DOMAIN_ID), null, null);
@@ -162,7 +162,7 @@ protected void verifyModel(Template model, int index) {
     }
 
     private void setUpGetDataCenterByStorageDomainExpectations(Guid id, int times) {
-        while (times-->0) {
+        while (times-- > 0) {
             setUpEntityQueryExpectations(QueryType.GetStoragePoolsByStorageDomainId,
                     IdQueryParameters.class,
                     new String[] { "Id" },
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java
index 39b9b623544..54d6459484b 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmResourceTest.java
@@ -50,7 +50,7 @@ public class BackendStorageDomainVmResourceTest
 
     private static final Guid VM_ID = GUIDS[1];
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     private static final String URL_BASE = "storagedomains/" + STORAGE_DOMAIN_ID + "/vms/" + VM_ID;
 
@@ -367,7 +367,7 @@ private void doTestImportAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus a
 
         Response response = resource.doImport(action);
         verifyActionResponse(response, URL_BASE, true, null);
-        action = (Action)response.getEntity();
+        action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(actionStatus.value(), action.getStatus());
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java
index 11c9f0d08d8..d304ee0fe9f 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageDomainVmsResourceTest.java
@@ -28,7 +28,7 @@ public class BackendStorageDomainVmsResourceTest
                                                   BackendStorageDomainVmsResource> {
 
     private static final Guid DATA_CENTER_ID = GUIDS[0];
-    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length-1];
+    private static final Guid STORAGE_DOMAIN_ID = GUIDS[GUIDS.length - 1];
 
     public BackendStorageDomainVmsResourceTest() {
         super(new BackendStorageDomainVmsResource(STORAGE_DOMAIN_ID), null, null);
@@ -136,7 +136,7 @@ protected void verifyModel(Vm model, int index) {
     }
 
     private void setUpGetDataCenterByStorageDomainExpectations(Guid id, int times) {
-        while (times-->0) {
+        while (times-- > 0) {
             setUpEntityQueryExpectations(QueryType.GetStoragePoolsByStorageDomainId,
                     IdQueryParameters.class,
                     new String[] { "Id" },
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionExtensionsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionExtensionsResourceTest.java
index e3afb5f26ca..5d0cd7d6503 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionExtensionsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionExtensionsResourceTest.java
@@ -23,9 +23,9 @@
 import org.ovirt.engine.core.compat.Guid;
 
 @MockitoSettings(strictness = Strictness.LENIENT)
-public class BackendStorageServerConnectionExtensionsResourceTest extends AbstractBackendCollectionResourceTest<StorageConnectionExtension, StorageServerConnectionExtension, BackendStorageServerConnectionExtensionsResource>{
+public class BackendStorageServerConnectionExtensionsResourceTest extends AbstractBackendCollectionResourceTest<StorageConnectionExtension, StorageServerConnectionExtension, BackendStorageServerConnectionExtensionsResource> {
     private static Guid hostID = GUIDS[1];
-    private Guid extensionID    = GUIDS[0];
+    private Guid extensionID = GUIDS[0];
     private String iqn = "iqn";
     private String user = "user";
     private String pass = "pass";
@@ -108,7 +108,7 @@ public void testListCrashClientLocale() {
 
     public List<StorageServerConnectionExtension> getEntityList(int numOfEntities) {
         List<StorageServerConnectionExtension> retVal = new ArrayList<>();
-        for (int i = 0; i<numOfEntities; i++) {
+        for (int i = 0; i < numOfEntities; i++) {
             retVal.add(StorageConnectionExtensionResourceTestHelper.getEntity(extensionID, hostID, pass, user, iqn));
         }
         return retVal;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
index 1ad77d206f3..78657f81d80 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendStorageServerConnectionResourceTest.java
@@ -148,7 +148,7 @@ public void testRemoveValidateFail() {
                 GUIDS[1].toString()
         );
         setUriInfo(uriInfo);
-        verifyBadRequest(assertThrows(WebApplicationException.class, () ->  resource.remove()));
+        verifyBadRequest(assertThrows(WebApplicationException.class, () -> resource.remove()));
     }
 
     protected void update(boolean valid, boolean executeCommandResult, int getConnectionExecTimes) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
index d3ebacab768..48e6996de8c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTagsResourceTest.java
@@ -36,7 +36,7 @@
 public class BackendTagsResourceTest
     extends AbstractBackendCollectionResourceTest<Tag, Tags, BackendTagsResource> {
 
-    static int PARENT_IDX = NAMES.length-1;
+    static int PARENT_IDX = NAMES.length - 1;
     static Guid PARENT_GUID = GUIDS[PARENT_IDX];
 
     public BackendTagsResourceTest() {
@@ -91,7 +91,7 @@ public void testAddTag() {
         Response response = collection.add(getModel(0));
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Tag);
-        verifyModel((Tag)response.getEntity(), 0);
+        verifyModel((Tag) response.getEntity(), 0);
     }
 
     @Test
@@ -124,7 +124,7 @@ public void testAddTagNamedParent() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Tag);
-        verifyModel((Tag)response.getEntity(), 0);
+        verifyModel((Tag) response.getEntity(), 0);
     }
 
     @Test
@@ -152,7 +152,7 @@ public void testAddTagNoParent() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Tag);
-        verifyModel((Tag)response.getEntity(), 0, Guid.Empty.toString());
+        verifyModel((Tag) response.getEntity(), 0, Guid.Empty.toString());
     }
 
     @Test
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
index e8ddb99dee6..494b7931278 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateResourceTest.java
@@ -328,7 +328,7 @@ public void testExportAsyncInProgress() {
 
         Response response = resource.export(action);
         verifyActionResponse(response, "templates/" + GUIDS[0], true, null);
-        action = (Action)response.getEntity();
+        action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(CreationStatus.IN_PROGRESS.value(), action.getStatus());
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateTagResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateTagResourceTest.java
index 22a2900979b..74bba8e65f0 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateTagResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateTagResourceTest.java
@@ -84,7 +84,7 @@ private void setUpGetTagsExpectations(boolean succeed) {
             GetTagsByTemplateIdParameters.class,
             new String[] { "TemplateId" },
             new Object[] { TEMPLATE_ID.toString() },
-            succeed? setUpTagsExpectations(): Collections.emptyList()
+            succeed ? setUpTagsExpectations() : Collections.emptyList()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResourceTest.java
index 31fa7090795..012f663e687 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplateWatchdogsResourceTest.java
@@ -105,7 +105,7 @@ private Watchdog getModel() {
     protected void verifyCollection(List<Watchdog> collection) {
         assertNotNull(collection);
         assertEquals(1, collection.size());
-        if(!collection.isEmpty()) {
+        if (!collection.isEmpty()) {
             verifyModel(collection.get(0));
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
index 0e61e120c07..8b5ffda8e77 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesBasedResourceTest.java
@@ -45,7 +45,7 @@ public void testAdd() throws Exception {
 
         Response response = doAdd(getRestModel(0));
         assertEquals(201, response.getStatus());
-        verifyModel((R)response.getEntity(), 0);
+        verifyModel((R) response.getEntity(), 0);
         assertNull(((R) response.getEntity()).getCreationStatus());
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java
index 9694f21a918..ee7ef6e7678 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendTemplatesResourceTest.java
@@ -104,8 +104,8 @@ private void doTestAddWithClonePermissions(Template model, boolean copy) {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
-        verifyModel((Template)response.getEntity(), 0);
-        assertNull(((Template)response.getEntity()).getCreationStatus());
+        verifyModel((Template) response.getEntity(), 0);
+        assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
     protected Cluster getClusterEntity() {
@@ -161,7 +161,7 @@ private void doTestAddAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus crea
         assertEquals(202, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
         verifyModel((Template) response.getEntity(), 0);
-        Template created = (Template)response.getEntity();
+        Template created = (Template) response.getEntity();
         assertNotNull(created.getCreationStatus());
         assertEquals(creationStatus.value(), created.getCreationStatus());
     }
@@ -252,7 +252,7 @@ public void testAddVersion() {
             assertTrue(response.getEntity() instanceof Template);
             assertEquals(VERSION_NAME, ((Template) response.getEntity()).getVersion().getVersionName());
             assertEquals(((Template) response.getEntity()).getVersion().getBaseTemplate().getId(), GUIDS[1].toString());
-            verifyModel((Template)response.getEntity(), 2);
+            verifyModel((Template) response.getEntity(), 2);
     }
 
     @Test
@@ -297,8 +297,8 @@ public void testAddNamedVm() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
-        verifyModel((Template)response.getEntity(), 0);
-        assertNull(((Template)response.getEntity()).getCreationStatus());
+        verifyModel((Template) response.getEntity(), 0);
+        assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -344,8 +344,8 @@ public void testAddNamedVmFiltered() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
-        verifyModel((Template)response.getEntity(), 0);
-        assertNull(((Template)response.getEntity()).getCreationStatus());
+        verifyModel((Template) response.getEntity(), 0);
+        assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -389,8 +389,8 @@ public void testAddWithCluster() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
-        verifyModel((Template)response.getEntity(), 0);
-        assertNull(((Template)response.getEntity()).getCreationStatus());
+        verifyModel((Template) response.getEntity(), 0);
+        assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -445,8 +445,8 @@ public void testAddWithClusterName() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Template);
-        verifyModel((Template)response.getEntity(), 0);
-        assertNull(((Template)response.getEntity()).getCreationStatus());
+        verifyModel((Template) response.getEntity(), 0);
+        assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -515,7 +515,7 @@ public void testAddUploadIcon() {
         restModel.setLargeIcon(IconTestHelpler.createIconWithData());
         Response response = doAdd(restModel);
         assertEquals(201, response.getStatus());
-        verifyModel((Template)response.getEntity(), 0);
+        verifyModel((Template) response.getEntity(), 0);
         assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
@@ -554,7 +554,7 @@ public void testAddUseExistingIcons() {
         restModel.setLargeIcon(IconTestHelpler.createIcon(GUIDS[3]));
         Response response = doAdd(restModel);
         assertEquals(201, response.getStatus());
-        verifyModel((Template)response.getEntity(), 0);
+        verifyModel((Template) response.getEntity(), 0);
         assertNull(((Template) response.getEntity()).getCreationStatus());
     }
 
@@ -590,7 +590,7 @@ static VmTemplate setUpEntityExpectations(VmTemplate entity, int index) {
         when(entity.getNumOfSockets()).thenReturn(2);
         when(entity.getThreadsPerCpu()).thenReturn(1);
         when(entity.getCpuPerSocket()).thenReturn(4);
-        if(index == 2) {
+        if (index == 2) {
            when(entity.getTemplateVersionName()).thenReturn(VERSION_NAME);
            when(entity.getTemplateVersionNumber()).thenReturn(2);
            when(entity.getBaseTemplateId()).thenReturn(GUIDS[1]);
@@ -615,7 +615,7 @@ static Template getModel(int index) {
         model.getVm().setId(GUIDS[1].toString());
         model.setCluster(new org.ovirt.engine.api.model.Cluster());
         model.getCluster().setId(GUIDS[2].toString());
-        if(index == 2) {
+        if (index == 2) {
             populateVersion(model);
         }
         return model;
@@ -641,7 +641,7 @@ protected void verifyCollection(List<Template> collection) throws Exception {
         super.verifyCollection(collection);
 
         for (Template template : collection) {
-            if(template.getId().equals(GUIDS[2].toString())) {
+            if (template.getId().equals(GUIDS[2].toString())) {
                  assertEquals(VERSION_NAME, template.getVersion().getVersionName());
                  assertEquals(new Integer(2), template.getVersion().getVersionNumber());
                  assertEquals(template.getVersion().getBaseTemplate().getId(), GUIDS[1].toString());
@@ -667,7 +667,7 @@ static void verifyModelSpecific(Template model, int index) {
         assertEquals(4, model.getCpu().getTopology().getCores().intValue());
         assertEquals(2, model.getCpu().getTopology().getSockets().intValue());
         assertEquals(1, model.getCpu().getTopology().getThreads().intValue());
-        if(index == 2) {
+        if (index == 2) {
             assertNotNull(model.getVersion());
             assertNotSame(model.getVersion().getBaseTemplate().getId(), model.getId());
         }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserTagResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserTagResourceTest.java
index c8ef7a9918e..358f5c6a0ca 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserTagResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendUserTagResourceTest.java
@@ -82,7 +82,7 @@ private void setUpGetTagExpectations(boolean succeed) {
             GetTagsByUserIdParameters.class,
             new String[] { "UserId" },
             new Object[] { USER_ID.toString() },
-            succeed? setUpTagsExpectations(): Collections.emptyList()
+            succeed ? setUpTagsExpectations() : Collections.emptyList()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmCdromsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmCdromsResourceTest.java
index 175e4e41be3..bc0e6852fae 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmCdromsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmCdromsResourceTest.java
@@ -173,7 +173,7 @@ private void setUpEntityQueryExpectations(
             Object[] queryValues,
             Object queryReturn,
             int times) {
-        while (times-->0) {
+        while (times-- > 0) {
             setUpEntityQueryExpectations(query, queryClass, queryNames, queryValues, queryReturn);
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java
index 59fb64c4498..ed63b0db1eb 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDiskResourceTest.java
@@ -63,7 +63,7 @@ public class BackendVmDiskResourceTest
     private static final Guid DISK_ID = GUIDS[1];
 
     public BackendVmDiskResourceTest() {
-        super((BackendVmDiskResource)getCollection().getDiskResource(DISK_ID.toString()));
+        super((BackendVmDiskResource) getCollection().getDiskResource(DISK_ID.toString()));
     }
 
     protected static BackendVmDisksResource getCollection() {
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
index 3890d6d00e6..3aa3860f0ff 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmDisksResourceTest.java
@@ -277,7 +277,7 @@ private void doTestAddAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus crea
         assertEquals(202, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
         verifyModel((Disk) response.getEntity(), 0);
-        Disk created = (Disk)response.getEntity();
+        Disk created = (Disk) response.getEntity();
         assertNotNull(created.getCreationStatus());
         assertEquals(creationStatus.value(), created.getCreationStatus());
     }
@@ -301,8 +301,8 @@ public void testAddDiskWithJobId() {
         Response response = collection.add(getModel());
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -324,8 +324,8 @@ public void testAddDiskWithStepId() {
         Response response = collection.add(getModel());
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     private void setUpGetDiskExpectations() {
@@ -387,8 +387,8 @@ private void testAddDiskImpl(Disk model) {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
@@ -437,8 +437,8 @@ public void testAddDiskIdentifyStorageDomainByName() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     private List<org.ovirt.engine.core.common.businessentities.StorageDomain> getStorageDomains() {
@@ -492,8 +492,8 @@ public void testAddDiskWithinStorageDomain() {
         Response response = collection.add(model);
         assertEquals(201, response.getStatus());
         assertTrue(response.getEntity() instanceof Disk);
-        verifyModel((Disk)response.getEntity(), 0);
-        assertNull(((Disk)response.getEntity()).getCreationStatus());
+        verifyModel((Disk) response.getEntity(), 0);
+        assertNull(((Disk) response.getEntity()).getCreationStatus());
     }
 
     @Test
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResourceTest.java
index b918b8e5dfc..e8ef85dd7a6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmPoolResourceTest.java
@@ -139,9 +139,9 @@ protected UriInfo setUpActionExpectations(ActionType task,
 
     private void verifyTestAllocateVmActionResponse(Response r) {
         assertNotNull(r.getEntity());
-        assertNotNull(((org.ovirt.engine.api.model.Action)r.getEntity()).getVm());
-        assertNotNull(((org.ovirt.engine.api.model.Action)r.getEntity()).getVm().getId());
-        assertEquals(((org.ovirt.engine.api.model.Action)r.getEntity()).getVm().getId(), GUIDS[0].toString());
+        assertNotNull(((org.ovirt.engine.api.model.Action) r.getEntity()).getVm());
+        assertNotNull(((org.ovirt.engine.api.model.Action) r.getEntity()).getVm().getId());
+        assertEquals(((org.ovirt.engine.api.model.Action) r.getEntity()).getVm().getId(), GUIDS[0].toString());
 
         verifyActionResponse(r, "vmpools/" + GUIDS[0], false);
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
index c7ab73dbfab..8a7cbf06af9 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
@@ -393,7 +393,7 @@ public void testUpdateVmPolicyHostsIds() {
         Vm model = getModel(0);
         model.setPlacementPolicy(new VmPlacementPolicy());
         Hosts hosts = new Hosts();
-        for (int i =0; i < GUIDS.length; i++){
+        for (int i = 0; i < GUIDS.length; i++) {
             Host newHost = new Host();
             newHost.setId(GUIDS[i].toString());
             hosts.getHosts().add(newHost);
@@ -405,7 +405,7 @@ public void testUpdateVmPolicyHostsIds() {
     @Test
     public void testUpdateVmPolicyHostsNames() {
         setUpUdpateVm();
-        for (int i =0; i < NAMES.length; i++){
+        for (int i = 0; i < NAMES.length; i++) {
             setUpGetHostByNameExpectations(i);
         }
         setUriInfo(setUpActionExpectations(ActionType.UpdateVm,
@@ -418,7 +418,7 @@ public void testUpdateVmPolicyHostsNames() {
         Vm model = getModel(0);
         model.setPlacementPolicy(new VmPlacementPolicy());
         Hosts hosts = new Hosts();
-        for (int i =0; i < NAMES.length; i++){
+        for (int i = 0; i < NAMES.length; i++) {
             Host newHost = new Host();
             newHost.setName(NAMES[i]);
             hosts.getHosts().add(newHost);
@@ -716,7 +716,7 @@ private void doTestSuspendAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus
 
         Response response = resource.suspend(new Action());
         verifyActionResponse(response, "vms/" + GUIDS[0], true, null);
-        Action action = (Action)response.getEntity();
+        Action action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(actionStatus.value(), action.getStatus());
 
@@ -871,7 +871,7 @@ public void testPreviewSnapshot() {
         action.setSnapshot(snapshot);
         Response response = resource.previewSnapshot(action);
         verifyActionResponse(response);
-        Action actionResponse = (Action)response.getEntity();
+        Action actionResponse = (Action) response.getEntity();
         assertTrue(actionResponse.isSetStatus());
         assertEquals(CreationStatus.COMPLETE.value(), actionResponse.getStatus());
     }
@@ -884,7 +884,7 @@ public void testUndoSnapshot() {
                                            new Object[] { GUIDS[0], SnapshotActionEnum.UNDO }));
         Response response = resource.undoSnapshot(new Action());
         verifyActionResponse(response);
-        Action action = (Action)response.getEntity();
+        Action action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(CreationStatus.COMPLETE.value(), action.getStatus());
     }
@@ -897,7 +897,7 @@ public void testCommitSnapshot() {
                                            new Object[] { GUIDS[0], SnapshotActionEnum.COMMIT }));
         Response response = resource.commitSnapshot(new Action());
         verifyActionResponse(response);
-        Action action = (Action)response.getEntity();
+        Action action = (Action) response.getEntity();
         assertTrue(action.isSetStatus());
         assertEquals(CreationStatus.COMPLETE.value(), action.getStatus());
     }
@@ -922,7 +922,7 @@ public void testCloneVm() {
 
         Response response = resource.doClone(action);
         verifyActionResponse(response);
-        Action actionResponse = (Action)response.getEntity();
+        Action actionResponse = (Action) response.getEntity();
         assertTrue(actionResponse.isSetStatus());
     }
 
@@ -1021,7 +1021,7 @@ public void testStatisticalQuery() throws Exception {
 
         @SuppressWarnings("unchecked")
         BackendStatisticsResource<Vm, org.ovirt.engine.core.common.businessentities.VM> statisticsResource =
-            (BackendStatisticsResource<Vm, org.ovirt.engine.core.common.businessentities.VM>)resource.getStatisticsResource();
+            (BackendStatisticsResource<Vm, org.ovirt.engine.core.common.businessentities.VM>) resource.getStatisticsResource();
         assertNotNull(statisticsResource);
 
         verifyQuery(statisticsResource.getQuery(), entity);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmTagResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmTagResourceTest.java
index d9e593820d2..5c7a85ba3a4 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmTagResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmTagResourceTest.java
@@ -84,7 +84,7 @@ private void setUpGetTagsExpectations(boolean succeed) {
             GetTagsByVmIdParameters.class,
             new String[] { "VmId" },
             new Object[] { VM_ID.toString() },
-            succeed? setUpTagsExpectations(): Collections.emptyList()
+            succeed ? setUpTagsExpectations() : Collections.emptyList()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResourceTest.java
index e4d25b71747..59fee0a912c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmWatchdogsResourceTest.java
@@ -105,7 +105,7 @@ private Watchdog getModel() {
     protected void verifyCollection(List<Watchdog> collection) {
         assertNotNull(collection);
         assertEquals(1, collection.size());
-        if(!collection.isEmpty()) {
+        if (!collection.isEmpty()) {
             verifyModel(collection.get(0));
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java
index 7e08a73caeb..392bbdc3628 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java
@@ -121,7 +121,7 @@ public void testListIncludeStatistics() throws Exception {
             vmStatistics.setUsageNetworkPercent(0);
             vm.setStatisticsData(vmStatistics);
             vm.setMigrationProgressPercent(50);
-            for (int i=0; i<GUIDS.length-1; i++) {
+            for (int i = 0; i < GUIDS.length - 1; i++) {
                 setUpGetEntityExpectations(QueryType.GetVmByVmId,
                         IdQueryParameters.class,
                         new String[] { "Id" },
@@ -204,7 +204,7 @@ private void doTestAddAsync(AsyncTaskStatusEnum asyncStatus, CreationStatus crea
         assertEquals(202, response.getStatus());
         assertTrue(response.getEntity() instanceof Vm);
         verifyModel((Vm) response.getEntity(), 0);
-        Vm created = (Vm)response.getEntity();
+        Vm created = (Vm) response.getEntity();
         assertNotNull(created.getCreationStatus());
         assertEquals(creationStatus.value(), created.getCreationStatus());
     }
@@ -885,7 +885,7 @@ public void testAddWithPlacementPolicyHostsIds() {
         Vm model = createModel(null);
         model.setPlacementPolicy(new VmPlacementPolicy());
         Hosts hosts = new Hosts();
-        for (int i =0; i < GUIDS.length; i++){
+        for (int i = 0; i < GUIDS.length; i++) {
             Host newHost = new Host();
             newHost.setId(GUIDS[i].toString());
             hosts.getHosts().add(newHost);
@@ -900,7 +900,7 @@ public void testAddWithPlacementPolicyHostsIds() {
     @Test
     public void testAddWithPlacementPolicyHostsNames() {
         setUpAddVm();
-        for (int i =0; i < NAMES.length; i++){
+        for (int i = 0; i < NAMES.length; i++) {
             setUpGetHostByNameExpectations(i);
         }
         setUpCreationExpectations(ActionType.AddVm,
@@ -920,7 +920,7 @@ public void testAddWithPlacementPolicyHostsNames() {
         Vm model = createModel(null);
         model.setPlacementPolicy(new VmPlacementPolicy());
         Hosts hosts = new Hosts();
-        for (int i =0; i < NAMES.length; i++){
+        for (int i = 0; i < NAMES.length; i++) {
             Host newHost = new Host();
             newHost.setName(NAMES[i]);
             hosts.getHosts().add(newHost);
@@ -1224,7 +1224,7 @@ public void testListAllContentQueryParameter() throws Exception {
         verifyCollection(getCollection(), true);
     }
 
-    private void setUpAllContentExpectations() throws Exception{
+    private void setUpAllContentExpectations() throws Exception {
         setUpGetPayloadExpectations(3);
         setUpGetGraphicsMultipleExpectations(3);
         setUpGetConsoleExpectations(0, 1, 2);
@@ -1544,7 +1544,7 @@ private Vm createModel(DiskAttachments diskAttachments) {
         model.getTemplate().setId(GUIDS[1].toString());
         model.setCluster(new org.ovirt.engine.api.model.Cluster());
         model.getCluster().setId(GUIDS[2].toString());
-        if (diskAttachments != null){
+        if (diskAttachments != null) {
             model.setDiskAttachments(diskAttachments);
         }
         model.setTpmEnabled(false);
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/IconTestHelpler.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/IconTestHelpler.java
index cdfc974fc67..00c3ee59797 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/IconTestHelpler.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/IconTestHelpler.java
@@ -8,7 +8,7 @@ public class IconTestHelpler {
     public static final String MEDIA_TYPE = "image/png";
     public static final String DATA_URL = "iVBORw0KGgoAAAANSUhEUgAAAJYAAAB4CAYAAAAQTwsQAAADNklEQVR4nO3cTUpbYQCF4aPioBZ0AdoN9G8FFgSdNNQOFe0KbEe2VCcKWY9TR8VRodz7xWZP6SBKLdWg1yTnevI+cCeOzHdeot7ESAAAAAAAAAAAwKBIg9TLfbYzzT0+YYVyj09YodzjE1Yo9/iEFco9PmGFco9PWKHc4xNWKPf4hBXKPT5hhXKPT1ih3OMTVij3+IQVyj0+YYVyj09YodzjE1Yo9/iEFco9PmGFco9PWKHc4xNWKPf4hBXKPT5hhXKPT1ih3OMTVij3+IQVyj0+YYVyj09YodzjE1Yo9/iEFco9PmGFco9PWKHc4xNWKPf4hBXKPT5hhXKPT1ih3OMTVij3+IQVyj0+YYVyj09YodzjE1Yo9/iEFco9PmGFco9PWKHc4xNWKPf4hBXKPT5hhXKPT1ih3OMTVij3+IQVyj0+YSFPV/MqWlNP71RrV0VfVOtYRaeqteH+9vDUXGhFtbZU9E21uiOuDfe3iqegryXV2r56RhoVFHHhniq9Ua3jBwRFXBjhTAuq9bFhUMSFW/S1qFqfxhAVceHK8JlqnFERF6Qx/fgjLtxQ9HaCURHXTPqh5+rpaAphEddM6enDlKIirplxoZUH3vwkLtxDrS1DVMQVbaA51fpqDIu4Iv3UC3NUxBVp+NYXd1TEFafWbguCIq44RZ9bEBNxxWn+lhjiwgie+1fEFa/NYRWduo8HTbX3R2FXPR25jwdNtfOX9+vrwH08aKp9txtuXjvu40FT7bpB+u9VtO4+HjRVtGYP6K6r0qr7eNBUO16E/v/q6VADzbmPB4/hfdvM7delNt3HgscqWm7Z/awTFS27jwXjUE39rcl3X0Ud93FgXM61NMV/prj76um7Kj1zHwfGafg5Dd6wfumV+xgwCbW2jWG9dz98TMqZFlRpb+pRVdpTV/Puh49J6mtRlfanGNW++lp0P2xMw5kWpvJPrEUdDXimmj2/9Vr1RP5aPFLRS/fDg9O5llTUGdNN1BMVdbilgL+KljV8+eewQVCHutQmd9Rxt4HmVGlVReuqtaNaB7r+OO7hs9rx1dd2VLSuSqu8oAwAAAAAAAAAAAAAAAAAAAAAQDv9AeKA+xpCWfFnAAAAAElFTkSuQmCC";
 
-    private IconTestHelpler() {}
+    private IconTestHelpler() { }
 
     public static Icon createIcon(Guid id) {
         final Icon icon = new Icon();
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java
index ec9fd47f389..6cb3a11b23a 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainGroupResourceTest.java
@@ -69,7 +69,7 @@ private void setUpEntityQueryExpectations(int index, boolean notFound) {
                 new String[] { "Domain", "Namespace", "Id" },
                 new Object[] { DOMAIN, "", DirectoryEntryIdUtils.decode(EXTERNAL_IDS[index])
                          },
-            notFound? null: getEntity(index)
+            notFound ? null : getEntity(index)
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java
index a0560e35127..d8eb505f5ea 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/aaa/BackendDomainUserResourceTest.java
@@ -68,7 +68,7 @@ private void setUpEntityQueryExpectations(int index, boolean notFound) {
             DirectoryIdQueryParameters.class,
             new String[] { "Domain", "Id" },
                 new Object[] { DOMAIN, DirectoryEntryIdUtils.decode(EXTERNAL_IDS[index]) },
-            notFound? null: getEntity(index)
+            notFound ? null : getEntity(index)
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourceResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourceResourceTest.java
index a4e365e55ba..863f569f355 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourceResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalComputeResourceResourceTest.java
@@ -93,7 +93,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             ProviderQueryParameters.class,
             new String[] { "Provider.Id" },
             new Object[] { GUIDS[0] },
-            notFound? null: getResources()
+            notFound ? null : getResources()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostResourceTest.java
index b9631be6dca..5a084e1f182 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalDiscoveredHostResourceTest.java
@@ -94,7 +94,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             ProviderQueryParameters.class,
             new String[] { "Provider.Id" },
             new Object[] { GUIDS[0] },
-            notFound? null: getHosts()
+            notFound ? null : getHosts()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResourceTest.java
index 14102362677..d973e80d6f6 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostGroupResourceTest.java
@@ -93,7 +93,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             ProviderQueryParameters.class,
             new String[] { "Provider.Id" },
             new Object[] { GUIDS[0] },
-            notFound? null: getGroups()
+            notFound ? null : getGroups()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResourceTest.java
index 354b179ecb0..2d5813419e7 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostProviderResourceTest.java
@@ -139,7 +139,7 @@ protected void setUpGetEntityExpectations(int times, boolean notFound) {
                 IdQueryParameters.class,
                 new String[] { "Id" },
                 new Object[] { GUIDS[0] },
-                notFound? null: getEntity(0)
+                notFound ? null : getEntity(0)
             );
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostResourceTest.java
index 82056c75047..7e7561462e3 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/externalhostproviders/BackendExternalHostResourceTest.java
@@ -78,7 +78,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             GetHostListFromExternalProviderParameters.class,
             new String[] { "ProviderId" },
             new Object[] { GUIDS[0] },
-            notFound? null: getHosts()
+            notFound ? null : getHosts()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java
index ca5657125fb..21b5e348534 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java
@@ -74,7 +74,7 @@ public void testGetNotFound() {
 
     @Test
     public void testReplace() {
-        WebApplicationException wae = assertThrows(WebApplicationException.class,  () -> resource.replace(new Action()));
+        WebApplicationException wae = assertThrows(WebApplicationException.class, () -> resource.replace(new Action()));
         assertTrue(wae.getResponse().getEntity() instanceof Fault);
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHookResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHookResourceTest.java
index 4d3dd949eed..14a908e6fab 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHookResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHookResourceTest.java
@@ -163,7 +163,7 @@ protected void setUpGetEntityExpectations(int times, boolean notFound) {
                     new String[] { "HookId", "IncludeServerHooks" },
                     new Object[] { hookId , true},
                     notFound ? null : getEntity(0));
-            if(!notFound) {
+            if (!notFound) {
                 setUpEntityQueryExpectations(QueryType.GetGlusterHookContent,
                         GlusterHookContentQueryParameters.class,
                         new String[] { "GlusterHookId"},
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHooksResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHooksResourceTest.java
index 3376ab81410..523a4834780 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHooksResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterHooksResourceTest.java
@@ -161,7 +161,7 @@ private void setUpHooksQueryExpectations(Object failure) {
         } else {
             if (failure instanceof String) {
                 queryResult.setExceptionString((String) failure);
-                setUpL10nExpectations((String)failure);
+                setUpL10nExpectations((String) failure);
             } else if (failure instanceof Exception) {
                 when(backend.runQuery(eq(QueryType.GetGlusterHooks), any())).thenThrow((Exception) failure);
                 return;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java
index d55e9f5a6a5..42004d2d556 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageProviderResourceTest.java
@@ -148,7 +148,7 @@ protected void setUpGetEntityExpectations(int times, boolean notFound) {
                 IdQueryParameters.class,
                 new String[] { "Id" },
                 new Object[] { GUIDS[0] },
-                notFound? null: getEntity(0)
+                notFound ? null : getEntity(0)
             );
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageResourceTest.java
index d59694f9de2..d0ea9ea6907 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackImageResourceTest.java
@@ -81,7 +81,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             GetImageByIdParameters.class,
             new String[] { "RepoImageId" },
             new Object[] { GUIDS[1].toString() },
-            notFound? null: getEntity(1)
+            notFound ? null : getEntity(1)
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
index 386a9906ccb..284ff73524d 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkProviderResourceTest.java
@@ -152,7 +152,7 @@ protected void setUpGetEntityExpectations(int times, boolean notFound) {
                 IdQueryParameters.class,
                 new String[] { "Id" },
                 new Object[] { GUIDS[0] },
-                notFound? null: getEntity(0)
+                notFound ? null : getEntity(0)
             );
         }
     }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResourceTest.java
index cbca5cd0afb..fa5b3b1b574 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackNetworkResourceTest.java
@@ -55,7 +55,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             IdQueryParameters.class,
             new String[] { "Id" },
             new Object[] { GUIDS[0] },
-            notFound? null: getNetworks()
+            notFound ? null : getNetworks()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackSubnetResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackSubnetResourceTest.java
index f6cc05341fa..b66eaa8bcbe 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackSubnetResourceTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/openstack/BackendOpenStackSubnetResourceTest.java
@@ -52,7 +52,7 @@ private void setUpGetEntityExpectations(boolean notFound) {
             GetExternalSubnetsOnProviderByExternalNetworkQueryParameters.class,
             new String[] { "ProviderId", "NetworkId" },
             new Object[] { GUIDS[0], string2hex(NAMES[1]) },
-            notFound? null: getSubnets()
+            notFound ? null : getSubnets()
         );
     }
 
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinderTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinderTest.java
index c539a688523..830bc63d61a 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinderTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/validation/UsageFinderTest.java
@@ -60,7 +60,7 @@ private Request mockRequest(String httpMethod) {
         return requestMock;
     }
 
-    private UriInfo mockUri(String...strings) {
+    private UriInfo mockUri(String... strings) {
         UriInfo uriInfoMock = mock(UriInfo.class);
         List<PathSegment> pathSegments = new ArrayList<>();
         for (String s : strings) {
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
index bb9d303cca9..f09823d842c 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/test/util/TestHelper.java
@@ -38,8 +38,8 @@ protected static Method getMethod(Class<?> clz, String name, Object value) throw
     protected static boolean matches(Object lhs, Object rhs) {
         boolean matches = true;
         if (lhs instanceof List && rhs instanceof Iterable) {
-            List<?> llhs = (List<?>)lhs;
-            Iterator<?> irhs = ((Iterable<?>)rhs).iterator();
+            List<?> llhs = (List<?>) lhs;
+            Iterator<?> irhs = ((Iterable<?>) rhs).iterator();
             int count = 0;
             while (irhs.hasNext()) {
                 count++;
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
index ba20cac0e43..da66a196c6e 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
@@ -32,21 +32,21 @@ public void testParseSingle() {
         assertEquals(1, ret.size());
         verifyResult(ret.get(0),
                      "foo",
-                     "one",   "bool", "1",
-                     "two",   "int",  "2",
+                     "one", "bool", "1",
+                     "two", "int", "2",
                      "three", "bool", "3");
     }
 
     @Test
     public void testParseMultiple() {
         List<Agent> ret = parse("foo:one=1,two=2,three=3;bar:ninetynine=99",
-                                          "one=bool,two=int,three=bool,ninetynine=int");
+ "one=bool,two=int,three=bool,ninetynine=int");
         assertNotNull(ret);
         assertEquals(2, ret.size());
         verifyResult(ret.get(0),
                      "foo",
-                     "one",   "bool", "1",
-                     "two",   "int",  "2",
+                     "one", "bool", "1",
+                     "two", "int", "2",
                      "three", "bool", "3");
         verifyResult(ret.get(1),
                      "bar",
@@ -60,8 +60,8 @@ public void testParseIngoreValues() {
         assertEquals(1, ret.size());
         verifyResult(ret.get(0),
                      "foo",
-                     "one",   "bool", null,
-                     "two",   "int",  null,
+                     "one", "bool", null,
+                     "two", "int", null,
                      "three", "bool", null);
     }
 
@@ -72,8 +72,8 @@ public void testParseStraySemiColons() {
         assertEquals(1, ret.size());
         verifyResult(ret.get(0),
                      "foo",
-                     "one",   "bool", "1",
-                     "two",   "int",  "2",
+                     "one", "bool", "1",
+                     "two", "int", "2",
                      "three", "bool", "3");
     }
 
@@ -84,8 +84,8 @@ public void testParseStrayCommas() {
         assertEquals(1, ret.size());
         verifyResult(ret.get(0),
                      "foo",
-                     "one",   "bool", "1",
-                     "two",   "int",  "2",
+                     "one", "bool", "1",
+                     "two", "int", "2",
                      "three", "bool", "3");
     }
 
@@ -136,10 +136,10 @@ private void verifyResult(Agent result, String type, String... options) {
         assertNotNull(result.getOptions());
         assertEquals(options.length, result.getOptions().getOptions().size() * 3);
         for (int i = 0; i < options.length; i += 3) {
-            Option opt = result.getOptions().getOptions().get(i/3);
+            Option opt = result.getOptions().getOptions().get(i / 3);
             assertEquals(options[i], opt.getName());
-            assertEquals(options[i+1], opt.getType());
-            assertEquals(options[i+2], opt.getValue());
+            assertEquals(options[i + 1], opt.getType());
+            assertEquals(options[i + 2], opt.getValue());
         }
     }
 }
diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkFollowerTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkFollowerTest.java
index 3072ca68e88..72609ba96c7 100644
--- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkFollowerTest.java
+++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/LinkFollowerTest.java
@@ -38,7 +38,7 @@ public void setUp() {
         linkFollower = new LinkFollower(resourceLocator) {
             //override fetch() since it requires a real environment and would crash tests.
             protected ActionableResource fetch(String href) {
-                if (href.equals("/ovirt-engine/api/vms/63978315-2d17-4e67-b393-2ea60a8aeacb/nics")){
+                if (href.equals("/ovirt-engine/api/vms/63978315-2d17-4e67-b393-2ea60a8aeacb/nics")) {
                     return createNics();
                 } else if (href.equals("/ovirt-engine/api/vms/63978315-2d17-4e67-b393-2ea60a8aeacb/diskattachments")) {
                     return createDiskAttachments();
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/Directory.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/Directory.java
index 4bf6b0e3f5a..75bab55cdc9 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/Directory.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/model/Directory.java
@@ -40,6 +40,6 @@ public void setDomain(String value) {
     }
 
     public boolean isSetDomain() {
-        return this.domain!= null;
+        return this.domain != null;
     }
 }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/AsyncTaskMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/AsyncTaskMapper.java
index 61e72a3626c..5e929e5f9c9 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/AsyncTaskMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/AsyncTaskMapper.java
@@ -9,7 +9,7 @@ public class AsyncTaskMapper {
     @Mapping(from = AsyncTaskStatus.class, to = CreationStatus.class)
     public static CreationStatus map(AsyncTaskStatus entity, CreationStatus template) {
         CreationStatus model = null;
-        switch(entity.getStatus()) {
+        switch (entity.getStatus()) {
             case unknown:
             case init:
                 model = template != CreationStatus.FAILED ? CreationStatus.PENDING : template;
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
index 74bfb8e6d1a..7f9e5552e36 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMapper.java
@@ -95,10 +95,10 @@ public static Cluster map(org.ovirt.engine.api.model.Cluster model, Cluster temp
         if (model.isSetErrorHandling() && model.getErrorHandling().isSetOnError()) {
             entity.setMigrateOnError(map(model.getErrorHandling().getOnError(), null));
         }
-        if(model.isSetVirtService()) {
+        if (model.isSetVirtService()) {
             entity.setVirtService(model.isVirtService());
         }
-        if(model.isSetGlusterService()) {
+        if (model.isSetGlusterService()) {
             entity.setGlusterService(model.isGlusterService());
         }
         if (model.isSetThreadsAsCores()) {
@@ -107,7 +107,7 @@ public static Cluster map(org.ovirt.engine.api.model.Cluster model, Cluster temp
         if (model.isSetTunnelMigration()) {
             entity.setTunnelMigration(model.isTunnelMigration());
         }
-        if (model.isSetTrustedService()){
+        if (model.isSetTrustedService()) {
             entity.setTrustedService(model.isTrustedService());
         }
         if (model.isSetHaReservation()) {
@@ -221,7 +221,7 @@ public static org.ovirt.engine.api.model.Cluster map(Cluster entity, org.ovirt.e
         if (entity.getCompatibilityVersion() != null) {
             model.setVersion(VersionMapper.map(entity.getCompatibilityVersion()));
         }
-        model.setMemoryPolicy(map(entity, (MemoryPolicy)null));
+        model.setMemoryPolicy(map(entity, (MemoryPolicy) null));
         Guid clusterPolicyId = entity.getClusterPolicyId();
         if (clusterPolicyId != null) {
             SchedulingPolicy schedulingPolicy = model.getSchedulingPolicy();
@@ -231,7 +231,7 @@ public static org.ovirt.engine.api.model.Cluster map(Cluster entity, org.ovirt.e
             }
             schedulingPolicy.setId(clusterPolicyId.toString());
         }
-        model.setErrorHandling(map(entity.getMigrateOnError(), (ErrorHandling)null));
+        model.setErrorHandling(map(entity.getMigrateOnError(), (ErrorHandling) null));
         model.setVirtService(entity.supportsVirtService());
         model.setGlusterService(entity.supportsGlusterService());
         model.setThreadsAsCores(entity.getCountThreadsAsCores());
@@ -301,13 +301,13 @@ public static org.ovirt.engine.api.model.Cluster map(Cluster entity, org.ovirt.e
     @Mapping(from = MemoryPolicy.class, to = Cluster.class)
     public static Cluster map(MemoryPolicy model, Cluster template) {
         Cluster entity = template != null ? template : new Cluster();
-        if (model.isSetOverCommit() && model.getOverCommit().getPercent()!=null) {
+        if (model.isSetOverCommit() && model.getOverCommit().getPercent() != null) {
             entity.setMaxVdsMemoryOverCommit(model.getOverCommit().getPercent());
         }
         if (model.isSetTransparentHugepages() &&
             model.getTransparentHugepages().isSetEnabled()) {
             entity.setTransparentHugepages(model.getTransparentHugepages().isEnabled());
-        } else if (template != null && greaterOrEqual(template.getCompatibilityVersion(), min_thp_version)){
+        } else if (template != null && greaterOrEqual(template.getCompatibilityVersion(), min_thp_version)) {
             entity.setTransparentHugepages(true);
         }
         return entity;
@@ -334,7 +334,7 @@ public static Cluster map(StoragePool pool, Cluster template) {
 
     @Mapping(from = MigrateOnError.class, to = MigrateOnErrorOptions.class)
     public static MigrateOnErrorOptions map(MigrateOnError model, MigrateOnErrorOptions template) {
-        if (model==null) {
+        if (model == null) {
             return null;
         }
         switch (model) {
@@ -352,7 +352,7 @@ public static MigrateOnErrorOptions map(MigrateOnError model, MigrateOnErrorOpti
 
     @Mapping(from = MigrateOnErrorOptions.class, to = MigrateOnError.class)
     public static MigrateOnError map(MigrateOnErrorOptions model, MigrateOnError template) {
-        if (model==null) {
+        if (model == null) {
             return null;
         }
         switch (model) {
@@ -370,11 +370,11 @@ public static MigrateOnError map(MigrateOnErrorOptions model, MigrateOnError tem
 
     @Mapping(from = MigrateOnErrorOptions.class, to = ErrorHandling.class)
     private static ErrorHandling map(MigrateOnErrorOptions migrateOnError, ErrorHandling template) {
-        MigrateOnError value = map(migrateOnError, (MigrateOnError)null);
-        if (value==null) {
+        MigrateOnError value = map(migrateOnError, (MigrateOnError) null);
+        if (value == null) {
             return null;
         } else {
-            template = template==null ? new ErrorHandling() : template;
+            template = template == null ? new ErrorHandling() : template;
             template.setOnError(value);
             return template;
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMigrationOptionsMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMigrationOptionsMapper.java
index 10c4e8737a0..47728cd5a69 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMigrationOptionsMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ClusterMigrationOptionsMapper.java
@@ -39,7 +39,7 @@ public static void copyMigrationOptions(MigrationOptions model, Cluster entity)
 
         if (model.isSetBandwidth()) {
             MigrationBandwidth bandwidth = model.getBandwidth();
-            if (bandwidth.getAssignmentMethod()!=null) {
+            if (bandwidth.getAssignmentMethod() != null) {
                 switch (bandwidth.getAssignmentMethod()) {
                     case AUTO:
                         entity.setMigrationBandwidthLimitType(MigrationBandwidthLimitType.AUTO);
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DataCenterMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DataCenterMapper.java
index 59fa4743079..cbdb0ce10d1 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DataCenterMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DataCenterMapper.java
@@ -62,15 +62,15 @@ public static DataCenter map(StoragePool entity, DataCenter template) {
         if (!StringUtils.isEmpty(entity.getComment())) {
             model.setComment(entity.getComment());
         }
-        if (entity.getStatus()!=null) {
+        if (entity.getStatus() != null) {
             model.setStatus(mapDataCenterStatus(entity.getStatus()));
         }
         if (entity.getCompatibilityVersion() != null) {
             model.setVersion(VersionMapper.map(entity.getCompatibilityVersion()));
         }
-        if (entity.getStoragePoolFormatType()!=null) {
+        if (entity.getStoragePoolFormatType() != null) {
             StorageFormat storageFormat = StorageFormatMapper.map(entity.getStoragePoolFormatType(), null);
-            if (storageFormat!=null) {
+            if (storageFormat != null) {
                 model.setStorageFormat(storageFormat);
             }
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java
index dbd4a93e34f..c78e5b36bf1 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/DiskMapper.java
@@ -190,7 +190,7 @@ private static void mapDiskImageToDiskFields(DiskImage entity, Disk model) {
         model.setProvisionedSize(entity.getSize());
         if (entity.hasActualSize()) {
             model.setActualSize(entity.getActualSizeInBytes());
-            if (entity.isAllowSnapshot()){
+            if (entity.isAllowSnapshot()) {
                 model.setTotalSize((long) entity.getActualDiskWithSnapshotsSizeInBytes());
             }
         }
@@ -214,13 +214,13 @@ private static void mapDiskImageToDiskFields(DiskImage entity, Disk model) {
             if (!model.isSetStorageDomains()) {
                 model.setStorageDomains(new StorageDomains());
             }
-            for (Guid id : entity.getStorageIds()){
+            for (Guid id : entity.getStorageIds()) {
                 StorageDomain storageDomain = new StorageDomain();
                 storageDomain.setId(id.toString());
                 model.getStorageDomains().getStorageDomains().add(storageDomain);
             }
         }
-        if (entity.getQuotaId()!=null) {
+        if (entity.getQuotaId() != null) {
             Quota quota = new Quota();
             quota.setId(entity.getQuotaId().toString());
 
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java
index fff045a2a3a..83ee6cca895 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/EventMapper.java
@@ -32,7 +32,7 @@ public static Event map(AuditLog entity, Event event) {
                 .getLogTime(), null));
         model.setDescription(entity.getMessage());
 
-        boolean idValid = entity.getUserId()!=null && !entity.getUserId().equals(Guid.Empty);
+        boolean idValid = entity.getUserId() != null && !entity.getUserId().equals(Guid.Empty);
         boolean nameValid = !StringUtils.isEmpty(entity.getUserName());
 
         if (idValid || nameValid) {
@@ -46,7 +46,7 @@ public static Event map(AuditLog entity, Event event) {
             model.setUser(user);
         }
 
-        idValid = entity.getVmId()!=null && !entity.getVmId().equals(Guid.Empty);
+        idValid = entity.getVmId() != null && !entity.getVmId().equals(Guid.Empty);
         nameValid = !StringUtils.isEmpty(entity.getVmName());
 
         if (idValid || nameValid) {
@@ -60,7 +60,7 @@ public static Event map(AuditLog entity, Event event) {
             model.setVm(vm);
         }
 
-        idValid = entity.getStorageDomainId()!=null && !entity.getStorageDomainId().equals(Guid.Empty);
+        idValid = entity.getStorageDomainId() != null && !entity.getStorageDomainId().equals(Guid.Empty);
         nameValid = !StringUtils.isEmpty(entity.getStorageDomainName());
 
         if (idValid || nameValid) {
@@ -74,7 +74,7 @@ public static Event map(AuditLog entity, Event event) {
             model.setStorageDomain(sd);
         }
 
-        idValid = entity.getVdsId()!=null && !entity.getVdsId().equals(Guid.Empty);
+        idValid = entity.getVdsId() != null && !entity.getVdsId().equals(Guid.Empty);
         nameValid = !StringUtils.isEmpty(entity.getVdsName());
 
         if (idValid || nameValid) {
@@ -102,7 +102,7 @@ public static Event map(AuditLog entity, Event event) {
             model.setTemplate(template);
         }
 
-        idValid = entity.getClusterId()!=null && !entity.getClusterId().equals(Guid.Empty);
+        idValid = entity.getClusterId() != null && !entity.getClusterId().equals(Guid.Empty);
         nameValid = !StringUtils.isEmpty(entity.getClusterName());
 
         if (idValid || nameValid) {
@@ -116,7 +116,7 @@ public static Event map(AuditLog entity, Event event) {
             model.setCluster(cluster);
         }
 
-        idValid = entity.getStoragePoolId()!=null && !entity.getStoragePoolId().equals(Guid.Empty);
+        idValid = entity.getStoragePoolId() != null && !entity.getStoragePoolId().equals(Guid.Empty);
         nameValid = !StringUtils.isEmpty(entity.getStoragePoolName());
 
         if (idValid || nameValid) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalNetworkProviderConfigurationMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalNetworkProviderConfigurationMapper.java
index eb04a184473..fb81358b28e 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalNetworkProviderConfigurationMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalNetworkProviderConfigurationMapper.java
@@ -7,7 +7,7 @@
 
 public class ExternalNetworkProviderConfigurationMapper {
     @Mapping(from = Provider.class, to = ExternalNetworkProviderConfiguration.class)
-    public static ExternalNetworkProviderConfiguration map(Provider entity,  ExternalNetworkProviderConfiguration template) {
+    public static ExternalNetworkProviderConfiguration map(Provider entity, ExternalNetworkProviderConfiguration template) {
         if (entity == null) {
             return template;
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalRegistrationConfigurationMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalRegistrationConfigurationMapper.java
index 702778bd83f..3f198402b88 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalRegistrationConfigurationMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalRegistrationConfigurationMapper.java
@@ -88,11 +88,11 @@ private static ExternalVnicProfileMapping createExternalVnicProfileMapping(Regis
         ExternalVnicProfileMapping m = new ExternalVnicProfileMapping(
                 regMapping.getFrom().getNetwork().getName(),
                 regMapping.getFrom().getName());
-        if(isSetToId(regMapping)) {
+        if (isSetToId(regMapping)) {
             try {
                 Guid targetId = asGuid(regMapping.getTo().getId());
                 m.setTargetProfileId(targetId);
-            } catch (Exception e){
+            } catch (Exception e) {
                 //bad id - ignore
             }
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalStatusMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalStatusMapper.java
index d3f3a53033c..52194e3488e 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalStatusMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalStatusMapper.java
@@ -32,7 +32,7 @@ public static org.ovirt.engine.core.common.businessentities.ExternalStatus map(E
             return org.ovirt.engine.core.common.businessentities.ExternalStatus.Info;
         case WARNING:
             return org.ovirt.engine.core.common.businessentities.ExternalStatus.Warning;
-        case  ERROR:
+        case ERROR:
             return org.ovirt.engine.core.common.businessentities.ExternalStatus.Error;
         case FAILURE:
             return org.ovirt.engine.core.common.businessentities.ExternalStatus.Failure;
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalVnicProfileMappingMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalVnicProfileMappingMapper.java
index 03b3d1cc40c..6ece4865553 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalVnicProfileMappingMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/ExternalVnicProfileMappingMapper.java
@@ -14,7 +14,7 @@
 public class ExternalVnicProfileMappingMapper {
 
     // hide me
-    private ExternalVnicProfileMappingMapper() {}
+    private ExternalVnicProfileMappingMapper() { }
 
     @Deprecated
     public static Collection<ExternalVnicProfileMapping> mapFromModel(VnicProfileMappings vnicProfileMappings) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapper.java
index d01d10ac11e..72103dc7f03 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapper.java
@@ -8,7 +8,7 @@ public class FencingPolicyMapper {
     @Mapping(from = FencingPolicy.class, to = org.ovirt.engine.core.common.businessentities.FencingPolicy.class)
     public static org.ovirt.engine.core.common.businessentities.FencingPolicy map(FencingPolicy model, org.ovirt.engine.core.common.businessentities.FencingPolicy template) {
         org.ovirt.engine.core.common.businessentities.FencingPolicy entity = template != null ? template : new org.ovirt.engine.core.common.businessentities.FencingPolicy();
-        if(model.isSetEnabled()) {
+        if (model.isSetEnabled()) {
             entity.setFencingEnabled(model.isEnabled());
         }
         if (model.isSetSkipIfSdActive()) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapper.java
index 8ee1c307cd5..50b65402ffe 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapper.java
@@ -16,7 +16,7 @@
 
 public class GlusterBrickDetailMapper {
 
-    @Mapping (from=GlusterBrick.class, to=GlusterVolumeAdvancedDetails.class)
+    @Mapping (from = GlusterBrick.class, to = GlusterVolumeAdvancedDetails.class)
     public static GlusterVolumeAdvancedDetails map(GlusterBrick model, GlusterVolumeAdvancedDetails toEntity) {
         //AdvancedDetails is a read only from server and no support for setting these.
         //Hence mapping from REST model to Business entity not required.
@@ -24,7 +24,7 @@ public static GlusterVolumeAdvancedDetails map(GlusterBrick model, GlusterVolume
         return entity;
     }
 
-    @Mapping (from=GlusterVolumeAdvancedDetails.class, to=GlusterBrick.class)
+    @Mapping (from = GlusterVolumeAdvancedDetails.class, to = GlusterBrick.class)
     public static GlusterBrick map(GlusterVolumeAdvancedDetails fromEntity, GlusterBrick toModel) {
         GlusterBrick model = (toModel == null) ? new GlusterBrick() : toModel;
 
@@ -40,7 +40,7 @@ public static GlusterBrick map(GlusterVolumeAdvancedDetails fromEntity, GlusterB
 
         model = mapBrickProperties(detail, model);
 
-        if (detail.getClients()!= null) {
+        if (detail.getClients() != null) {
             model.setGlusterClients(new GlusterClients());
             for (GlusterClientInfo clientEntity : detail.getClients()) {
                 model.getGlusterClients().getGlusterClients().add(map(clientEntity));
@@ -76,7 +76,7 @@ private static GlusterBrick mapBrickProperties(BrickDetails detail, GlusterBrick
     }
 
 
-    @Mapping (from=GlusterClientInfo.class, to=GlusterClient.class)
+    @Mapping (from = GlusterClientInfo.class, to = GlusterClient.class)
     public static GlusterClient map(GlusterClientInfo clientEntity) {
         GlusterClient clientModel = new GlusterClient();
         clientModel.setBytesRead(clientEntity.getBytesRead());
@@ -88,7 +88,7 @@ public static GlusterClient map(GlusterClientInfo clientEntity) {
         return clientModel;
     }
 
-    @Mapping (from=MemoryStatus.class, to=GlusterBrickMemoryInfo.class)
+    @Mapping (from = MemoryStatus.class, to = GlusterBrickMemoryInfo.class)
     public static GlusterBrickMemoryInfo map(MemoryStatus memoryStatusEntity) {
 
         GlusterBrickMemoryInfo memInfo = new GlusterBrickMemoryInfo();
@@ -103,7 +103,7 @@ public static GlusterBrickMemoryInfo map(MemoryStatus memoryStatusEntity) {
         return memInfo;
     }
 
-    @Mapping (from=Mempool.class, to=GlusterMemoryPool.class)
+    @Mapping (from = Mempool.class, to = GlusterMemoryPool.class)
     public static GlusterMemoryPool map(Mempool poolEntity) {
         GlusterMemoryPool poolModel = new GlusterMemoryPool();
 
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickMapper.java
index 1bfa366cb9f..f556b6adcb0 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterBrickMapper.java
@@ -19,15 +19,15 @@ public class GlusterBrickMapper {
     public static GlusterBrickEntity map(GlusterBrick fromBrick, GlusterBrickEntity toBrick) {
         GlusterBrickEntity brick = (toBrick == null) ? new GlusterBrickEntity() : toBrick;
 
-        if(fromBrick.isSetId()) {
+        if (fromBrick.isSetId()) {
             brick.setId(Guid.createGuidFromStringDefaultEmpty(fromBrick.getId()));
         }
 
-        if(fromBrick.isSetServerId()) {
+        if (fromBrick.isSetServerId()) {
             brick.setServerId(Guid.createGuidFromStringDefaultEmpty(fromBrick.getServerId()));
         }
 
-        if(fromBrick.isSetBrickDir()) {
+        if (fromBrick.isSetBrickDir()) {
             brick.setBrickDirectory(fromBrick.getBrickDir());
         }
         return brick;
@@ -37,27 +37,27 @@ public static GlusterBrickEntity map(GlusterBrick fromBrick, GlusterBrickEntity
     public static GlusterBrick map(GlusterBrickEntity fromBrick, GlusterBrick toBrick) {
         GlusterBrick brick = (toBrick == null) ? new GlusterBrick() : toBrick;
 
-        if(fromBrick.getId() != null) {
+        if (fromBrick.getId() != null) {
             brick.setId(fromBrick.getId().toString());
         }
 
-        if(fromBrick.getServerId() != null) {
+        if (fromBrick.getServerId() != null) {
             brick.setServerId(fromBrick.getServerId().toString());
         }
 
-        if(StringUtils.isNotEmpty(fromBrick.getQualifiedName())) {
+        if (StringUtils.isNotEmpty(fromBrick.getQualifiedName())) {
            brick.setName(fromBrick.getQualifiedName());
         }
 
-        if(fromBrick.getBrickDirectory() != null) {
+        if (fromBrick.getBrickDirectory() != null) {
             brick.setBrickDir(fromBrick.getBrickDirectory());
         }
 
-        if(fromBrick.getStatus() != null) {
+        if (fromBrick.getStatus() != null) {
             brick.setStatus(mapBrickStatus(fromBrick.getStatus()));
         }
 
-        if(fromBrick.getVolumeId() != null) {
+        if (fromBrick.getVolumeId() != null) {
             brick.setGlusterVolume(new GlusterVolume());
             brick.getGlusterVolume().setId(fromBrick.getVolumeId().toString());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterHookMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterHookMapper.java
index 859d0068b81..8a8737c3a4a 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterHookMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterHookMapper.java
@@ -103,15 +103,15 @@ private static String mapConflicts(GlusterHookEntity hook) {
             sb.append(GlusterHookConflictFlags.MISSING_HOOK.toString());
         }
         if (hook.isContentConflict()) {
-            sb.append(sb.length() > 0 ? ",":"").append(GlusterHookConflictFlags.CONTENT_CONFLICT.toString());
+            sb.append(sb.length() > 0 ? "," : "" ).append(GlusterHookConflictFlags.CONTENT_CONFLICT.toString());
         }
         if (hook.isStatusConflict()) {
-            sb.append(sb.length() > 0 ? ",":"").append(GlusterHookConflictFlags.STATUS_CONFLICT.toString());
+            sb.append(sb.length() > 0 ? "," : "").append(GlusterHookConflictFlags.STATUS_CONFLICT.toString());
         }
         return sb.toString();
     }
 
-    @Mapping (from=org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook.class, to=org.ovirt.engine.api.model.GlusterServerHook.class)
+    @Mapping (from = org.ovirt.engine.core.common.businessentities.gluster.GlusterServerHook.class, to = org.ovirt.engine.api.model.GlusterServerHook.class)
     public static org.ovirt.engine.api.model.GlusterServerHook map(GlusterServerHook serverHookEntity) {
         org.ovirt.engine.api.model.GlusterServerHook serverHookModel = new org.ovirt.engine.api.model.GlusterServerHook();
         if (serverHookEntity.getServerId() != null) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeMapper.java
index 9eeba354a9c..f4f19c6ec75 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeMapper.java
@@ -20,19 +20,19 @@ public class GlusterVolumeMapper {
     public static GlusterVolumeEntity map(GlusterVolume fromVolume, GlusterVolumeEntity toVolume) {
         GlusterVolumeEntity volume = toVolume != null ? toVolume : new GlusterVolumeEntity();
 
-        if(fromVolume.isSetId()) {
+        if (fromVolume.isSetId()) {
             volume.setId(Guid.createGuidFromStringDefaultEmpty(fromVolume.getId()));
         }
 
-        if(fromVolume.isSetName()) {
+        if (fromVolume.isSetName()) {
             volume.setName(fromVolume.getName());
         }
 
-        if(fromVolume.isSetVolumeType()) {
+        if (fromVolume.isSetVolumeType()) {
             volume.setVolumeType(map(fromVolume.getVolumeType(), null));
         }
 
-        if(fromVolume.isSetTransportTypes()) {
+        if (fromVolume.isSetTransportTypes()) {
             for (TransportType transportType : fromVolume.getTransportTypes().getTransportTypes()) {
                 if (transportType != null) {
                     volume.addTransportType(map(transportType, null));
@@ -40,19 +40,19 @@ public static GlusterVolumeEntity map(GlusterVolume fromVolume, GlusterVolumeEnt
             }
         }
 
-        if(fromVolume.isSetReplicaCount()) {
+        if (fromVolume.isSetReplicaCount()) {
             volume.setReplicaCount(fromVolume.getReplicaCount());
         }
 
-        if(fromVolume.isSetStripeCount()) {
+        if (fromVolume.isSetStripeCount()) {
             volume.setStripeCount(fromVolume.getStripeCount());
         }
 
-        if(fromVolume.isSetDisperseCount()) {
+        if (fromVolume.isSetDisperseCount()) {
             volume.setDisperseCount(fromVolume.getDisperseCount());
         }
 
-        if(fromVolume.isSetRedundancyCount()) {
+        if (fromVolume.isSetRedundancyCount()) {
             volume.setRedundancyCount(fromVolume.getRedundancyCount());
         }
 
@@ -74,15 +74,15 @@ public static GlusterVolumeEntity map(GlusterVolume fromVolume, GlusterVolumeEnt
     public static GlusterVolume map(GlusterVolumeEntity fromVolume, GlusterVolume toVolume) {
         GlusterVolume volume = toVolume != null ? toVolume : new GlusterVolume();
 
-        if(fromVolume.getId() != null) {
+        if (fromVolume.getId() != null) {
             volume.setId(fromVolume.getId().toString());
         }
 
-        if(fromVolume.getName() != null) {
+        if (fromVolume.getName() != null) {
             volume.setName(fromVolume.getName());
         }
 
-        if(fromVolume.getVolumeType() != null) {
+        if (fromVolume.getVolumeType() != null) {
             volume.setVolumeType(map(fromVolume.getVolumeType(), null));
         }
 
@@ -102,7 +102,7 @@ public static GlusterVolume map(GlusterVolumeEntity fromVolume, GlusterVolume to
         volume.setDisperseCount(fromVolume.getDisperseCount());
         volume.setRedundancyCount(fromVolume.getRedundancyCount());
 
-        if(fromVolume.getStatus() != null) {
+        if (fromVolume.getStatus() != null) {
             volume.setStatus(mapVolumeStatus(fromVolume.getStatus()));
         }
 
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeProfileInfoMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeProfileInfoMapper.java
index a49023dd2bf..95798e84721 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeProfileInfoMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GlusterVolumeProfileInfoMapper.java
@@ -30,18 +30,18 @@
 import org.ovirt.engine.core.common.businessentities.gluster.StatsInfo;
 
 public class GlusterVolumeProfileInfoMapper {
-    private static final Statistic BYTES_BLOCK_READ   = StatisticResourceUtils.create("block.bytes.read", "bytes read", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic BYTES_BLOCK_WRITE   = StatisticResourceUtils.create("block.bytes.write", "bytes written", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic BLOCK_SIZE   = StatisticResourceUtils.create("block.size", "block size", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic TOTAL_READ   = StatisticResourceUtils.create("total.bytes.read", "total bytes read", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic TOTAL_WRITE   = StatisticResourceUtils.create("total.bytes.write", "blockSize", GAUGE, BYTES, ValueType.INTEGER);
-    private static final Statistic MIN_LATENCY   = StatisticResourceUtils.create("min.latency", "minimum latency", GAUGE, SECONDS, ValueType.INTEGER);
-    private static final Statistic MAX_LATENCY   = StatisticResourceUtils.create("max.latency", "maximum latency", GAUGE, SECONDS, ValueType.INTEGER);
-    private static final Statistic AVG_LATENCY   = StatisticResourceUtils.create("avg.latency", "average latency", GAUGE, SECONDS, ValueType.INTEGER);
-    private static final Statistic HITS   = StatisticResourceUtils.create("hits", "number of hits", GAUGE, StatisticUnit.NONE, ValueType.INTEGER);
+    private static final Statistic BYTES_BLOCK_READ = StatisticResourceUtils.create("block.bytes.read", "bytes read", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic BYTES_BLOCK_WRITE = StatisticResourceUtils.create("block.bytes.write", "bytes written", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic BLOCK_SIZE = StatisticResourceUtils.create("block.size", "block size", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic TOTAL_READ = StatisticResourceUtils.create("total.bytes.read", "total bytes read", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic TOTAL_WRITE = StatisticResourceUtils.create("total.bytes.write", "blockSize", GAUGE, BYTES, ValueType.INTEGER);
+    private static final Statistic MIN_LATENCY = StatisticResourceUtils.create("min.latency", "minimum latency", GAUGE, SECONDS, ValueType.INTEGER);
+    private static final Statistic MAX_LATENCY = StatisticResourceUtils.create("max.latency", "maximum latency", GAUGE, SECONDS, ValueType.INTEGER);
+    private static final Statistic AVG_LATENCY = StatisticResourceUtils.create("avg.latency", "average latency", GAUGE, SECONDS, ValueType.INTEGER);
+    private static final Statistic HITS = StatisticResourceUtils.create("hits", "number of hits", GAUGE, StatisticUnit.NONE, ValueType.INTEGER);
 
 
-    @Mapping (from=GlusterVolumeProfileDetails.class, to=GlusterVolumeProfileInfo.class)
+    @Mapping (from = GlusterVolumeProfileDetails.class, to = GlusterVolumeProfileInfo.class)
     public static GlusterVolumeProfileInfo map(GlusterVolumeProfileDetails model, GlusterVolumeProfileInfo toEntity) {
         //GlusterVolumeProfileInfo is  read only from server and no support for setting these.
         //Hence mapping from REST model to Business entity not required.
@@ -49,7 +49,7 @@ public static GlusterVolumeProfileInfo map(GlusterVolumeProfileDetails model, Gl
         return entity;
     }
 
-    @Mapping (from=GlusterVolumeProfileInfo.class, to=GlusterVolumeProfileDetails.class)
+    @Mapping (from = GlusterVolumeProfileInfo.class, to = GlusterVolumeProfileDetails.class)
     public static GlusterVolumeProfileDetails map(GlusterVolumeProfileInfo fromEntity, GlusterVolumeProfileDetails toModel) {
         GlusterVolumeProfileDetails model = new GlusterVolumeProfileDetails();
         BrickProfileDetails brickprofileDetails = new BrickProfileDetails();
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
index f876bc4725b..3a94baca193 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/GroupMapper.java
@@ -44,7 +44,7 @@ public static Group map(DirectoryGroup entity, Group template) {
 
     @Mapping(from = Group.class, to = DbGroup.class)
     public static DbGroup map(Group model, DbGroup template) {
-        DbGroup entity = template != null? template: new DbGroup();
+        DbGroup entity = template != null ? template : new DbGroup();
         if (model.isSetName()) {
             entity.setName(model.getName());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
index 8b555da9a9c..cb510559f73 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
@@ -259,16 +259,16 @@ public static Host map(VDS entity, Host template) {
             model.getIscsi().setInitiator(entity.getIScsiInitiatorName());
         }
         model.setPowerManagement(map(entity, (PowerManagement) null));
-        model.setHardwareInformation(map(entity, (HardwareInformation)null));
+        model.setHardwareInformation(map(entity, (HardwareInformation) null));
         model.setSsh(map(entity.getStaticData(), null));
         Cpu cpu = new Cpu();
         CpuTopology cpuTopology = new CpuTopology();
         if (entity.getCpuSockets() != null) {
             cpuTopology.setSockets(entity.getCpuSockets());
-            if (entity.getCpuCores()!=null) {
-                cpuTopology.setCores(entity.getCpuCores()/entity.getCpuSockets());
+            if (entity.getCpuCores() != null) {
+                cpuTopology.setCores(entity.getCpuCores() / entity.getCpuSockets());
                 if (entity.getCpuThreads() != null) {
-                    cpuTopology.setThreads(entity.getCpuThreads()/entity.getCpuCores());
+                    cpuTopology.setThreads(entity.getCpuThreads() / entity.getCpuCores());
                 }
             }
         }
@@ -277,7 +277,7 @@ public static Host map(VDS entity, Host template) {
         if (entity.getCpuName() != null) {
             cpu.setType(entity.getCpuName().getCpuName());
         }
-        if (entity.getCpuSpeedMh()!=null) {
+        if (entity.getCpuSpeedMh() != null) {
             cpu.setSpeed(new BigDecimal(entity.getCpuSpeedMh()));
         }
         model.setCpu(cpu);
@@ -333,7 +333,7 @@ public static Host map(VDS entity, Host template) {
         }
         devicePassthrough.setEnabled(entity.isHostDevicePassthroughEnabled());
 
-        if(entity.getHostName() != null) {
+        if (entity.getHostName() != null) {
             String subject = CertificateSubjectHelper.getCertificateSubject(entity.getHostName());
             model.setCertificate(new Certificate());
             model.getCertificate().setSubject(subject);
@@ -549,7 +549,7 @@ public static VdsOperationActionParameters map(Action action, VdsOperationAction
             if (action.getSsh().isSetFingerprint()) {
                 params.getvds().setSshKeyFingerprint(action.getSsh().getFingerprint());
             }
-            if (action.getSsh().isSetPublicKey()){
+            if (action.getSsh().isSetPublicKey()) {
                 params.getvds().setSshPublicKey(action.getSsh().getPublicKey());
             }
             if (action.getSsh().isSetAuthenticationMethod()) {
@@ -585,7 +585,7 @@ public static VdsOperationActionParameters map(Host host, VdsOperationActionPara
             if (host.getSsh().isSetFingerprint()) {
                 params.getvds().setSshKeyFingerprint(host.getSsh().getFingerprint());
             }
-            if (host.getSsh().isSetPublicKey()){
+            if (host.getSsh().isSetPublicKey()) {
                 params.getvds().setSshPublicKey(host.getSsh().getPublicKey());
             }
 
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java
index 5ddc307ea5b..10a1a4609c7 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostNicMapper.java
@@ -172,7 +172,7 @@ private static String calculateBondingOptionsString(HostNic model) {
         StringBuilder builder = new StringBuilder();
         appendBondingOption(builder, bondingOptions.get(0));
 
-        for(int i = 1; i < bondingOptions.size(); i++) {
+        for (int i = 1; i < bondingOptions.size(); i++) {
             builder.append(" ");
             appendBondingOption(builder, bondingOptions.get(i));
         }
@@ -214,23 +214,23 @@ public static HostNic map(VdsNetworkInterface entity, HostNic template) {
             model.setMac(new Mac());
             model.getMac().setAddress(entity.getMacAddress());
         }
-        if (entity.getStatistics().getStatus()!=InterfaceStatus.NONE) {
+        if (entity.getStatistics().getStatus() != InterfaceStatus.NONE) {
             NicStatus nicStatus = mapNicStatus(entity.getStatistics().getStatus());
             if (nicStatus != null) {
                 model.setStatus(nicStatus);
             }
         }
-        if(entity.getSpeed()!=null && entity.getSpeed()>0){
+        if (entity.getSpeed() != null && entity.getSpeed() > 0) {
             model.setSpeed(entity.getSpeed() * 1000L * 1000);
         }
         if (!StringUtils.isEmpty(entity.getBondOptions())) {
-            if(model.getBonding() == null) {
+            if (model.getBonding() == null) {
                 model.setBonding(new Bonding());
             }
             model.getBonding().setOptions(new Options());
-            for(String opt : entity.getBondOptions().split(OPTIONS_DELIMITER)){
+            for (String opt : entity.getBondOptions().split(OPTIONS_DELIMITER)) {
                 String[] option_pair = opt.split(OPTIONS_EQ);
-                if(option_pair.length == 2){
+                if (option_pair.length == 2) {
                     Option option = new Option();
                     option.setName(option_pair[0]);
                     option.setValue(option_pair[1]);
@@ -263,7 +263,7 @@ public static HostNic map(VdsNetworkInterface entity, HostNic template) {
 
     private static void mapIpv4ToModel(VdsNetworkInterface entity, HostNic model) {
         BootProtocol ipv4BootProtocol = Ipv4BootProtocolMapper.map(entity.getIpv4BootProtocol());
-        if(ipv4BootProtocol!=null){
+        if (ipv4BootProtocol != null) {
             model.setBootProtocol(ipv4BootProtocol);
         }
 
@@ -285,7 +285,7 @@ private static void mapIpv4ToModel(VdsNetworkInterface entity, HostNic model) {
 
     private static void mapIpv6ToModel(VdsNetworkInterface entity, HostNic model) {
         BootProtocol ipv6BootProtocol = Ipv6BootProtocolMapper.map(entity.getIpv6BootProtocol());
-        if(ipv6BootProtocol!=null){
+        if (ipv6BootProtocol != null) {
             model.setIpv6BootProtocol(ipv6BootProtocol);
         }
 
@@ -308,7 +308,7 @@ private static void mapIpv6ToModel(VdsNetworkInterface entity, HostNic model) {
     private static String getType(final String[] optionPair) {
         if (!StringUtils.isEmpty(optionPair[0]) && optionPair[0].equals("mode") && !StringUtils.isEmpty(optionPair[1])) {
             Integer mode = tryParse(optionPair[1]);
-            if(mode != null){
+            if (mode != null) {
                 /*
                  *  Return the description of this bond-mode, as it appears in BondMode enum
                  *  in the Engine (truncating the unnecessary "(Mode x") prefix from it).
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/IpHelper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/IpHelper.java
index 5dbeb69e7fe..84fd9886cfb 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/IpHelper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/IpHelper.java
@@ -40,6 +40,6 @@ public static IpVersion getVersion(Ip ip) {
         // This isn't a complete validation, as the API doesn't currently perform validations, but assuming that the
         // address is valid, checking if it contains a colon is enough to determine if it is IPv4 or IPv6, as no valid
         // IPv4 address can contain a colon, and all valid IPv6 addresses must contain at least one colon.
-        return address.contains(":")? IpVersion.V6: IpVersion.V4;
+        return address.contains(":") ? IpVersion.V6 : IpVersion.V4;
     }
 }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/MappingLocator.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/MappingLocator.java
index a110ed98989..c25f9276313 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/MappingLocator.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/MappingLocator.java
@@ -57,7 +57,7 @@ public MappingLocator() {
      * with the @Mapping annotation.
      */
     public void populate() {
-        String packageName = discoverPackageName != null? discoverPackageName: this.getClass().getPackage().getName();
+        String packageName = discoverPackageName != null ? discoverPackageName : this.getClass().getPackage().getName();
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
         List<String> classNames = PackageExplorer.discoverClasses(packageName);
         for (String className : classNames) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QosTypeMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QosTypeMapper.java
index bbe6ddc4643..87cb653dd9a 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QosTypeMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QosTypeMapper.java
@@ -4,7 +4,7 @@
 
 public class QosTypeMapper {
 
-    @Mapping(from=org.ovirt.engine.core.common.businessentities.qos.QosType.class, to=QosType.class)
+    @Mapping(from = org.ovirt.engine.core.common.businessentities.qos.QosType.class, to = QosType.class)
     public static QosType map(org.ovirt.engine.core.common.businessentities.qos.QosType qosType, QosType template) {
         switch (qosType) {
 
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QuotaMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QuotaMapper.java
index 923f342a0d9..50700e7d172 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QuotaMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/QuotaMapper.java
@@ -16,7 +16,7 @@ public class QuotaMapper {
 
     @Mapping(from = Quota.class, to = org.ovirt.engine.core.common.businessentities.Quota.class)
     public static org.ovirt.engine.core.common.businessentities.Quota map(Quota model, org.ovirt.engine.core.common.businessentities.Quota template) {
-        org.ovirt.engine.core.common.businessentities.Quota entity = (template==null) ? new org.ovirt.engine.core.common.businessentities.Quota() : template;
+        org.ovirt.engine.core.common.businessentities.Quota entity = (template == null) ? new org.ovirt.engine.core.common.businessentities.Quota() : template;
         if (model.isSetId()) {
             entity.setId(GuidUtils.asGuid(model.getId()));
         }
@@ -46,18 +46,18 @@ public static org.ovirt.engine.core.common.businessentities.Quota map(Quota mode
 
     @Mapping(from = org.ovirt.engine.core.common.businessentities.Quota.class, to = Quota.class)
     public static Quota map(org.ovirt.engine.core.common.businessentities.Quota template, Quota model) {
-        Quota ret = (model==null) ? new Quota() : model;
-        if (template.getId()!=null) {
+        Quota ret = (model == null) ? new Quota() : model;
+        if (template.getId() != null) {
             ret.setId(template.getId().toString());
         }
-        if (template.getQuotaName()!=null) {
+        if (template.getQuotaName() != null) {
             ret.setName(template.getQuotaName());
         }
-        if (template.getDescription()!=null) {
+        if (template.getDescription() != null) {
             ret.setDescription(template.getDescription());
         }
-        if (template.getStoragePoolId()!=null) {
-            if (ret.getDataCenter()==null) {
+        if (template.getStoragePoolId() != null) {
+            if (ret.getDataCenter() == null) {
                 ret.setDataCenter(new DataCenter());
             }
             ret.getDataCenter().setId(template.getStoragePoolId().toString());
@@ -122,7 +122,7 @@ public static org.ovirt.engine.core.common.businessentities.Quota map(QuotaStora
             quotaStorage.setStorageSizeGB(model.getLimit());
         }
         // specific SD
-        if(model.isSetStorageDomain() && model.getStorageDomain().isSetId()) {
+        if (model.isSetStorageDomain() && model.getStorageDomain().isSetId()) {
             quotaStorage.setStorageId(GuidUtils.asGuid(model.getStorageDomain().getId()));
             entity.getQuotaStorages().add(quotaStorage);
         } else { // global
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RngDeviceMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RngDeviceMapper.java
index 75f1024f7a8..c82c4d247f4 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RngDeviceMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/RngDeviceMapper.java
@@ -72,7 +72,7 @@ public static VmRngDevice map(RngDevice model, VmRngDevice template) {
     }
 
     public static List<VmRngDevice.Source> mapRngSources(List<RngSource> model) {
-        List<VmRngDevice.Source> result = new ArrayList<>(model != null? model.size(): 0);
+        List<VmRngDevice.Source> result = new ArrayList<>(model != null ? model.size() : 0);
         if (model != null) {
             for (RngSource source : model) {
                 result.add(map(source, null));
@@ -82,7 +82,7 @@ public static List<VmRngDevice.Source> mapRngSources(List<RngSource> model) {
     }
 
     public static List<RngSource> mapRngSources(Collection<VmRngDevice.Source> entity) {
-        List<RngSource> result = new ArrayList<>(entity != null ? entity.size(): 0);
+        List<RngSource> result = new ArrayList<>(entity != null ? entity.size() : 0);
         if (entity != null) {
             for (VmRngDevice.Source source : entity) {
                 RngSource restSource = map(source, null);
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SchedulingPolicyMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SchedulingPolicyMapper.java
index 2a57056ad44..8e63884b83d 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SchedulingPolicyMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SchedulingPolicyMapper.java
@@ -82,7 +82,7 @@ public static ClusterPolicy map(Filter model,
             ClusterPolicy template) {
         ClusterPolicy entity =
                 template != null ? template : new ClusterPolicy();
-        if(model.isSetSchedulingPolicyUnit() && model.getSchedulingPolicyUnit().isSetId()){
+        if (model.isSetSchedulingPolicyUnit() && model.getSchedulingPolicyUnit().isSetId()) {
             Guid guid = GuidUtils.asGuid(model.getSchedulingPolicyUnit().getId());
             if (entity.getFilters() == null) {
                 entity.setFilters(new ArrayList<>());
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SerialNumberMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SerialNumberMapper.java
index 55988060507..b342c459521 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SerialNumberMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/SerialNumberMapper.java
@@ -49,7 +49,7 @@ public static SerialNumberPolicy map(org.ovirt.engine.core.common.businessentiti
         }
         switch (serialNumberPolicy) {
         case HOST_ID:
-            return  SerialNumberPolicy.HOST;
+            return SerialNumberPolicy.HOST;
         case VM_ID:
             return SerialNumberPolicy.VM;
         case CUSTOM:
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
index 03e9b49d1bf..4b081cb3528 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java
@@ -29,7 +29,7 @@ public static StorageDomainStatic map(StorageDomain model, StorageDomainStatic t
         if (model.isSetDescription()) {
             entity.setDescription(model.getDescription());
         }
-        if(model.isSetComment()) {
+        if (model.isSetComment()) {
             entity.setComment(model.getComment());
         }
         if (model.isSetType()) {
@@ -78,16 +78,16 @@ public static StorageServerConnections map(StorageDomain model, StorageServerCon
                 case GLANCE:
                     break;
                 case NFS:
-                    if(storage.isSetAddress() && storage.isSetPath()) {
+                    if (storage.isSetAddress() && storage.isSetPath()) {
                         entity.setConnection(storage.getAddress() + ":" + storage.getPath());
                     }
-                    if(storage.getNfsRetrans() != null) {
+                    if (storage.getNfsRetrans() != null) {
                         entity.setNfsRetrans(storage.getNfsRetrans().shortValue());
                     }
-                    if(storage.getNfsTimeo() != null) {
+                    if (storage.getNfsTimeo() != null) {
                         entity.setNfsTimeo(storage.getNfsTimeo().shortValue());
                     }
-                    if(storage.getNfsVersion() != null) {
+                    if (storage.getNfsVersion() != null) {
                         entity.setNfsVersion(map(storage.getNfsVersion(), null));
                     }
                     if (storage.isSetMountOptions()) {
@@ -146,17 +146,17 @@ public static StorageDomain map(org.ovirt.engine.core.common.businessentities.St
             model.getStorage().setVolumeGroup(new VolumeGroup());
             model.getStorage().getVolumeGroup().setId(entity.getStorage());
         }
-        if (entity.getAvailableDiskSize()!= null) {
+        if (entity.getAvailableDiskSize() != null) {
             model.setAvailable(SizeConverter.convert(entity.getAvailableDiskSize().longValue(),
                     SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES).longValue());
         }
-        if (entity.getUsedDiskSize()!= null) {
+        if (entity.getUsedDiskSize() != null) {
             model.setUsed(SizeConverter.convert(entity.getUsedDiskSize().longValue(),
                     SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES).longValue());
         }
         model.setCommitted(SizeConverter.convert(entity.getCommittedDiskSize(),
                 SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES).longValue());
-        if (entity.getStorageFormat()!= null) {
+        if (entity.getStorageFormat() != null) {
             model.setStorageFormat(StorageFormatMapper.map(entity.getStorageFormat(), null));
         }
         model.setWipeAfterDelete(entity.getWipeAfterDelete());
@@ -466,7 +466,7 @@ public static org.ovirt.engine.core.common.businessentities.NfsVersion map(NfsVe
 
     @Mapping(from = org.ovirt.engine.core.common.businessentities.NfsVersion.class, to = NfsVersion.class)
     public static NfsVersion map(org.ovirt.engine.core.common.businessentities.NfsVersion version, NfsVersion outgoing) {
-        switch(version) {
+        switch (version) {
         case V3:
             return NfsVersion.V3;
         case V4:
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageFormatMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageFormatMapper.java
index 042c2fbe1e7..984af581b32 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageFormatMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageFormatMapper.java
@@ -7,7 +7,7 @@ public class StorageFormatMapper {
 
     @Mapping(from = StorageFormatType.class, to = StorageFormat.class)
     public static StorageFormat map(StorageFormatType model, StorageFormat template) {
-        if (model==null) {
+        if (model == null) {
             return null;
         }
         switch (model) {
@@ -29,7 +29,7 @@ public static StorageFormat map(StorageFormatType model, StorageFormat template)
 
     @Mapping(from = StorageFormat.class, to = StorageFormatType.class)
     public static StorageFormatType map(StorageFormat model, StorageFormatType template) {
-        if (model==null) {
+        if (model == null) {
             return null;
         }
         switch (model) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
index 246dd9d36f6..5af74feac47 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageLogicalUnitMapper.java
@@ -19,16 +19,16 @@ public class StorageLogicalUnitMapper {
     public static LogicalUnit map(LUNs entity, LogicalUnit template) {
         LogicalUnit model = template != null ? template : new LogicalUnit();
         model.setId(entity.getLUNId());
-        if (entity.getVendorId()!=null && !entity.getVendorId().isEmpty()) {
+        if (entity.getVendorId() != null && !entity.getVendorId().isEmpty()) {
             model.setVendorId(entity.getVendorId());
         }
-        if (entity.getProductId()!=null && !entity.getProductId().isEmpty()) {
+        if (entity.getProductId() != null && !entity.getProductId().isEmpty()) {
             model.setProductId(entity.getProductId());
         }
-        if (entity.getSerial()!=null && !entity.getSerial().isEmpty()) {
+        if (entity.getSerial() != null && !entity.getSerial().isEmpty()) {
             model.setSerial(entity.getSerial());
         }
-        if (entity.getLunMapping()!=null) {
+        if (entity.getLunMapping() != null) {
             model.setLunMapping(entity.getLunMapping());
         }
         if (entity.getVolumeGroupId() != null && !entity.getVolumeGroupId().isEmpty()) {
@@ -48,7 +48,7 @@ public static LogicalUnit map(LUNs entity, LogicalUnit template) {
         }
         // Not supported by sysfs since kernel version 4.12, and thus deprecated.
         model.setDiscardZeroesData(false);
-        model.setSize(SizeConverter.convert((long)entity.getDeviceSize(),
+        model.setSize(SizeConverter.convert((long) entity.getDeviceSize(),
                 SizeConverter.SizeUnit.GiB, SizeConverter.SizeUnit.BYTES).longValue());
 
         if (entity.getLunConnections() != null && !entity.getLunConnections().isEmpty()) {
@@ -69,7 +69,7 @@ public static LogicalUnit map(StorageServerConnections entity, LogicalUnit templ
         model.setTarget(entity.getIqn());
         model.setPort(Integer.parseInt(entity.getPort()));
         model.setUsername(entity.getUserName());
-        if (entity.getConnection()!=null && entity.getPort()!=null && entity.getPortal()!=null) {
+        if (entity.getConnection() != null && entity.getPort() != null && entity.getPortal() != null) {
             model.setPortal(entity.getConnection() + ":" + entity.getPort() + "," + entity.getPortal());
         }
         return model;
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageServerConnectionExtensionMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageServerConnectionExtensionMapper.java
index b132e4d4b80..5c1c3025fdd 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageServerConnectionExtensionMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageServerConnectionExtensionMapper.java
@@ -30,7 +30,7 @@ public static StorageServerConnectionExtension map(StorageConnectionExtension re
 
     @Mapping(from = org.ovirt.engine.core.common.businessentities.storage.StorageServerConnectionExtension.class, to = StorageConnectionExtension.class)
     public static StorageConnectionExtension map(StorageServerConnectionExtension connectionExtension, StorageConnectionExtension template) {
-        StorageConnectionExtension  modelConnectionExt = template != null ? template : new StorageConnectionExtension();
+        StorageConnectionExtension modelConnectionExt = template != null ? template : new StorageConnectionExtension();
 
         modelConnectionExt.setId(connectionExtension.getId().toString());
         Host host = new Host();
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
index 3abc0c3a29d..9d13828927f 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmBaseMapper.java
@@ -373,8 +373,8 @@ protected static void mapCommonEntityToModel(VmBase model, org.ovirt.engine.core
         }
 
         MemoryPolicy policy = new MemoryPolicy();
-        policy.setGuaranteed((long)entity.getMinAllocatedMem() * (long)BYTES_PER_MB);
-        policy.setMax((long)entity.getMaxMemorySizeMb() * (long)BYTES_PER_MB);
+        policy.setGuaranteed((long) entity.getMinAllocatedMem() * (long) BYTES_PER_MB);
+        policy.setMax((long) entity.getMaxMemorySizeMb() * (long) BYTES_PER_MB);
         policy.setBallooning(entity.isBalloonEnabled());
         model.setMemoryPolicy(policy);
 
@@ -435,7 +435,7 @@ protected static void mapVmBaseEntityToModel(VmBase model, org.ovirt.engine.core
             model.getBios().setType(map(entity.getBiosType(), null));
         }
 
-        if(entity.getTimeZone() != null) {
+        if (entity.getTimeZone() != null) {
             model.setTimeZone(new TimeZone());
             model.getTimeZone().setName(entity.getTimeZone());
         }
@@ -484,7 +484,7 @@ protected static void mapVmBaseEntityToModel(VmBase model, org.ovirt.engine.core
             model.getSmallIcon().setId(entity.getSmallIconId().toString());
         }
 
-        if (entity.getQuotaId()!=null) {
+        if (entity.getQuotaId() != null) {
             Quota quota = new Quota();
             quota.setId(entity.getQuotaId().toString());
             model.setQuota(quota);
@@ -507,7 +507,7 @@ protected static void mapVmBaseEntityToModel(VmBase model, org.ovirt.engine.core
             break;
         }
 
-        if(entity.isUseHostCpuFlags()) {
+        if (entity.isUseHostCpuFlags()) {
             model.getCpu().setMode(CpuMode.HOST_PASSTHROUGH);
         }
         model.getCpu().setCpuTune(stringToCpuTune(entity.getCpuPinning()));
@@ -630,7 +630,7 @@ public static VmType mapVmType(org.ovirt.engine.core.common.businessentities.VmT
 
     @Mapping(from = VmAffinity.class, to = MigrationSupport.class)
     public static MigrationSupport map(VmAffinity vmAffinity, MigrationSupport template) {
-        if(vmAffinity!=null){
+        if (vmAffinity != null) {
             switch (vmAffinity) {
             case MIGRATABLE:
                 return MigrationSupport.MIGRATABLE;
@@ -647,7 +647,7 @@ public static MigrationSupport map(VmAffinity vmAffinity, MigrationSupport templ
 
     @Mapping(from = MigrationSupport.class, to = VmAffinity.class)
     public static VmAffinity map(MigrationSupport migrationSupport, VmAffinity template) {
-        if(migrationSupport!=null){
+        if (migrationSupport != null) {
             switch (migrationSupport) {
             case MIGRATABLE:
                 return VmAffinity.MIGRATABLE;
@@ -713,12 +713,12 @@ static String cpuTuneToString(final CpuTune tune) {
      * Maps the stringified CPU-pinning to the API format.
      */
     static CpuTune stringToCpuTune(String cpuPinning) {
-        if(StringUtils.isEmpty(cpuPinning)) {
+        if (StringUtils.isEmpty(cpuPinning)) {
             return null;
         }
         final CpuTune cpuTune = new CpuTune();
         VcpuPins pins = new VcpuPins();
-        for(String strCpu : cpuPinning.split("_")) {
+        for (String strCpu : cpuPinning.split("_")) {
             VcpuPin pin = stringToVCpupin(strCpu);
             pins.getVcpuPins().add(pin);
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index 22158c5d866..f58bb0aff04 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -179,7 +179,7 @@ public static VmStatic map(Vm vm, VmStatic template) {
 
         mapVmBaseModelToEntity(staticVm, vm);
 
-        if (!vm.isSetMemory() && staticVm.getMemSizeMb()==0){
+        if (!vm.isSetMemory() && staticVm.getMemSizeMb() == 0) {
           //TODO: Get rid of this logic code when Backend supports default memory.
             staticVm.setMemSizeMb(DEFAULT_MEMORY_SIZE);
         }
@@ -249,7 +249,7 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
             model.getTemplate().setId(entity.getVmtGuid().toString());
             // display this property only if the vm is stateless
             // otherwise the value of this property is meaningless and misleading
-            if(entity.isStateless()) {
+            if (entity.isStateless()) {
                 model.setUseLatestTemplateVersion(entity.isUseLatestVersion());
             }
         }
@@ -328,7 +328,7 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
 
         // fill dynamic data
         if (entity.getDynamicData() != null && !entity.getStatus().isNotRunning()) {
-            if(entity.getRunOnVds() != null) {
+            if (entity.getRunOnVds() != null) {
                 model.setHost(new Host());
                 model.getHost().setId(entity.getRunOnVds().toString());
             }
@@ -339,7 +339,7 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
             final boolean hasGuestOsVersion = entity.getGuestOsVersion() != null && !entity.getGuestOsVersion().isEmpty();
             if (hasGuestOsVersion) {
                 GuestOperatingSystem os = model.getGuestOperatingSystem();
-                if(os == null) {
+                if (os == null) {
                     os = new GuestOperatingSystem();
                     model.setGuestOperatingSystem(os);
                 }
@@ -347,10 +347,10 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
                 os.setCodename(entity.getGuestOsCodename());
                 os.setDistribution(entity.getGuestOsDistribution());
                 String kernelVersionString = entity.getGuestOsKernelVersion();
-                if(StringUtils.isNotEmpty(kernelVersionString)) {
+                if (StringUtils.isNotEmpty(kernelVersionString)) {
                     org.ovirt.engine.api.model.Version kernelVersion = VersionMapper.fromVersionString(kernelVersionString);
-                    if(kernelVersion != null) {
-                        if(os.getKernel() == null) {
+                    if (kernelVersion != null) {
+                        if (os.getKernel() == null) {
                             os.setKernel(new Kernel());
                         }
                         os.getKernel().setVersion(kernelVersion);
@@ -358,9 +358,9 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
                     }
                 }
                 String osVersionString = entity.getGuestOsVersion();
-                if(StringUtils.isNotEmpty(osVersionString)) {
+                if (StringUtils.isNotEmpty(osVersionString)) {
                     os.setVersion(VersionMapper.fromVersionString(osVersionString));
-                    if(os.getVersion() != null) {
+                    if (os.getVersion() != null) {
                         os.getVersion().setFullVersion(entity.getGuestOsVersion());
                     }
                 }
@@ -370,7 +370,7 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
             final boolean hasTimezoneName = entity.getGuestOsTimezoneName() != null && !entity.getGuestOsTimezoneName().isEmpty();
             if (hasTimezoneName) {
                 TimeZone guestTz = model.getGuestTimeZone();
-                if(guestTz == null) {
+                if (guestTz == null) {
                     guestTz = new TimeZone();
                     model.setGuestTimeZone(guestTz);
                 }
@@ -392,7 +392,7 @@ public static Vm map(org.ovirt.engine.core.common.businessentities.VM entity, Vm
                 Integer displayPort = graphicsInfo == null ? null : graphicsInfo.getPort();
                 model.getDisplay().setPort(displayPort == null || displayPort.equals(-1) ? null : displayPort);
                 Integer displaySecurePort = graphicsInfo == null ? null : graphicsInfo.getTlsPort();
-                model.getDisplay().setSecurePort(displaySecurePort==null || displaySecurePort.equals(-1) ? null : displaySecurePort);
+                model.getDisplay().setSecurePort(displaySecurePort == null || displaySecurePort.equals(-1) ? null : displaySecurePort);
             }
         }
         if (entity.getLastStopTime() != null) {
@@ -724,18 +724,18 @@ public static Vm map(String data, ConfigurationType type, Vm vm) {
     @Mapping(from = org.ovirt.engine.api.model.VmDeviceType.class, to = VmDeviceType.class)
     public static VmDeviceType map(org.ovirt.engine.api.model.VmDeviceType deviceType, VmDeviceType template) {
         switch (deviceType) {
-            case FLOPPY:            return VmDeviceType.FLOPPY;
-            case CDROM:             return VmDeviceType.CDROM;
-            default:                return null;
+            case FLOPPY: return VmDeviceType.FLOPPY;
+            case CDROM: return VmDeviceType.CDROM;
+            default: return null;
         }
     }
 
     @Mapping(from = VmDeviceType.class, to = org.ovirt.engine.api.model.VmDeviceType.class)
     public static org.ovirt.engine.api.model.VmDeviceType map(VmDeviceType deviceType, org.ovirt.engine.api.model.VmDeviceType template) {
         switch (deviceType) {
-            case FLOPPY:            return org.ovirt.engine.api.model.VmDeviceType.FLOPPY;
-            case CDROM:             return org.ovirt.engine.api.model.VmDeviceType.CDROM;
-            default:                return null;
+            case FLOPPY: return org.ovirt.engine.api.model.VmDeviceType.FLOPPY;
+            case CDROM: return org.ovirt.engine.api.model.VmDeviceType.CDROM;
+            default: return null;
         }
     }
 
@@ -748,7 +748,7 @@ public static VmMediatedDevice map(VmMdevType device, VmMediatedDevice template)
             List<Property> propertyList = properties.getProperties();
             for (Entry entry : device.getSpecParams().entrySet()) {
                 Property property = new Property();
-                property.setName((String)entry.getKey());
+                property.setName((String) entry.getKey());
                 property.setValue(entry.getValue().toString());
                 propertyList.add(property);
             }
@@ -1269,12 +1269,12 @@ private static Sessions mapConsoleSession(org.ovirt.engine.core.common.businesse
             consoleUser.setUserName(userName);
             consoleUser.setDomain(new Domain());
             consoleUser.getDomain().setName(domainName);
-            if (vm.getConsoleUserId()!=null) {
+            if (vm.getConsoleUserId() != null) {
                 consoleUser.setId(vm.getConsoleUserId().toString());
             }
             Session consoleSession = new Session();
             consoleSession.setUser(consoleUser);
-            if (vm.getClientIp()!=null && !vm.getClientIp().isEmpty()) {
+            if (vm.getClientIp() != null && !vm.getClientIp().isEmpty()) {
                 Ip ip = new Ip();
                 ip.setAddress(vm.getClientIp());
                 consoleSession.setIp(ip);
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VnicProfileMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VnicProfileMapper.java
index 856195cf09e..6de3733fb6e 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VnicProfileMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VnicProfileMapper.java
@@ -96,7 +96,7 @@ public static VnicProfile map(org.ovirt.engine.core.common.businessentities.netw
         final VnicPassThrough vnicPassThrough = new VnicPassThrough();
         vnicPassThrough.setMode(map(entity.isPassthrough()));
         model.setPassThrough(vnicPassThrough);
-        if (entity.getNetworkFilterId() != null){
+        if (entity.getNetworkFilterId() != null) {
             model.setNetworkFilter(new NetworkFilter());
             model.getNetworkFilter().setId(entity.getNetworkFilterId().toString());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalComputeResourceMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalComputeResourceMapper.java
index caf1c037b36..1ed4648f2d1 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalComputeResourceMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalComputeResourceMapper.java
@@ -41,7 +41,7 @@ public static org.ovirt.engine.core.common.businessentities.ExternalComputeResou
             ExternalComputeResource model,
             org.ovirt.engine.core.common.businessentities.ExternalComputeResource template) {
         org.ovirt.engine.core.common.businessentities.ExternalComputeResource entity =
-                template != null? template: new org.ovirt.engine.core.common.businessentities.ExternalComputeResource();
+                template != null ? template : new org.ovirt.engine.core.common.businessentities.ExternalComputeResource();
         if (model.isSetId()) {
             entity.setName(hex2string(model.getId()));
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalDiscoveredHostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalDiscoveredHostMapper.java
index f8defdd54d1..4c46546bd29 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalDiscoveredHostMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalDiscoveredHostMapper.java
@@ -17,7 +17,7 @@ public class ExternalDiscoveredHostMapper {
     public static ExternalDiscoveredHost map(
             org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost entity,
             ExternalDiscoveredHost template) {
-        ExternalDiscoveredHost model = template != null? template: new ExternalDiscoveredHost();
+        ExternalDiscoveredHost model = template != null ? template : new ExternalDiscoveredHost();
         String name = entity.getName();
         if (name != null) {
             model.setId(string2hex(name));
@@ -44,7 +44,7 @@ public static org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHo
             ExternalDiscoveredHost model,
             org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost template) {
         org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost entity =
-                template != null? template: new org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost();
+                template != null ? template : new org.ovirt.engine.core.common.businessentities.ExternalDiscoveredHost();
         if (model.isSetId()) {
             entity.setName(hex2string(model.getId()));
         } else if (model.isSetName()) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostGroupMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostGroupMapper.java
index f16280592d7..f1591e9b539 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostGroupMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostGroupMapper.java
@@ -15,7 +15,7 @@ public class ExternalHostGroupMapper {
     @Mapping(from = org.ovirt.engine.core.common.businessentities.ExternalHostGroup.class, to = ExternalHostGroup.class)
     public static ExternalHostGroup map(org.ovirt.engine.core.common.businessentities.ExternalHostGroup entity,
             ExternalHostGroup template) {
-        ExternalHostGroup model = template != null? template: new ExternalHostGroup();
+        ExternalHostGroup model = template != null ? template : new ExternalHostGroup();
         String name = entity.getName();
         if (name != null) {
             model.setId(string2hex(name));
@@ -40,7 +40,7 @@ public static ExternalHostGroup map(org.ovirt.engine.core.common.businessentitie
     public static org.ovirt.engine.core.common.businessentities.ExternalHostGroup map(ExternalHostGroup model,
             org.ovirt.engine.core.common.businessentities.ExternalHostGroup template) {
         org.ovirt.engine.core.common.businessentities.ExternalHostGroup entity =
-                template != null? template: new org.ovirt.engine.core.common.businessentities.ExternalHostGroup();
+                template != null ? template : new org.ovirt.engine.core.common.businessentities.ExternalHostGroup();
         if (model.isSetId()) {
             entity.setName(hex2string(model.getId()));
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostMapper.java
index 3505c991c0b..c63b154898f 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostMapper.java
@@ -15,7 +15,7 @@
 public class ExternalHostMapper {
     @Mapping(from = VDS.class, to = ExternalHost.class)
     public static ExternalHost map(VDS entity, ExternalHost template) {
-        ExternalHost model = template != null? template: new ExternalHost();
+        ExternalHost model = template != null ? template : new ExternalHost();
         String name = entity.getName();
         if (name != null) {
             model.setId(string2hex(name));
@@ -29,7 +29,7 @@ public static ExternalHost map(VDS entity, ExternalHost template) {
 
     @Mapping(from = ExternalHost.class, to = VDS.class)
     public static VDS map(ExternalHost model, VDS template) {
-        VDS entity = template != null? template: new VDS();
+        VDS entity = template != null ? template : new VDS();
         if (model.isSetId()) {
             entity.setVdsName(hex2string(model.getId()));
         } else if (model.isSetName()) {
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostProviderMapper.java
index 7afac1dd643..cf0dcf6fbdd 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostProviderMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/externalhostproviders/ExternalHostProviderMapper.java
@@ -14,7 +14,7 @@
 public class ExternalHostProviderMapper {
     @Mapping(from = ExternalHostProvider.class, to = Provider.class)
     public static Provider map(ExternalHostProvider model, Provider template) {
-        Provider entity = template != null? template: new Provider();
+        Provider entity = template != null ? template : new Provider();
         entity.setType(ProviderType.FOREMAN);
         if (model.isSetId()) {
             entity.setId(GuidUtils.asGuid(model.getId()));
@@ -42,7 +42,7 @@ public static Provider map(ExternalHostProvider model, Provider template) {
 
     @Mapping(from = Provider.class, to = ExternalHostProvider.class)
     public static ExternalHostProvider map(Provider entity, ExternalHostProvider template) {
-        ExternalHostProvider model = template != null? template: new ExternalHostProvider();
+        ExternalHostProvider model = template != null ? template : new ExternalHostProvider();
         if (entity.getId() != null) {
             model.setId(entity.getId().toString());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageMapper.java
index 7b97de29459..e6b3e46f514 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageMapper.java
@@ -12,7 +12,7 @@
 public class OpenStackImageMapper {
     @Mapping(from = RepoImage.class, to = OpenStackImage.class)
     public static OpenStackImage map(RepoImage entity, OpenStackImage template) {
-        OpenStackImage model = template != null? template: new OpenStackImage();
+        OpenStackImage model = template != null ? template : new OpenStackImage();
         if (entity.getRepoImageId() != null) {
             model.setId(entity.getRepoImageId());
         }
@@ -24,7 +24,7 @@ public static OpenStackImage map(RepoImage entity, OpenStackImage template) {
 
     @Mapping(from = OpenStackImage.class, to = RepoImage.class)
     public static RepoImage map(OpenStackImage model, RepoImage template) {
-        RepoImage entity = template != null? template: new RepoImage();
+        RepoImage entity = template != null ? template : new RepoImage();
         if (model.isSetId()) {
             entity.setRepoImageId(model.getId());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java
index e7feb1d789f..637154abc49 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackImageProviderMapper.java
@@ -22,7 +22,7 @@ public class OpenStackImageProviderMapper {
     public static Provider<OpenStackImageProviderProperties> map(OpenStackImageProvider model,
                 Provider<OpenStackImageProviderProperties> template) {
         Provider<OpenStackImageProviderProperties> entity =
-                template != null? template: new Provider<>();
+                template != null ? template : new Provider<>();
         entity.setType(ProviderType.OPENSTACK_IMAGE);
         if (model.isSetId()) {
             entity.setId(GuidUtils.asGuid(model.getId()));
@@ -66,7 +66,7 @@ public static Provider<OpenStackImageProviderProperties> map(OpenStackImageProvi
     @Mapping(from = Provider.class, to = OpenStackImageProvider.class)
     public static OpenStackImageProvider map(Provider<OpenStackImageProviderProperties> entity,
             OpenStackImageProvider template) {
-        OpenStackImageProvider model = template != null? template: new OpenStackImageProvider();
+        OpenStackImageProvider model = template != null ? template : new OpenStackImageProvider();
         if (entity.getId() != null) {
             model.setId(entity.getId().toString());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkMapper.java
index 959bef87a66..0e645aae9f7 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkMapper.java
@@ -13,7 +13,7 @@
 public class OpenStackNetworkMapper {
     @Mapping(from = Network.class, to = OpenStackNetwork.class)
     public static OpenStackNetwork map(Network entity, OpenStackNetwork template) {
-        OpenStackNetwork model = template != null? template: new OpenStackNetwork();
+        OpenStackNetwork model = template != null ? template : new OpenStackNetwork();
         ProviderNetwork providedBy = entity.getProvidedBy();
         if (providedBy != null) {
             if (providedBy.getExternalId() != null) {
@@ -28,7 +28,7 @@ public static OpenStackNetwork map(Network entity, OpenStackNetwork template) {
 
     @Mapping(from = OpenStackNetwork.class, to = Network.class)
     public static Network map(OpenStackNetwork model, Network template) {
-        Network entity = template != null? template: new Network();
+        Network entity = template != null ? template : new Network();
         if (model.isSetId()) {
             ProviderNetwork providedBy = new ProviderNetwork();
             providedBy.setExternalId(model.getId());
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java
index 25b659e04d4..88b3b70401a 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackNetworkProviderMapper.java
@@ -26,7 +26,7 @@ public class OpenStackNetworkProviderMapper {
     public static Provider<OpenstackNetworkProviderProperties> map(OpenStackNetworkProvider model,
             Provider<OpenstackNetworkProviderProperties> template) {
         Provider<OpenstackNetworkProviderProperties> entity =
-             template != null? template: new Provider<>();
+             template != null ? template : new Provider<>();
         if (model.isSetType()) {
             entity.setType(mapProviderType(model.getType()));
         }
@@ -72,7 +72,7 @@ public static Provider<OpenstackNetworkProviderProperties> map(OpenStackNetworkP
     public static OpenstackNetworkProviderProperties map(OpenStackNetworkProvider model,
             OpenstackNetworkProviderProperties template) {
         OpenstackNetworkProviderProperties entity =
-                template != null? template: new OpenstackNetworkProviderProperties();
+                template != null ? template : new OpenstackNetworkProviderProperties();
         if (model.isSetTenantName()) {
             entity.setTenantName(model.getTenantName());
         }
@@ -109,7 +109,7 @@ public static OpenstackNetworkProviderProperties map(OpenStackNetworkProvider mo
     @Mapping(from = Provider.class, to = OpenStackNetworkProvider.class)
     public static OpenStackNetworkProvider map(Provider<OpenstackNetworkProviderProperties> entity,
             OpenStackNetworkProvider template) {
-        OpenStackNetworkProvider model = template != null? template: new OpenStackNetworkProvider();
+        OpenStackNetworkProvider model = template != null ? template : new OpenStackNetworkProvider();
         model.setType(mapProviderType(entity.getType()));
         if (entity.getId() != null) {
             model.setId(entity.getId().toString());
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackSubnetMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackSubnetMapper.java
index b5a28a4a3ab..0615a758251 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackSubnetMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackSubnetMapper.java
@@ -17,7 +17,7 @@
 public class OpenStackSubnetMapper {
     @Mapping(from = ExternalSubnet.class, to = OpenStackSubnet.class)
     public static OpenStackSubnet map(ExternalSubnet entity, OpenStackSubnet template) {
-        OpenStackSubnet model = template != null? template: new OpenStackSubnet();
+        OpenStackSubnet model = template != null ? template : new OpenStackSubnet();
         if (entity.getId() != null) {
             model.setId(entity.getId());
         }
@@ -46,7 +46,7 @@ public static OpenStackSubnet map(ExternalSubnet entity, OpenStackSubnet templat
 
     @Mapping(from = OpenStackSubnet.class, to = ExternalSubnet.class)
     public static ExternalSubnet map(OpenStackSubnet model, ExternalSubnet template) {
-        ExternalSubnet entity = template != null? template: new ExternalSubnet();
+        ExternalSubnet entity = template != null ? template : new ExternalSubnet();
         if (model.isSetId()) {
             entity.setId(model.getId());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeProviderMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeProviderMapper.java
index 9ab3974b4f0..e586cdb043d 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeProviderMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeProviderMapper.java
@@ -24,7 +24,7 @@ public class OpenStackVolumeProviderMapper {
     public static Provider<OpenStackVolumeProviderProperties> map(OpenStackVolumeProvider model,
                 Provider<OpenStackVolumeProviderProperties> template) {
         Provider<OpenStackVolumeProviderProperties> entity =
-                template != null? template: new Provider<>();
+                template != null ? template : new Provider<>();
         entity.setType(ProviderType.OPENSTACK_VOLUME);
         if (model.isSetId()) {
             entity.setId(GuidUtils.asGuid(model.getId()));
@@ -71,7 +71,7 @@ public static Provider<OpenStackVolumeProviderProperties> map(OpenStackVolumePro
     @Mapping(from = Provider.class, to = OpenStackVolumeProvider.class)
     public static OpenStackVolumeProvider map(Provider<OpenStackVolumeProviderProperties> entity,
                                               OpenStackVolumeProvider template) {
-        OpenStackVolumeProvider model = template != null? template: new OpenStackVolumeProvider();
+        OpenStackVolumeProvider model = template != null ? template : new OpenStackVolumeProvider();
         if (entity.getId() != null) {
             model.setId(entity.getId().toString());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeTypeMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeTypeMapper.java
index dd276837a9c..c2b15d429d2 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeTypeMapper.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/openstack/OpenStackVolumeTypeMapper.java
@@ -13,7 +13,7 @@
 public class OpenStackVolumeTypeMapper {
     @Mapping(from = CinderVolumeType.class, to = OpenStackVolumeType.class)
     public static OpenStackVolumeType map(CinderVolumeType entity, OpenStackVolumeType template) {
-        OpenStackVolumeType model = template != null ? template: new OpenStackVolumeType();
+        OpenStackVolumeType model = template != null ? template : new OpenStackVolumeType();
         if (entity.getId() != null) {
             model.setId(entity.getId());
         }
@@ -28,7 +28,7 @@ public static OpenStackVolumeType map(CinderVolumeType entity, OpenStackVolumeTy
 
     @Mapping(from = OpenStackVolumeType.class, to = CinderVolumeType.class)
     public static CinderVolumeType map(OpenStackVolumeType model, CinderVolumeType template) {
-        CinderVolumeType entity = template != null ? template: new CinderVolumeType();
+        CinderVolumeType entity = template != null ? template : new CinderVolumeType();
         if (model.isSetId()) {
             entity.setId(model.getId());
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/CustomPropertiesParser.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/CustomPropertiesParser.java
index ccbc5213a5a..939563aff01 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/CustomPropertiesParser.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/CustomPropertiesParser.java
@@ -45,7 +45,7 @@ private static String[] getKeyValue(String str) {
         int index = str.indexOf("=");
         if (index != -1) {
             String key = str.substring(0, index);
-            String value = str.substring(index+1);
+            String value = str.substring(index + 1);
             keyValue.add(key);
             keyValue.add(value);
         }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/GuidUtils.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/GuidUtils.java
index 24e0f15987d..00c64d3ae7a 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/GuidUtils.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/GuidUtils.java
@@ -12,7 +12,7 @@ public class GuidUtils {
     public static Guid asGuid(String id) {
         try {
             return new Guid(id);
-        }catch (IllegalArgumentException e) {
+        } catch (IllegalArgumentException e) {
             throw new MalformedIdException(e);
         }
     }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/HexUtils.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/HexUtils.java
index cda46540c7c..df516f6a3ed 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/HexUtils.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/HexUtils.java
@@ -23,7 +23,7 @@ private static RuntimeException notValidHex(String hex, Exception exception) {
     public static String hex2string(String hex) {
         try {
             return new String(Hex.decodeHex(hex.toCharArray()), StandardCharsets.UTF_8);
-        } catch(DecoderException exception) {
+        } catch (DecoderException exception) {
             throw notValidHex(hex, exception);
         }
     }
diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/aaa/AuthzUtils.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/aaa/AuthzUtils.java
index 4b0c03e89a0..75462ce5540 100644
--- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/aaa/AuthzUtils.java
+++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/utils/aaa/AuthzUtils.java
@@ -16,8 +16,8 @@ public static String getAuthzNameFromEntityName(String entityName, Collection<St
 
     public static String getEntityNameWithoutAuthz(String entityName, String authzProviderName) {
         String result = entityName;
-       if (entityName != null && entityName.contains("@") && entityName.lastIndexOf('@') < entityName.length() -1) {
-           result = entityName.substring(entityName.lastIndexOf('@')+1).equals(authzProviderName) ? entityName.substring(0,  entityName.lastIndexOf('@')) : entityName;
+       if (entityName != null && entityName.contains("@") && entityName.lastIndexOf('@') < entityName.length() - 1) {
+           result = entityName.substring(entityName.lastIndexOf('@') + 1).equals(authzProviderName) ? entityName.substring(0, entityName.lastIndexOf('@')) : entityName;
        }
        return result;
     }
diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapperTest.java
index e1535fdf713..9d40e98b700 100644
--- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapperTest.java
+++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/FencingPolicyMapperTest.java
@@ -5,7 +5,7 @@
 
 import org.ovirt.engine.api.model.FencingPolicy;
 
-public class FencingPolicyMapperTest extends AbstractInvertibleMappingTest<FencingPolicy, org.ovirt.engine.core.common.businessentities.FencingPolicy, org.ovirt.engine.core.common.businessentities.FencingPolicy>{
+public class FencingPolicyMapperTest extends AbstractInvertibleMappingTest<FencingPolicy, org.ovirt.engine.core.common.businessentities.FencingPolicy, org.ovirt.engine.core.common.businessentities.FencingPolicy> {
 
     public FencingPolicyMapperTest() {
         super(FencingPolicy.class, org.ovirt.engine.core.common.businessentities.FencingPolicy.class, org.ovirt.engine.core.common.businessentities.FencingPolicy.class);
diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
index acd420d5e1c..5dd5032296c 100644
--- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
+++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/GlusterBrickDetailMapperTest.java
@@ -81,7 +81,7 @@ public void testWithNullChildObjects() {
 
     private List<BrickDetails> getBrickDetails(int size, int clientListSize, int memPoolSize) {
        ArrayList<BrickDetails> list = new ArrayList<>();
-       for(int i=0; i < size; i++) {
+       for (int i = 0; i < size; i++) {
            BrickDetails details = new BrickDetails();
            BrickProperties props = new BrickProperties();
            props.setBlockSize(14556);
@@ -102,7 +102,7 @@ private MemoryStatus getMemoryStatus(int listSize) {
         memStatus.getMallInfo().setArena(RandomUtils.instance().nextInt());
         memStatus.getMallInfo().setUordblks(RandomUtils.instance().nextInt());
         ArrayList<Mempool> memPoolsList = new ArrayList<>();
-        for(int i=0; i < listSize; i++) {
+        for (int i = 0; i < listSize; i++) {
             Mempool pool = new Mempool();
             pool.setAllocCount(RandomUtils.instance().nextInt());
             pool.setHotCount(0);
@@ -115,7 +115,7 @@ private MemoryStatus getMemoryStatus(int listSize) {
 
     private List<GlusterClientInfo> getClientList(int listSize) {
         ArrayList<GlusterClientInfo> list = new ArrayList<>();
-        for(int i=0; i < listSize; i++) {
+        for (int i = 0; i < listSize; i++) {
             GlusterClientInfo clientInfo = new GlusterClientInfo();
             clientInfo.setBytesRead(RandomUtils.instance().nextLong());
             clientInfo.setBytesWritten(RandomUtils.instance().nextLong());
diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
index 045b964cc42..02b25634ed0 100644
--- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
+++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/HostMapperTest.java
@@ -233,7 +233,7 @@ public void testDevicePassthroughMapping() {
     }
 
     @Test
-    public void testSshMapping(){
+    public void testSshMapping() {
         VDS vds = new VDS();
         vds.setId(Guid.Empty);
         String fingerprint = "SHA256:k8jEQ2H/h55LplHV5gZYYnySi9lwLWRCcAmdairOQNo";
diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/MappingTestHelper.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/MappingTestHelper.java
index c87f1d68638..ff6a77849f1 100644
--- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/MappingTestHelper.java
+++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/MappingTestHelper.java
@@ -67,7 +67,7 @@ public static Object populate(Object model, Class<?> clz, List<Class<?>> seen, i
                     random(method, model);
                 } else if (takesEnum(method)) {
                     //do nothing
-                } else if(takesBigDecimal(method)) {
+                } else if (takesBigDecimal(method)) {
                     populateBigDecimal(method, model);
                 } else if (takesXmlGregorianCalendar(method)) {
                     populateXmlGregorianCalendar(method, model);
diff --git a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
index 9b62b64940c..162246516a5 100644
--- a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
+++ b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
@@ -196,10 +196,10 @@ protected void verify(Vm model, Vm transform) {
     }
 
     private void assertHostsListMatch(List<Host> modelHostsList, List<Host> trnsfHostsList) {
-        for (Host host : modelHostsList){
+        for (Host host : modelHostsList) {
             boolean foundInTransformation = false;
-            for (Host otherHost : trnsfHostsList){
-                if (host.getId().equals(otherHost.getId())){
+            for (Host otherHost : trnsfHostsList) {
+                if (host.getId().equals(otherHost.getId())) {
                     foundInTransformation = true;
                     break;
                 }
@@ -237,7 +237,7 @@ public void testUpdateHostPinningPolicy() {
         final VmStatic mappedVm = VmMapper.map(vm, vmTemplate);
 
         final List<Guid> hosts = new ArrayList<>();
-        for (Host host : vm.getPlacementPolicy().getHosts().getHosts()){
+        for (Host host : vm.getPlacementPolicy().getHosts().getHosts()) {
             hosts.add(Guid.createGuidFromString(host.getId()));
         }
         assertEquals(new HashSet(hosts), new HashSet(mappedVm.getDedicatedVmForVdsList()));
@@ -312,10 +312,10 @@ public void testGuestOs() {
         assertNull(map.getGuestOperatingSystem().getVersion().getRevision());
         assertEquals("x86_64", map.getGuestOperatingSystem().getArchitecture());
         assertEquals("2.6.32-431.el6.x86_64", map.getGuestOperatingSystem().getKernel().getVersion().getFullVersion());
-        assertEquals(2, (long)map.getGuestOperatingSystem().getKernel().getVersion().getMajor());
-        assertEquals(6, (long)map.getGuestOperatingSystem().getKernel().getVersion().getMinor());
-        assertEquals(32, (long)map.getGuestOperatingSystem().getKernel().getVersion().getBuild());
-        assertEquals(431, (long)map.getGuestOperatingSystem().getKernel().getVersion().getRevision());
+        assertEquals(2, (long) map.getGuestOperatingSystem().getKernel().getVersion().getMajor());
+        assertEquals(6, (long) map.getGuestOperatingSystem().getKernel().getVersion().getMinor());
+        assertEquals(32, (long) map.getGuestOperatingSystem().getKernel().getVersion().getBuild());
+        assertEquals(431, (long) map.getGuestOperatingSystem().getKernel().getVersion().getRevision());
     }
 
     @Test
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
index acf7bc3133f..9062ceee792 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseAutoCompleter.java
@@ -17,7 +17,7 @@ public class BaseAutoCompleter implements IAutoCompleter {
     private static final List<String> daysOfWeek = new ArrayList<>();
 
     static {
-        for(DayOfWeek day: DayOfWeek.values()) {
+        for (DayOfWeek day: DayOfWeek.values()) {
             daysOfWeek.add(day.toString());
         }
     }
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java
index 5ffa9e93ecd..93ec70565e3 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/BaseConditionFieldAutoCompleter.java
@@ -151,7 +151,7 @@ public final String buildFreeTextConditionSql(String tableName,
             boolean caseSensitive) {
         String val;
         if (!StringHelper.isNullOrEmpty(value) && !"''".equals(value)) {
-            val= StringFormat.format(getI18NPrefix() + "'%%%1$s%%'", StringHelper.trim(value, '\''));
+            val = StringFormat.format(getI18NPrefix() + "'%%%1$s%%'", StringHelper.trim(value, '\''));
         } else {
             val = value;
         }
@@ -208,7 +208,7 @@ public final String buildFreeTextConditionSql(String tableName,
             new BigDecimal(value); // No assignment, we just want to create a new instance and to see if there's an
                                    // Exception
             return true;
-        } catch(NumberFormatException e) {
+        } catch (NumberFormatException e) {
             return false;
         }
     };
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NullableStringAutoCompleter.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NullableStringAutoCompleter.java
index f4b76f375f0..3956060f01d 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NullableStringAutoCompleter.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/NullableStringAutoCompleter.java
@@ -24,7 +24,7 @@ public String changeCaseDisplay(String text) {
 
     @Override
     public String convertFieldEnumValueToActualValue(String fieldValue) {
-        if("null".equalsIgnoreCase(fieldValue)) {
+        if ("null".equalsIgnoreCase(fieldValue)) {
             return null;
         } else {
             return fieldValue;
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PostgresSqlInjectionChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PostgresSqlInjectionChecker.java
index aedfd09d9d7..866a4653293 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PostgresSqlInjectionChecker.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/PostgresSqlInjectionChecker.java
@@ -6,7 +6,7 @@
 
 public class PostgresSqlInjectionChecker extends SqlInjectionChecker {
 
-    private static final Set<String> POSTGRES_SQL_COMMENT_INDICATORS =  new HashSet<>(Arrays.asList("--", "/*", "*/"));
+    private static final Set<String> POSTGRES_SQL_COMMENT_INDICATORS = new HashSet<>(Arrays.asList("--", "/*", "*/"));
     private static final Set<String> POSTGRES_SQL_FUNCTIONS = new HashSet<>(Arrays.asList(
             "ascii(", "chr(", "convert(", "cast(", "pg_sleep(", "length(", "substr(", "pg_read_file(", "replace(", " copy "));
 
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java
index db90330286e..d4155353b44 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SqlInjectionChecker.java
@@ -61,8 +61,8 @@ public boolean hasSqlInjection(String sql) {
      * in order to test for injection only on sql keywords and not on values.
      */
     private String removeAllStringValuesFromSql(String sql) {
-        boolean singleQuoteFound=false;
-        boolean doubleQuoteFound=false;
+        boolean singleQuoteFound = false;
+        boolean doubleQuoteFound = false;
         StringBuilder sb = new StringBuilder();
         // replace all occurrences of a quote/s inside a value with an empty string.
         final String[] QUOTES_INSIDE_VALUE_INDICATORES = {BACKSLASH_QUOTE, QUOTE_QUOTE, BACKSLASH_DOUBLE_QUOTE};
@@ -70,21 +70,21 @@ private String removeAllStringValuesFromSql(String sql) {
             sql = sql.replaceAll(s, "");
         }
         StringTokenizer st = new StringTokenizer(sql, DELIMITERS, true);
-        while(st.hasMoreTokens()) {
+        while (st.hasMoreTokens()) {
             String token = st.nextToken();
             if (token.equals(QUOTE_STR)) {
-                if(singleQuoteFound){
+                if (singleQuoteFound) {
                 singleQuoteFound = false; // closing '
                 continue;
-                } else if (!doubleQuoteFound){ // ignore single quote inside double quotes
+                } else if (!doubleQuoteFound) { // ignore single quote inside double quotes
                     singleQuoteFound = true; // opening '
                     continue;
                 }
             } else if (token.equals(DOUBLE_QUOTE_STR)) {
-                if(doubleQuoteFound){
+                if (doubleQuoteFound) {
                     doubleQuoteFound = false; // closing ""
                     continue;
-                } else if (!singleQuoteFound){ // ignore double quote inside single quotes
+                } else if (!singleQuoteFound) { // ignore double quote inside single quotes
                     doubleQuoteFound = true; // opening "
                     continue;
                 }
@@ -100,7 +100,7 @@ private String removeAllStringValuesFromSql(String sql) {
      * @param value the expression value
      * @return String the formatted expression.
      */
-    public static String  enforceEscapeCharacters(String value) {
+    public static String enforceEscapeCharacters(String value) {
         StringBuilder sb = new StringBuilder();
         if (value.indexOf(QUOTE) >= 0 || value.indexOf(BACKSLASH) >= 0 || value.indexOf(PERCENT) >= 0) {
             // the following is a Postgres limitation, since we are using LIKE/ILIKE and
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
index ba38d951757..689fd20ac3e 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxChecker.java
@@ -850,7 +850,7 @@ private String generateSqlFromSyntaxContainer(SyntaxContainer syntax, boolean is
             if (sortByElements != null) {
                 StringBuilder builder = new StringBuilder();
                 builder.append(" ORDER BY ");
-                for(SortByElement sortByElement: sortByElements) {
+                for (SortByElement sortByElement: sortByElements) {
                     builder.append(sortByElement.getExpression()).append(" ");
                     final boolean ascending = sortAscending == sortByElement.isAscending();
                     builder.append(ascending ? "ASC NULLS FIRST" : "DESC NULLS LAST").append(",");
@@ -1171,7 +1171,7 @@ private String buildCustomizedValue(SyntaxObject obj,
         if (conditionValueAC != null) {
             customizedValue = StringFormat.format("'%1$s'",
                     conditionValueAC.convertFieldEnumValueToActualValue(obj.getBody()));
-        } else if ("".equals(fieldName) /* search on all relevant fields */||
+        } else if ("".equals(fieldName) /* search on all relevant fields */ ||
                 String.class.equals(conditionFieldAC.getDbFieldType(fieldName))) {
             customizedValue = customizedValue.replace("*", conditionFieldAC.getWildcard(fieldName));
         }
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
index f0bc9b39b51..73612404784 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxCheckerFactory.java
@@ -17,7 +17,7 @@ public static ISyntaxChecker createUISyntaxChecker(String AuthenticationMethod)
 
     public static ISyntaxChecker createBackendSyntaxChecker(String AuthenticationMethod) {
         ConfigAuthenticationMethod = AuthenticationMethod;
-        if(backendSyntaxChecker == null) {
+        if (backendSyntaxChecker == null) {
             backendSyntaxChecker = new SyntaxChecker();
         }
         return backendSyntaxChecker;
diff --git a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java
index f20b21ec494..a68c950f418 100644
--- a/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java
+++ b/backend/manager/modules/searchbackend/src/main/java/org/ovirt/engine/core/searchbackend/SyntaxContainer.java
@@ -18,7 +18,7 @@ public class SyntaxContainer implements Iterable<SyntaxObject> {
     private final int[] errorPos = new int[2];
     private int privateMaxCount;
     private long searchFrom = 0;
-    private boolean caseSensitive=true;
+    private boolean caseSensitive = true;
 
     /**
      * Some of the searches needs to combine view table which holds tags.
diff --git a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/ProviderConditionFieldAutoCompleterTest.java b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/ProviderConditionFieldAutoCompleterTest.java
index b83f122f569..b06146f9c76 100644
--- a/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/ProviderConditionFieldAutoCompleterTest.java
+++ b/backend/manager/modules/searchbackend/src/test/java/org/ovirt/engine/core/searchbackend/ProviderConditionFieldAutoCompleterTest.java
@@ -8,7 +8,7 @@
 
 public class ProviderConditionFieldAutoCompleterTest {
 
-    private IConditionFieldAutoCompleter comp =  new ProviderConditionFieldAutoCompleter();
+    private IConditionFieldAutoCompleter comp = new ProviderConditionFieldAutoCompleter();
 
     @Test
     public void testExistentType() {
diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java
index b810914354a..448247d9b05 100644
--- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java
+++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java
@@ -42,7 +42,7 @@ private String getMyParameter(String name, HttpServletRequest request) {
 
         value = request.getParameter(name);
         if (value == null) {
-            value = (String)request.getAttribute(name);
+            value = (String) request.getAttribute(name);
         }
         if (value == null) {
             value = getInitParameter(name);
@@ -93,7 +93,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
                 response.setContentType(resource.getContentType(format));
                 out.print(resource.toString(format, alias));
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Cannot send public key resource '{}' format '{}': {}", resourceStr, formatStr, e.getMessage());
             log.debug("Exception", e);
             response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java
index 60e2203958e..77a4e2ce792 100644
--- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java
+++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java
@@ -92,7 +92,7 @@ protected void doRegister(
             throw new RuntimeException("Unique id was not provided");
         }
 
-        QueryReturnValue queryReturnValue  =  backend.runInternalQuery(
+        QueryReturnValue queryReturnValue = backend.runInternalQuery(
             QueryType.RegisterVds,
             new RegisterVdsParameters(
                 Guid.Empty,
@@ -192,7 +192,7 @@ protected void doV1(HttpServletRequest request, HttpServletResponse response) th
             } else {
                 throw new RuntimeException("Invalid command");
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Registration failed: {}", e.getMessage());
             log.debug("Exception", e);
             response.sendError(response.SC_BAD_REQUEST, e.getMessage());
@@ -206,10 +206,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         if (versionString != null) {
             try {
                 version = Integer.parseInt(versionString);
-            } catch(NumberFormatException ignore) {}
+            } catch (NumberFormatException ignore) { }
         }
 
-        switch(version) {
+        switch (version) {
             default:
                 String m = String.format("Invalid registration protocol version %s", version);
                 log.error(m);
diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoCallbackServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoCallbackServlet.java
index 122e3faa015..befad22ccce 100644
--- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoCallbackServlet.java
+++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoCallbackServlet.java
@@ -42,7 +42,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
         String event = request.getParameter("event");
         String accessToken = request.getParameter("token");
 
-        switch(event) {
+        switch (event) {
             case "auditLog":
                 handleAuditLog(request, response);
                 break;
diff --git a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoLogoutServlet.java b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoLogoutServlet.java
index e994ab9c8f2..4656c400ea8 100644
--- a/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoLogoutServlet.java
+++ b/backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/SsoLogoutServlet.java
@@ -28,7 +28,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
         String token = request.getParameter("token");
         String scope = request.getParameter("scope");
 
-        Map<String, Object> revokeResponse =  SsoOAuthServiceUtils.revoke(token, scope);
+        Map<String, Object> revokeResponse = SsoOAuthServiceUtils.revoke(token, scope);
         String error = (String) revokeResponse.get("error");
         if (StringUtils.isNotEmpty(error)) {
             log.error("Unable to logout user: {}", error);
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/CertificateSubjectHelper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/CertificateSubjectHelper.java
index b7a73189c10..ad8788dd52d 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/CertificateSubjectHelper.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/CertificateSubjectHelper.java
@@ -7,7 +7,7 @@
 public class CertificateSubjectHelper {
 
     public static String getCertificateSubject(String hostName) {
-        String certificateSubject=null;
+        String certificateSubject = null;
         if (hostName != null) {
             certificateSubject = "";
             String organization = getOrganizationName();
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java
index 84c44419f58..f943f4ff438 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/EngineLocalConfig.java
@@ -36,7 +36,7 @@ public static EngineLocalConfig getInstance(Map<String, String> values) {
             instance = new EngineLocalConfig(values);
         } else {
             if (instance == null) {
-                synchronized(EngineLocalConfig.class) {
+                synchronized (EngineLocalConfig.class) {
                     if (instance == null) {
                         instance = new EngineLocalConfig();
                     }
@@ -47,7 +47,7 @@ public static EngineLocalConfig getInstance(Map<String, String> values) {
     }
 
     public static void clearInstance() {
-        synchronized(EngineLocalConfig.class) {
+        synchronized (EngineLocalConfig.class) {
             instance = null;
         }
     }
@@ -156,7 +156,7 @@ public String getExternalProvidersTrustStorePassword() {
      * enabled or the engine HTTP port otherwise.
      */
     public int getExternalHttpPort () {
-        return isProxyEnabled()? getProxyHttpPort(): getHttpPort();
+        return isProxyEnabled() ? getProxyHttpPort() : getHttpPort();
     }
 
     /**
@@ -165,7 +165,7 @@ public int getExternalHttpPort () {
      * enabled or the engine HTTPS port otherwise.
      */
     public int getExternalHttpsPort () {
-        return isProxyEnabled()? getProxyHttpsPort(): getHttpsPort();
+        return isProxyEnabled() ? getProxyHttpsPort() : getHttpsPort();
     }
 
     /**
@@ -264,11 +264,11 @@ public String getPKIEngineStoreAlias() {
         return getProperty("ENGINE_PKI_ENGINE_STORE_ALIAS");
     }
 
-    public File getEngineUpMark(){
+    public File getEngineUpMark() {
         return getFile("ENGINE_UP_MARK");
     }
 
-    public String getEngineURI(){
+    public String getEngineURI() {
         return getProperty("ENGINE_URI");
     }
 
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
index 162e3d6e037..38f2dafc4d7 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ErrorTranslatorImpl.java
@@ -26,7 +26,7 @@ public final class ErrorTranslatorImpl implements ErrorTranslator {
 
     // Will assume these are property files, not ResxFiles.
     public ErrorTranslatorImpl(String... errorFileNames) {
-        log.info("Start initializing {}",  getClass().getSimpleName());
+        log.info("Start initializing {}", getClass().getSimpleName());
         messageSources = asList(errorFileNames);
         standardLocale = Locale.getDefault();
         standardMessages = retrieveByLocale(standardLocale);
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java
index 6c0aa9f1d52..f74bf81df0a 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocaleUtils.java
@@ -6,7 +6,7 @@
 
 public class LocaleUtils {
     //Do not allow instantiation of this class.
-    private LocaleUtils() {}
+    private LocaleUtils() { }
 
     /**
      * Returns the {@code Locale} based on the passed in string.
@@ -36,7 +36,7 @@ public static Locale getLocaleFromString(String localeString, boolean returnDefa
             } else {
                 result = null;
             }
-            if(result == null && returnDefaultLocale) {
+            if (result == null && returnDefaultLocale) {
                 result = LocaleFilter.DEFAULT_LOCALE;
             }
         } catch (IllegalArgumentException e) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java
index 4128b139173..43e87d625f4 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/MacAddressRangeUtils.java
@@ -150,7 +150,7 @@ public static boolean isRangeValid(String start, String end) {
     /**
      * convert mac pool ranges to long ranges for bll usage with union of any two overlapping ranges into one range
      */
-    public static  Collection<LongRange> macPoolToRanges(org.ovirt.engine.core.common.businessentities.MacPool macPool) {
+    public static Collection<LongRange> macPoolToRanges(org.ovirt.engine.core.common.businessentities.MacPool macPool) {
         final DisjointRanges disjointRanges = new DisjointRanges();
         for (MacRange macRange : macPool.getRanges()) {
             disjointRanges.addRange(macToLong(macRange.getMacFrom()),
@@ -162,7 +162,7 @@ public static  Collection<LongRange> macPoolToRanges(org.ovirt.engine.core.commo
     /**
      * convert mac pool ranges to long ranges for bll usage without union of overlapping ranges
      */
-    public static  Collection<LongRange> toRanges(org.ovirt.engine.core.common.businessentities.MacPool macPool) {
+    public static Collection<LongRange> toRanges(org.ovirt.engine.core.common.businessentities.MacPool macPool) {
         final List<LongRange> ranges = new ArrayList<>(macPool.getRanges().size());
         for (MacRange macRange : macPool.getRanges()) {
             ranges.add(new LongRange(macToLong(macRange.getMacFrom()), macToLong(macRange.getMacTo())));
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
index e6e39966d49..3cb44310cbb 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/PKIResources.java
@@ -82,12 +82,12 @@ private interface IFormatter {
                 '\n',
                 new Base64(
                     76,
-                    new byte[] { (byte)'\n' }
+                    new byte[] { (byte) '\n' }
                 ).encodeToString(
                     cert.getEncoded()
                 )
             );
-        } catch(CertificateEncodingException e) {
+        } catch (CertificateEncodingException e) {
             throw new RuntimeException(e);
         }
     };
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Pipeline.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Pipeline.java
index 749a1da37c2..5ce8a51d569 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Pipeline.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Pipeline.java
@@ -37,13 +37,13 @@ public Pipeline<T> append(Supplier<Iterator<T>> supplier) {
 
     @SuppressWarnings("unchecked")
     public Pipeline<T> filter(Predicate<T> predicate) {
-        iterator = IteratorUtils.filteredIterator(iterator, item -> predicate.test((T)item));
+        iterator = IteratorUtils.filteredIterator(iterator, item -> predicate.test((T) item));
         return this;
     }
 
     @SuppressWarnings("unchecked")
     public <U> Pipeline<U> map(Function<T, U> function) {
-        Iterator<U> result = IteratorUtils.transformedIterator(iterator, item -> function.apply((T)item));
+        Iterator<U> result = IteratorUtils.transformedIterator(iterator, item -> function.apply((T) item));
         return new Pipeline<>(result);
     }
 
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReflectionUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReflectionUtils.java
index 2b5e5e5b977..3609b77d73a 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReflectionUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReflectionUtils.java
@@ -109,7 +109,7 @@ public static Method getLoggableMethodWithNoArgs(Object o, String name) {
     public static Object invokeMethodWithNoArgs(Object o, Method method) {
         try {
             return method.invoke(o);
-        } catch(InvocationTargetException|IllegalAccessException e) {
+        } catch (InvocationTargetException | IllegalAccessException e) {
             return null;
         }
     }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReplacementUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReplacementUtils.java
index 49d57454ff1..c1b2bb1e3e5 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReplacementUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ReplacementUtils.java
@@ -15,7 +15,7 @@ public class ReplacementUtils {
     protected static final String DEFAULT_SEPARATOR = "," + System.lineSeparator();
     private static final String COUNTER_SUFFIX = "_COUNTER";
     private static final String LIST_SUFFIX = "_LIST";
-    private static final String ENTITY_SUFFIX  = "_ENTITY";
+    private static final String ENTITY_SUFFIX = "_ENTITY";
 
     private ReplacementUtils() {
     }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/VmInitUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/VmInitUtils.java
index 40cd07dc377..293059248ab 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/VmInitUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/VmInitUtils.java
@@ -10,7 +10,7 @@
 public class VmInitUtils {
     @SuppressWarnings("unchecked")
     public static List<VmInitNetwork> jsonNetworksToList(String jsonNetworks) {
-        return (List<VmInitNetwork>)new JsonObjectDeserializer().deserializeOrCreateNew(jsonNetworks, ArrayList.class);
+        return (List<VmInitNetwork>) new JsonObjectDeserializer().deserializeOrCreateNew(jsonNetworks, ArrayList.class);
     }
 
     public static String networkListToJson(List<VmInitNetwork> networkList) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/InMemoryTar.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/InMemoryTar.java
index ecd21b4868d..e57aeab1c43 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/InMemoryTar.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/archivers/tar/InMemoryTar.java
@@ -5,7 +5,7 @@
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
 
-public class InMemoryTar implements AutoCloseable{
+public class InMemoryTar implements AutoCloseable {
     private TarArchiveOutputStream tarArchiveOutputStream;
 
     public InMemoryTar(OutputStream outputStream) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
index df84dd58e36..e5872776596 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
@@ -67,7 +67,7 @@ private <O> O clone(O originalKey) {
             objectOut = new ObjectOutputStream(bufferOut);
             objectOut.writeObject(originalKey);
             buffer = bufferOut.toByteArray();
-        } catch(IOException exception) {
+        } catch (IOException exception) {
             throw new RuntimeException(exception);
         } finally {
             if (objectOut != null) {
@@ -98,7 +98,7 @@ protected Class<?> resolveClass(ObjectStreamClass description) throws IOExceptio
                 }
             };
             return (O) objectIn.readObject();
-        } catch(IOException | ClassNotFoundException exception) {
+        } catch (IOException | ClassNotFoundException exception) {
             throw new RuntimeException(exception);
         } finally {
             if (objectIn != null) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
index b899efa9717..4cb5e4ef05a 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/crypt/EngineEncryptionUtils.java
@@ -92,7 +92,7 @@ public static KeyStore getTrustStore() {
      */
     public static KeyStore.PrivateKeyEntry getPrivateKeyEntry() {
         try {
-            KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)getKeyStore().getEntry(
+            KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry) getKeyStore().getEntry(
                 keystoreAlias,
                 keystorePassword
             );
@@ -100,7 +100,7 @@ public static KeyStore.PrivateKeyEntry getPrivateKeyEntry() {
                 throw new RuntimeException("Alias was not found");
             }
             return entry;
-        } catch(Exception e) {
+        } catch (Exception e) {
             throw new RuntimeException(
                 String.format(
                     "Failed to locate key '%1$s'",
@@ -239,7 +239,7 @@ public static boolean haveKey() {
         try {
             getPrivateKeyEntry();
             return true;
-        } catch(Exception e) {
+        } catch (Exception e) {
             return false;
         }
     }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java
index b41ff2fd8fa..cff2ab52bf5 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/db/StandaloneDataSource.java
@@ -49,7 +49,7 @@ public StandaloneDataSource() throws SQLException {
         // Load the driver:
         try {
             Class.forName(driver);
-        } catch(ClassNotFoundException exception) {
+        } catch (ClassNotFoundException exception) {
             throw new SQLException("Failed to load database driver \"" + driver + "\".", exception);
         }
 
@@ -90,7 +90,7 @@ private void closeConnection () {
             if (connection != null) {
                 connection.close();
             }
-        } catch(SQLException exception) {
+        } catch (SQLException exception) {
             log.error("Can't close connection.", exception);
         }
         connection = null;
@@ -119,7 +119,7 @@ public Connection getConnection () throws SQLException {
                 openConnection();
             }
             checkConnection();
-        } catch(SQLException exception) {
+        } catch (SQLException exception) {
             log.warn("Can't check the connection, will close it and open a new one.", exception);
             closeConnection();
             openConnection();
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/IsDefaultRouteOnInterfacePredicate.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/IsDefaultRouteOnInterfacePredicate.java
index afe2fdb5c08..380161f9bf0 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/IsDefaultRouteOnInterfacePredicate.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/network/predicate/IsDefaultRouteOnInterfacePredicate.java
@@ -24,6 +24,6 @@ public boolean test(VdsNetworkInterface iface) {
     }
 
     private boolean hasIpv6Gateway(VdsNetworkInterface iface) {
-        return iface!= null && !ipUnspecifiedPredicate().test(iface.getIpv6Gateway());
+        return iface != null && !ipUnspecifiedPredicate().test(iface.getIpv6Gateway());
     }
 }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
index 84fee4f6284..9a5b984555d 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/osinfo/OsInfoPreferencesLoader.java
@@ -64,7 +64,7 @@ public MapBackedPreferences getPreferences() {
     }
 
     private void loadFile(Path path) {
-        try(BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
+        try (BufferedReader reader = Files.newBufferedReader(path, StandardCharsets.UTF_8)) {
             properties = new Properties(properties);
             properties.load(reader);
         } catch (IOException e) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/HostedEngineOvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/HostedEngineOvfWriter.java
index 54559999833..83e570baed1 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/HostedEngineOvfWriter.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/HostedEngineOvfWriter.java
@@ -58,7 +58,7 @@ protected void writeCustomCpuName() {
     @Override
     protected void writeGeneralData() {
         super.writeGeneralData();
-        if (engineXml != null){
+        if (engineXml != null) {
             _writer.writeElement(ENGINE_XML, engineXml);
         }
     }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java
index e1df7436a4c..fffd6ec4d65 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtReader.java
@@ -359,7 +359,7 @@ protected void readDiskImageItem(XmlNode node) {
 
     @Override
     protected String adjustHardwareResourceType(String resourceType) {
-        switch(resourceType) {
+        switch (resourceType) {
         case OvfHardware.OVIRT_Monitor:
             return OvfHardware.Monitor;
         case OvfHardware.OVIRT_Graphics:
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtWriter.java
index a48726804ed..efba87f9a2a 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtWriter.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfOvirtWriter.java
@@ -240,7 +240,7 @@ private void writeVmExternalData() {
 
     @Override
     protected String adjustHardwareResourceType(String resourceType) {
-        switch(resourceType) {
+        switch (resourceType) {
         case OvfHardware.Graphics:
             return OvfHardware.OVIRT_Graphics;
         case OvfHardware.Monitor:
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
index 84b031c75df..025e68c532d 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReader.java
@@ -846,7 +846,7 @@ private int getVmInterfaceType(XmlNode resourceSubTypeNode) {
         if (StringUtils.isNotEmpty(resourceSubType)) {
             try {
                 return Integer.parseInt(resourceSubType);
-            } catch(NumberFormatException ex) {
+            } catch (NumberFormatException ex) {
                 for (VmInterfaceType vmInterfaceType : VmInterfaceType.values()) {
                     if (vmInterfaceType.getInternalName().equalsIgnoreCase(resourceSubType)) {
                         return vmInterfaceType.getValue();
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReaderWriterUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReaderWriterUtils.java
index 165210147d6..c350032d621 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReaderWriterUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfReaderWriterUtils.java
@@ -13,7 +13,7 @@ static boolean isSpecialDevice(String device, VmDeviceGeneralType type, boolean
             return true;
         }
 
-        switch(type) {
+        switch (type) {
         case MDEV:
         case SOUND:
             return true;
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
index 4ff464a5671..9bef8760e9d 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfWriter.java
@@ -113,7 +113,7 @@ protected void writeFileForLunDisk(LunDisk lun) {
         // do nothing
     }
 
-    private String escapeNewLines(String value){
+    private String escapeNewLines(String value) {
         return value.replaceAll("\n", "&#10;");
     }
 
@@ -247,7 +247,7 @@ protected void writeGeneralData() {
             _writer.writeElement(CUSTOM_COMPATIBILITY_VERSION, String.valueOf(vmBase.getCustomCompatibilityVersion()));
         }
 
-        _writer.writeElement(CLUSTER_COMPATIBILITY_VERSION, String.valueOf(version));// cluster version the VM/Snapshot
+        _writer.writeElement(CLUSTER_COMPATIBILITY_VERSION, String.valueOf(version)); // cluster version the VM/Snapshot
                                                                                      // originates from
         _writer.writeElement(VM_TYPE, String.valueOf(vmBase.getVmType().getValue()));
         if (vmBase.getResumeBehavior() != null) {
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/FenceConfigHelper.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/FenceConfigHelper.java
index 8b68cb495a3..03ef04653b2 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/FenceConfigHelper.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/FenceConfigHelper.java
@@ -18,7 +18,7 @@ public class FenceConfigHelper {
     private static Map<String, String> keyValidatorExampleMap;
     private static Map<String, String> keySeparatorMap;
     private static Logger log = LoggerFactory.getLogger(FenceConfigHelper.class);
-    private static boolean initialized=false;
+    private static boolean initialized = false;
     private static final String FenceAgentMappingExpr = "((\\w)+[=](\\w)+[,]{0,1})+";
     private static final String GeneralAgentOptionsExpr = "([\\w]+[:]([\\w]*[=][\\w]*[,]{0,1}[;]{0,1}){0,3}[;]{0,1})+";
     private static final String CustomVdsFenceTypeExpr = "((\\w)+[,]{0,1})+";
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
index 04c475c3264..7d3ea25d471 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/pm/VdsFenceOptions.java
@@ -292,7 +292,7 @@ public static String getRealAgent(String agent) {
      * @return String the options after adding default agent parameters
      */
     public static String getDefaultAgentOptions(String agent, String fenceOptions, ArchitectureType architectureType) {
-        String agentDefaultParams =  (architectureType != null && architectureType == ArchitectureType.ppc64)
+        String agentDefaultParams = (architectureType != null && architectureType == ArchitectureType.ppc64)
                 ?
                 FenceConfigHelper.getFenceConfigurationValue(ConfigValues.FenceAgentDefaultParamsForPPC.name(), ConfigCommon.defaultConfigurationVersion)
                 :
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonActionParametersBaseMixIn.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonActionParametersBaseMixIn.java
index 6fc60d25650..0cc2e57502f 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonActionParametersBaseMixIn.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonActionParametersBaseMixIn.java
@@ -23,11 +23,11 @@ public abstract class JsonActionParametersBaseMixIn extends ActionParametersBase
     @Override
     public abstract ArrayList<ActionParametersBase> getImagesParameters();
 
-    @JsonDeserialize(using=ActionTypeDeserializer.class)
+    @JsonDeserialize(using = ActionTypeDeserializer.class)
     @Override
     public abstract void setParentCommand(ActionType value);
 
-    @JsonDeserialize (using=ActionTypeDeserializer.class)
+    @JsonDeserialize (using = ActionTypeDeserializer.class)
     @Override
     public abstract void setCommandType(ActionType commandType);
 }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonClusterMixIn.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonClusterMixIn.java
index 83ca69a7faa..b411702337b 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonClusterMixIn.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonClusterMixIn.java
@@ -14,5 +14,5 @@ public abstract class JsonClusterMixIn extends Cluster {
 
     @JsonIgnore
     @Override
-    public abstract  Set<VmRngDevice.Source> getRequiredRngSources();
+    public abstract Set<VmRngDevice.Source> getRequiredRngSources();
 }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java
index 56de8d5a729..2ec14363276 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java
@@ -142,7 +142,7 @@ protected void service(final HttpServletRequest request, final HttpServletRespon
                 }
             }
             dispatcher.forward(request, response);
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.error("Forward failed", e);
             response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
                     e.getMessage());
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java
index 4e22416207e..3d45bf7c460 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java
@@ -114,7 +114,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             if (localhost.charAt(0) == '[') {
                 int n = localhost.indexOf("]");
                 if (n != -1) {
-                    localhost = localhost.substring(0, n+1);
+                    localhost = localhost.substring(0, n + 1);
                 }
             } else {
                 int n = localhost.indexOf(":");
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java
index f5a742d8c72..50aaa15b0f0 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java
@@ -25,7 +25,7 @@ public class ServletUtils {
         // Load the system wide MIME types map:
         try {
             mimeMap = new MimetypesFileTypeMap(System.getProperty("org.ovirt.engine.mime.types", "/etc/mime.types"));
-        } catch(IOException exception) {
+        } catch (IOException exception) {
             log.error("Can't load system mime types file.", exception);
             mimeMap = new MimetypesFileTypeMap();
         }
@@ -144,7 +144,7 @@ public static void writeFileToStream(final OutputStream out, final File file) th
             while ((count = in.read(buffer)) != -1) {
                 out.write(buffer, 0, count);
             }
-        } catch(IOException exception) {
+        } catch (IOException exception) {
             final String message = "Error sending file '" + file.getAbsolutePath() + "'.";
             log.error(message, exception);
             throw new IOException(message, exception);
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java
index 20cd479e89b..4ba1f943757 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPoolUtil.java
@@ -141,7 +141,7 @@ private static <T> List<Callable<T>> buildSessionTasks(Collection<? extends Call
      * @param tasks collection of tasks (callable objects) to submit
      */
     public static <V> ExecutorCompletionService<V> createCompletionService(Iterable<Callable<V>> tasks) {
-        ExecutorCompletionService<V> ecs =  createCompletionService();
+        ExecutorCompletionService<V> ecs = createCompletionService();
         submitTasks(ecs, tasks);
         return ecs;
     }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPools.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPools.java
index 09d11e56bd9..88db97029fc 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPools.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/threadpool/ThreadPools.java
@@ -16,7 +16,7 @@ enum ThreadPoolType {
         CoCo,
         HostUpdatesChecker,
         EngineScheduledThreadPool,
-        EngineThreadMonitoringThreadPool}
+        EngineThreadMonitoringThreadPool }
 
     ThreadPoolType value();
 }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionRollbackListener.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionRollbackListener.java
index 177585527c3..c0b640d20bf 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionRollbackListener.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionRollbackListener.java
@@ -3,5 +3,5 @@
 @FunctionalInterface
 public interface TransactionRollbackListener extends TransactionCompletionListener {
     @Override
-    default void onSuccess() {};
+    default void onSuccess() { };
 }
diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSuccessListener.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSuccessListener.java
index 3474f29f18e..4b00f875f3d 100644
--- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSuccessListener.java
+++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSuccessListener.java
@@ -1,7 +1,7 @@
 package org.ovirt.engine.core.utils.transaction;
 
 @FunctionalInterface
-public interface TransactionSuccessListener extends TransactionCompletionListener{
+public interface TransactionSuccessListener extends TransactionCompletionListener {
     @Override
-    default void onRollback() {};
+    default void onRollback() { };
 }
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/AbstractPropertiesTestBase.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/AbstractPropertiesTestBase.java
index f1ece07ba29..5645955a4bc 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/AbstractPropertiesTestBase.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/AbstractPropertiesTestBase.java
@@ -23,7 +23,7 @@ protected AbstractPropertiesTestBase(Class<E> enumClass, String relativePath) {
 
     @BeforeEach
     public void loadFileFromPath() {
-        String baseDir =  System.getProperty("basedir");
+        String baseDir = System.getProperty("basedir");
         assumeTrue(baseDir != null);
 
         file = new File(baseDir, relativePath);
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigExtension.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigExtension.java
index 6ee67499fe7..52ec632d6df 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigExtension.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/MockConfigExtension.java
@@ -41,7 +41,7 @@ public void beforeEach(ExtensionContext extensionContext) {
         origConfUtils = Config.getConfigUtils();
         Config.setConfigUtils(mockConfigUtils);
 
-        String configDescriptorMethodName =  findAnnotation(extensionContext.getElement(), MockedConfig.class)
+        String configDescriptorMethodName = findAnnotation(extensionContext.getElement(), MockedConfig.class)
                 .map(MockedConfig::value)
                 .orElse(MockedConfig.DEFAULT_METHOD_NAME);
 
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
index 97bb0855f29..742664f8b15 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NameForVmInPoolGeneratorTest.java
@@ -9,7 +9,7 @@ public class NameForVmInPoolGeneratorTest {
     @Test
     public void validateGenerateVmNameStartsWithMask() {
         NameForVmInPoolGenerator generator = createNameForVmInPoolGenerator("???mypool");
-        for (int i=1; i<17; ++i) {
+        for (int i = 1; i < 17; ++i) {
             generator.generateVmName();
         }
         assertEquals("017mypool", generator.generateVmName());
@@ -24,7 +24,7 @@ public void validateGenerateVmNameMaskInside() {
     @Test
     public void validateGenerateVmNameEndsWithMask() {
         NameForVmInPoolGenerator generator = createNameForVmInPoolGenerator("mypool???");
-        for (int i=1; i<101; ++i) {
+        for (int i = 1; i < 101; ++i) {
             generator.generateVmName();
         }
         assertEquals("mypool101", generator.generateVmName());
@@ -39,7 +39,7 @@ public void validateGenerateVmNameWithoutMask1() {
     @Test
     public void validateGenerateVmNameWithoutMask2() {
         NameForVmInPoolGenerator generator = createNameForVmInPoolGenerator("mypool");
-        for (int i=1; i<17; ++i) {
+        for (int i = 1; i < 17; ++i) {
             generator.generateVmName();
         }
         assertEquals("mypool-17", generator.generateVmName());
@@ -48,7 +48,7 @@ public void validateGenerateVmNameWithoutMask2() {
     @Test
     public void validateGenerateVmNameWithoutMask3() {
         NameForVmInPoolGenerator generator = createNameForVmInPoolGenerator("mypool");
-        for (int i=1; i<101; ++i) {
+        for (int i = 1; i < 101; ++i) {
             generator.generateVmName();
         }
         assertEquals("mypool-101", generator.generateVmName());
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkInSyncWithVdsNetworkInterfaceTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkInSyncWithVdsNetworkInterfaceTest.java
index 659c93e8354..a7998ec0e4c 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkInSyncWithVdsNetworkInterfaceTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkInSyncWithVdsNetworkInterfaceTest.java
@@ -468,7 +468,7 @@ public void testIsNetworkInSyncWhenIpv4BootProtocolNotStaticNetmaskDifferent() {
     }
 
     @Test
-    public void testIsNetworkInSyncWhenIpv4GatewayEqual(){
+    public void testIsNetworkInSyncWhenIpv4GatewayEqual() {
         initIpv4ConfigurationBootProtocolGateway(Ipv4BootProtocol.STATIC_IP, true);
         assertThat(createTestedInstance().isNetworkInSync(), is(true));
     }
@@ -482,7 +482,7 @@ public void testIsNetworkInSyncWhenIpv4GatewayBothNull() {
     }
 
     @Test
-    public void testIsNetworkInSyncWhenIpv4GatewayDifferent(){
+    public void testIsNetworkInSyncWhenIpv4GatewayDifferent() {
         initIpv4ConfigurationBootProtocolGateway(Ipv4BootProtocol.STATIC_IP, false);
         assertThat(createTestedInstance().isNetworkInSync(), is(false));
     }
@@ -599,7 +599,7 @@ public void testIsNetworkInSyncWhenIpv6BootProtocolNotStaticNetmaskDifferent() {
     }
 
     @Test
-    public void testIsNetworkInSyncWhenIpv6GatewayEqual(){
+    public void testIsNetworkInSyncWhenIpv6GatewayEqual() {
         initIpv6ConfigurationBootProtocolGateway(Ipv6BootProtocol.STATIC_IP, true);
         assertThat(createTestedInstance(true, sampleDnsResolverConfiguration).isNetworkInSync(), is(true));
     }
@@ -621,7 +621,7 @@ public void testIsNetworkInSyncWhenIpv6GatewayBothNull() {
      * null value on the vds interface.
      */
     @Test
-    public void testIsNetworkInSyncWhenIpv6GatewayNone(){
+    public void testIsNetworkInSyncWhenIpv6GatewayNone() {
         List<Object[]> tests = Arrays.asList(
                 // array of [network attachment address, interface address, expected sync]
                 new Object[] { null, "::" , Boolean.TRUE},
@@ -640,7 +640,7 @@ public void testIsNetworkInSyncWhenIpv6GatewayNone(){
      * User configuration of a 0.0.0.0 gateway is saved on the attachment as is.
      */
     @Test
-    public void testIsNetworkInSyncWhenIpv4GatewayNone(){
+    public void testIsNetworkInSyncWhenIpv4GatewayNone() {
         List<Object[]> tests = Arrays.asList(
                 // array of [network attachment address, interface address, expected sync]
                 new Object[] { null, "0.0.0.0" , Boolean.FALSE},
@@ -701,7 +701,7 @@ static Stream<String[]> testIsNetworkInSyncForIpv6GatewayDifferent() {
 
     @ParameterizedTest
     @MethodSource
-    void testIsNetworkInSyncForIpv6GatewayDifferent(String address1, String address2){
+    void testIsNetworkInSyncForIpv6GatewayDifferent(String address1, String address2) {
         initIpv6ConfigurationStaticBootProtocol(Ipv6BootProtocol.STATIC_IP);
         ipv6Address.setGateway(address1);
         iface.setIpv6Gateway(address2);
@@ -737,7 +737,7 @@ public void testIsNetworkInSyncWhenIpv6StaticBootProtocolPrefixDifferent() throw
     }
 
     @Test
-    public void testIsNetworkInSyncWhenIpv6GatewayDifferent(){
+    public void testIsNetworkInSyncWhenIpv6GatewayDifferent() {
         initIpv6ConfigurationBootProtocolGateway(Ipv6BootProtocol.STATIC_IP, false);
         assertThat(createTestedInstance().isNetworkInSync(), is(false));
     }
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
index 8ad583cae9b..e2234d8541e 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/NetworkUtilsTest.java
@@ -125,14 +125,14 @@ public void getIpAddressTest() {
 
     @Test
     public void testStripIpv6ZoneId() {
-        assertEquals("fe80::1",     NetworkUtils.stripIpv6ZoneIndex("fe80::1"));
-        assertEquals("fe80::1/64",  NetworkUtils.stripIpv6ZoneIndex("fe80::1/64"));
-        assertEquals("fe80::1",     NetworkUtils.stripIpv6ZoneIndex("fe80::1%"));
-        assertEquals("fe80::1",     NetworkUtils.stripIpv6ZoneIndex("fe80::1%1"));
-        assertEquals("fe80::1",     NetworkUtils.stripIpv6ZoneIndex("fe80::1%eth0"));
-        assertEquals("fe80::1",     NetworkUtils.stripIpv6ZoneIndex("fe80::1%eth0/64"));
-        assertEquals("",            NetworkUtils.stripIpv6ZoneIndex("%"));
-        assertEquals("",            NetworkUtils.stripIpv6ZoneIndex(""));
+        assertEquals("fe80::1", NetworkUtils.stripIpv6ZoneIndex("fe80::1"));
+        assertEquals("fe80::1/64", NetworkUtils.stripIpv6ZoneIndex("fe80::1/64"));
+        assertEquals("fe80::1", NetworkUtils.stripIpv6ZoneIndex("fe80::1%"));
+        assertEquals("fe80::1", NetworkUtils.stripIpv6ZoneIndex("fe80::1%1"));
+        assertEquals("fe80::1", NetworkUtils.stripIpv6ZoneIndex("fe80::1%eth0"));
+        assertEquals("fe80::1", NetworkUtils.stripIpv6ZoneIndex("fe80::1%eth0/64"));
+        assertEquals("", NetworkUtils.stripIpv6ZoneIndex("%"));
+        assertEquals("", NetworkUtils.stripIpv6ZoneIndex(""));
         assertNull(NetworkUtils.stripIpv6ZoneIndex(null));
     }
 
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/RandomUtils.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/RandomUtils.java
index 52c198b401a..dc5d10f0411 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/RandomUtils.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/RandomUtils.java
@@ -459,7 +459,7 @@ public String nextMacAddress() {
     /* -- Utility methods -- */
 
     private static String fillRange(char first, char last) {
-        StringBuilder sb = new StringBuilder((int)last - (int)first + 1);
+        StringBuilder sb = new StringBuilder((int) last - (int) first + 1);
         for (char c = first; c <= last; ++ c) {
             sb.append(c);
         }
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
index b6c27081cde..d6875a649f4 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReapedMapTest.java
@@ -162,7 +162,7 @@ private void assertExpected(Integer ... values) {
 
     private static class NumberMapper {
         public String getKey(Integer i) {
-            return i <= NUMBERS.length ? NUMBERS[i-1] : null;
+            return i <= NUMBERS.length ? NUMBERS[i - 1] : null;
         }
     }
 }
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReplacementUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReplacementUtilsTest.java
index 2b6a6965b06..d8ceeabb2c1 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReplacementUtilsTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ReplacementUtilsTest.java
@@ -74,7 +74,7 @@ public void containLowerThanDefaultNumberOfElements() {
         // Less than the default number of elements to show.
         int numOfElementsToShow = 3;
         Collection<String> replacements = ReplacementUtils.replaceWith(PROPERTY_NAME, items, separator , numOfElementsToShow);
-        assertTrue(validateReplacementElementCount(replacements, separator,  numOfElementsToShow));
+        assertTrue(validateReplacementElementCount(replacements, separator, numOfElementsToShow));
     }
 
     @Test
@@ -117,7 +117,7 @@ public void containBiggerThanDefaultNumberOfElements() {
         // More than the default number of elements to show.
         int numOfElementsToShow = 8;
         Collection<String> replacements = ReplacementUtils.replaceWith(PROPERTY_NAME, items, separator , numOfElementsToShow);
-        assertTrue(validateReplacementElementCount(replacements, separator,  numOfElementsToShow));
+        assertTrue(validateReplacementElementCount(replacements, separator, numOfElementsToShow));
     }
 
     private boolean validateReplacementElementCount(Collection<String> replacements, String separator, int numOfElementsToShow) {
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonImmutableSerializeDeserializeTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonImmutableSerializeDeserializeTest.java
index fd92306e255..40cfce1ea65 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonImmutableSerializeDeserializeTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/serialization/json/JsonImmutableSerializeDeserializeTest.java
@@ -139,7 +139,7 @@ public void serializeCollections() {
 
         String jsonFromDeserializedParams = serializer.serialize(deserializedParams);
         final TestCollectionsParams deserialized2run = new JsonObjectDeserializer().deserialize(jsonFromDeserializedParams, TestCollectionsParams.class);
-        String normalizedJsonFromSerialization  = serializer.serialize(deserialized2run);
+        String normalizedJsonFromSerialization = serializer.serialize(deserialized2run);
 
         assertEquals(jsonFromDeserializedParams, normalizedJsonFromSerialization);
     }
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/LocaleFilterTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/LocaleFilterTest.java
index dc2f74d7f82..7df684e4cc8 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/LocaleFilterTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/LocaleFilterTest.java
@@ -128,7 +128,7 @@ public void testDestroy() {
      */
     private Cookie[] createCookies(Locale... locales) {
         List<Cookie> cookieList = new ArrayList<>();
-        for(Locale locale: locales) {
+        for (Locale locale: locales) {
             cookieList.add(new Cookie(LocaleFilter.LOCALE, locale.toString()));
         }
         return cookieList.toArray(new Cookie[cookieList.size()]);
diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java
index c3eb31a5db4..2b42d0c50e4 100644
--- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java
+++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java
@@ -69,7 +69,7 @@ public void testWriteFileToStream() throws IOException {
         assertTrue(ServletUtils.canReadFile(file), "We should be able to read this file.");
         ByteArrayOutputStream out = new ByteArrayOutputStream(4096);
         ServletUtils.writeFileToStream(out, file);
-        assertEquals((int)hostSize, out.size(), "The bytes in the buffer have to match the length of the file");
+        assertEquals((int) hostSize, out.size(), "The bytes in the buffer have to match the length of the file");
     }
 
     /**
@@ -83,7 +83,7 @@ public void testWriteFileToStream_0SizeFile() throws Exception {
         assertEquals(0L, zeroSize, "The file size should be 0");
         ByteArrayOutputStream out = new ByteArrayOutputStream(4096);
         ServletUtils.writeFileToStream(out, file);
-        assertEquals((int)zeroSize, out.size(), "The bytes in the buffer have to match the length of the file");
+        assertEquals((int) zeroSize, out.size(), "The bytes in the buffer have to match the length of the file");
     }
 
     /**
@@ -104,7 +104,7 @@ public void testWriteFileToStream_IOException() {
     public void testIsSane() {
         assertTrue(ServletUtils.isSane("/etc"), "/etc should be sane");
         StringBuilder builder = new StringBuilder();
-        for(int i = 0; i < 100; i++) {
+        for (int i = 0; i < 100; i++) {
             builder.append("/abcdefghijkl");
         }
         assertFalse(ServletUtils.isSane(builder.toString()), "longPath is not sane");
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/Argument.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/Argument.java
index c1d28e2bf54..b934044a50e 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/Argument.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/Argument.java
@@ -22,7 +22,7 @@ enum Type {
         NO_ARGUMENT;
 
         public static Type valueOfIgnoreCase(String name) {
-            if(name != null) {
+            if (name != null) {
                 return valueOf(name.toUpperCase());
             }
             throw new IllegalArgumentException("Invalid value null");
@@ -111,7 +111,7 @@ public void setValue(String value) {
 
     @Override
     public boolean equals(Object obj) {
-        if(obj == this) {
+        if (obj == this) {
             return true;
         }
         if (!(obj instanceof Argument)) {
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/ArgumentsParser.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/ArgumentsParser.java
index 8adcead016c..47d62367f19 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/ArgumentsParser.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/ArgumentsParser.java
@@ -227,13 +227,13 @@ public boolean parse(List<String> args) {
         parsedArgs = new HashMap<>();
         errors = new ArrayList<>();
 
-        while(!args.isEmpty()) {
+        while (!args.isEmpty()) {
             String arg = args.get(0);
-            if(!arg.startsWith(LONG_PREFIX)) {
+            if (!arg.startsWith(LONG_PREFIX)) {
                 break;
             }
             arg = args.remove(0);
-            if(arg.equals(LONG_PREFIX)) {
+            if (arg.equals(LONG_PREFIX)) {
                 break;
             }
 
@@ -242,7 +242,7 @@ public boolean parse(List<String> args) {
             String value = argVal[1];
 
             Argument argument = arguments.get(key);
-            if(argument == null) {
+            if (argument == null) {
                 errors.add(
                     new IllegalArgumentException(String.format("Invalid argument '%1$s'", arg))
                 );
@@ -254,7 +254,7 @@ public boolean parse(List<String> args) {
                         argument.getType() == Argument.Type.REQUIRED_ARGUMENT
                     )
                 ) {
-                    if(args.size() > 0) {
+                    if (args.size() > 0) {
                         value = args.get(0);
                         if (value.startsWith(LONG_PREFIX)) {
                             value = null;
@@ -294,7 +294,7 @@ public boolean parse(List<String> args) {
 
         List<String> mandatoryCopy = new ArrayList<>(mandatory);
         mandatoryCopy.removeAll(parsedArgs.keySet());
-        if(!mandatoryCopy.isEmpty()) {
+        if (!mandatoryCopy.isEmpty()) {
             errors.add(
                 new IllegalArgumentException(
                     String.format("Argument(s) '%1$s' required", StringUtils.join(mandatoryCopy, ", "))
@@ -325,7 +325,7 @@ public boolean parse(List<String> args) {
     public String getUsage() {
         StringBuilder help = new StringBuilder(String.format("Options:%n"));
 
-        for(String arg : getPrefixArguments()) {
+        for (String arg : getPrefixArguments()) {
             Argument argument = this.arguments.get(arg);
             help.append(
                     String.format(
@@ -379,7 +379,7 @@ public Map<String, String> getSubstitutions() {
      * @param argMap map of converted command line arguments
      */
     private void fillDefaults(Map<String, Object> argMap) {
-        for(Argument arg : arguments.values()) {
+        for (Argument arg : arguments.values()) {
             if (!argMap.containsKey(arg.getName()) && arg.getDefaultValue() != null) {
                 putValue(
                     argMap,
@@ -404,7 +404,7 @@ private void putValue(Map<String, Object> argMap, Argument arg, Object value) {
         if (!arg.isMultivalue()) {
             argMap.put(arg.getName(), value);
         } else {
-            List<? super Object> c = (List)argMap.get(arg.getName());
+            List<? super Object> c = (List) argMap.get(arg.getName());
             if (c == null) {
                 c = new ArrayList<>();
                 argMap.put(arg.getName(), c);
@@ -431,7 +431,7 @@ private String doSubstitutions(String s) {
      * in set {@link #mandatory}, so later we can check if all mandatory arguments where specified by user.
      */
     private void parseProperties() {
-        for(String arg : getPrefixArguments()) {
+        for (String arg : getPrefixArguments()) {
             Argument argument = new Argument();
             argument.setName(
                 getArgAttrValue(arg, "name")
@@ -505,7 +505,7 @@ private Set<String> getPrefixArguments() {
 
         for (String argName : this.properties.stringPropertyNames()) {
             String[] param = argName.split("\\.");
-            if(param.length > 1 && !param[1].equals("arg") || !param[0].equals(this.prefix)) {
+            if (param.length > 1 && !param[1].equals("arg") || !param[0].equals(this.prefix)) {
                 continue;
             }
             if (param.length < 4) {
@@ -521,8 +521,8 @@ private Set<String> getPrefixArguments() {
 
     private String[] parseArgument(String arg) {
         String [] splitArg = arg.split("=", 2);
-        if(splitArg.length < 2) {
-            return new String[] {splitArg[0],  null};
+        if (splitArg.length < 2) {
+            return new String[] {splitArg[0], null};
         }
 
         return splitArg;
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/StringValueConverter.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/StringValueConverter.java
index 967d32c9fe6..acef4f9e4fc 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/StringValueConverter.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/cli/parser/StringValueConverter.java
@@ -47,7 +47,7 @@ public static Object getObjectValueByString(Class<?> clazz, String value) {
                 if (Modifier.isStatic(f.getModifiers())) {
                     v = f.get(null);
                 }
-            } catch(ReflectiveOperationException ignore) {}
+            } catch (ReflectiveOperationException ignore) { }
         }
 
         if (v == null) {
@@ -56,7 +56,7 @@ public static Object getObjectValueByString(Class<?> clazz, String value) {
                 if (Modifier.isStatic(convert.getModifiers())) {
                     v = convert.invoke(null, value);
                 }
-            } catch(ReflectiveOperationException ignore) {}
+            } catch (ReflectiveOperationException ignore) { }
         }
 
         if (v == null) {
@@ -65,14 +65,14 @@ public static Object getObjectValueByString(Class<?> clazz, String value) {
                 if (Modifier.isStatic(convert.getModifiers())) {
                     v = convert.invoke(null, value);
                 }
-            } catch(ReflectiveOperationException ignore) {}
+            } catch (ReflectiveOperationException ignore) { }
         }
 
         if (v == null) {
             try {
                 Constructor<?> constructor = clazz.getDeclaredConstructor(String.class);
                 v = constructor.newInstance(value);
-            } catch(ReflectiveOperationException ignore) {}
+            } catch (ReflectiveOperationException ignore) { }
         }
 
         if (v == null) {
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/config/ShellLikeConfd.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/config/ShellLikeConfd.java
index 66cd5d26a57..c4ce2b23a79 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/config/ShellLikeConfd.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/config/ShellLikeConfd.java
@@ -185,7 +185,7 @@ public String expandString(String value) {
                 escape = false;
                 ret.append(c);
             } else {
-                switch(c) {
+                switch (c) {
                     case '\\':
                         escape = true;
                     break;
@@ -198,7 +198,7 @@ public String expandString(String value) {
                             throw new RuntimeException("Malformed variable assignement");
                         }
                         String name = value.substring(index, i);
-                        index = i+1;
+                        index = i + 1;
                         String v = values.get(name);
                         if (v != null) {
                             ret.append(v);
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CertificateChain.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CertificateChain.java
index 51e2c7d64c0..1a0d34bb31c 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CertificateChain.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CertificateChain.java
@@ -51,13 +51,13 @@ public static Set<TrustAnchor> keyStoreToTrustAnchors(KeyStore keystore) throws
             try {
                 KeyStore.Entry entry = keystore.getEntry(alias, null);
                 if (entry instanceof KeyStore.TrustedCertificateEntry) {
-                    Certificate c = ((KeyStore.TrustedCertificateEntry)entry).getTrustedCertificate();
+                    Certificate c = ((KeyStore.TrustedCertificateEntry) entry).getTrustedCertificate();
                     if (c instanceof X509Certificate) {
                         c.verify(c.getPublicKey());
-                        ret.add(new TrustAnchor((X509Certificate)c, null));
+                        ret.add(new TrustAnchor((X509Certificate) c, null));
                     }
                 }
-            } catch(Exception e) {
+            } catch (Exception e) {
                 // ignore
             }
         }
@@ -112,7 +112,7 @@ public static CertPath buildCertPath(
         Set<TrustAnchor> trustAnchors
     ) throws GeneralSecurityException {
         X509CertSelector selector = new X509CertSelector();
-        selector.setCertificate((X509Certificate)chain.get(0));
+        selector.setCertificate((X509Certificate) chain.get(0));
         PKIXBuilderParameters pkixParams = new PKIXBuilderParameters(
             trustAnchors,
             selector
@@ -141,12 +141,12 @@ public static List<Certificate> completeChain(
         List<Certificate> ret = chain;
 
         if (ret != null) {
-            Certificate top = ret.get(ret.size()-1);
+            Certificate top = ret.get(ret.size() - 1);
             boolean topIsRoot = false;
             try {
                 top.verify(top.getPublicKey());
                 topIsRoot = true;
-            } catch(Exception e) {
+            } catch (Exception e) {
                 // ignore
             }
 
@@ -157,10 +157,10 @@ public static List<Certificate> completeChain(
                         trustAnchors.addAll(extraTrustAnchors);
                     }
                     ret = new ArrayList<>(buildCertPath(ret, trustAnchors).getCertificates());
-                    top = ret.get(ret.size()-1);
+                    top = ret.get(ret.size() - 1);
                     for (TrustAnchor t : trustAnchors) {
                         try {
-                            Certificate c= t.getTrustedCert();
+                            Certificate c = t.getTrustedCert();
                             top.verify(c.getPublicKey());
                             ret.add(c);
                             break;
@@ -221,12 +221,12 @@ public void checkServerTrusted(
             );
 
             try (
-                SSLSocket sock = (SSLSocket)ctx.getSocketFactory().createSocket(
+                SSLSocket sock = (SSLSocket) ctx.getSocketFactory().createSocket(
                     url.getHost(),
                     url.getPort() != -1 ? url.getPort() : url.getDefaultPort()
                 )
             ) {
-                sock.setSoTimeout(60*1000);
+                sock.setSoTimeout(60 * 1000);
                 try {
                     sock.startHandshake();
                 } catch (Exception e) {
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CryptMD5.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CryptMD5.java
index c8e2b2aef8b..f13cd1561e1 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CryptMD5.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/CryptMD5.java
@@ -28,9 +28,9 @@ public class CryptMD5 {
 
     private static String encode(byte b1, byte b2, byte b3, int n) {
         StringBuilder result = new StringBuilder();
-        int w = ((b1&0xff) << 16) | ((b2&0xff) << 8) | (b3&0xff);
+        int w = ((b1 & 0xff) << 16) | ((b2 & 0xff) << 8) | (b3 & 0xff);
         while (n-- > 0) {
-            result.append(b64t[w&0x3f]);
+            result.append(b64t[w & 0x3f]);
             w = w >> 6;
         }
         return result.toString();
@@ -120,8 +120,8 @@ public static String crypt(String password) {
         byte[] r = new byte[SALT_MAX_LENGTH];
         char[] salt = new char[r.length];
         SECURE_RANDOM.nextBytes(r);
-        for (int i=0;i<r.length;i++) {
-            salt[i] = b64t[(r[i]&0xff) % b64t.length];
+        for (int i = 0; i < r.length; i++) {
+            salt[i] = b64t[(r[i] & 0xff) % b64t.length];
         }
         return crypt(password, new String(salt));
     }
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/ticket/TicketEncoder.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/ticket/TicketEncoder.java
index 4ab12d66141..701858eb391 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/ticket/TicketEncoder.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/crypto/ticket/TicketEncoder.java
@@ -78,7 +78,7 @@ public String encode(String data) throws GeneralSecurityException, IOException {
         Signature signature = Signature.getInstance("RSASSA-PSS");
         StringBuilder fields = new StringBuilder();
         signature.setParameter(new PSSParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256,
-                getSaltMaxLength((RSAKey)key), PSSParameterSpec.TRAILER_FIELD_BC));
+                getSaltMaxLength((RSAKey) key), PSSParameterSpec.TRAILER_FIELD_BC));
         signature.initSign(key);
         for (Map.Entry<String, String> entry : map.entrySet()) {
             if (fields.length() > 0) {
@@ -109,7 +109,7 @@ public String encode(String data) throws GeneralSecurityException, IOException {
 
     // Based on RFC3447 - https://tools.ietf.org/html/rfc3447#section-9.1.1
     public static int getSaltMaxLength(RSAKey privateKey) throws NoSuchAlgorithmException {
-        int keyLength = (int)Math.ceil((privateKey.getModulus().bitLength() -1) / 8.0);
+        int keyLength = (int) Math.ceil((privateKey.getModulus().bitLength() - 1) / 8.0);
         MessageDigest md = MessageDigest.getInstance("SHA-256");
         return keyLength - md.getDigestLength() - 2;
     }
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/net/HttpClientBuilder.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/net/HttpClientBuilder.java
index abe231b81b4..874028a56a5 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/net/HttpClientBuilder.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/net/HttpClientBuilder.java
@@ -111,8 +111,8 @@ public HttpClientBuilder setValidateAfterInactivity(Integer validateAfterInactiv
     public CloseableHttpClient build() throws IOException, GeneralSecurityException {
         // Prepare the default configuration for all requests:
         RequestConfig requestConfig = RequestConfig.custom()
-                .setConnectTimeout(connectTimeout != null? connectTimeout: 0)
-                .setSocketTimeout(readTimeout != null? readTimeout: 0)
+                .setConnectTimeout(connectTimeout != null ? connectTimeout : 0)
+                .setSocketTimeout(readTimeout != null ? readTimeout : 0)
                 .build();
 
         // Configure the trust manager:
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/servlet/ProxyServletBase.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/servlet/ProxyServletBase.java
index a3f3dd28b0e..30dd2c77047 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/servlet/ProxyServletBase.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/servlet/ProxyServletBase.java
@@ -35,7 +35,7 @@ public class ProxyServletBase extends HttpServlet {
     private String url;
 
     protected static long copy(final InputStream input, final OutputStream output) throws IOException {
-        final byte[] buffer = new byte[8*1024];
+        final byte[] buffer = new byte[8 * 1024];
         long count = 0;
         int n;
         while ((n = input.read(buffer)) != -1) {
diff --git a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/xml/SecureDocumentBuilderFactory.java b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/xml/SecureDocumentBuilderFactory.java
index d628229a052..c7975ffbbee 100644
--- a/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/xml/SecureDocumentBuilderFactory.java
+++ b/backend/manager/modules/uutils/src/main/java/org/ovirt/engine/core/uutils/xml/SecureDocumentBuilderFactory.java
@@ -12,7 +12,7 @@ public static DocumentBuilderFactory newDocumentBuilderFactory() {
             documentBuilderFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
             documentBuilderFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
             documentBuilderFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
-        } catch(ParserConfigurationException e) {
+        } catch (ParserConfigurationException e) {
             throw new RuntimeException(e);
         }
         return documentBuilderFactory;
diff --git a/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopeEncryptDecryptTest.java b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopeEncryptDecryptTest.java
index 09a1b973282..a5a545f61e5 100644
--- a/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopeEncryptDecryptTest.java
+++ b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopeEncryptDecryptTest.java
@@ -21,7 +21,7 @@ private static KeyStore getKeyStore(String storeType, String store, String passw
     }
 
     private static KeyStore.PrivateKeyEntry getPrivateKeyEntry(KeyStore ks, String alias, String password) throws Exception {
-        return (KeyStore.PrivateKeyEntry)ks.getEntry(alias, new KeyStore.PasswordProtection(password.toCharArray()));
+        return (KeyStore.PrivateKeyEntry) ks.getEntry(alias, new KeyStore.PasswordProtection(password.toCharArray()));
     }
 
     @Test
diff --git a/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopePBETest.java b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopePBETest.java
index f4389fb4238..787719d0370 100644
--- a/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopePBETest.java
+++ b/backend/manager/modules/uutils/src/test/java/org/ovirt/engine/core/uutils/crypto/EnvelopePBETest.java
@@ -16,7 +16,7 @@ public void test1() throws Exception {
 
         Random random = new Random();
 
-        for (int i=1;i<100;i++) {
+        for (int i = 1; i < 100; i++) {
             byte[] r = new byte[i];
             random.nextBytes(r);
             String password = new Base64(0).encodeToString(r);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetNumberOfCpusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetNumberOfCpusVDSCommand.java
index 937956ad593..1e958fb6b2a 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetNumberOfCpusVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/SetNumberOfCpusVDSCommand.java
@@ -25,7 +25,7 @@ protected void executeVdsBrokerCommand() {
         }
     }
 
-    public static class Params extends VdsAndVmIDVDSParametersBase{
+    public static class Params extends VdsAndVmIDVDSParametersBase {
 
         private int numberOfCpus;
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index a0e26263305..6dcf8902597 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -996,7 +996,7 @@ private void logHostFailToRespond(VDSNetworkException ex) {
 
         AuditLogable logable = createAuditLogableForHost(cachedVds);
         logable.updateCallStackFromThrowable(ex);
-        if (ex.getCause() instanceof java.net.UnknownHostException){
+        if (ex.getCause() instanceof java.net.UnknownHostException) {
             auditLogDirector.log(logable, AuditLogType.VDS_UNKNOWN_HOST);
         } else {
             auditLogDirector.log(logable, AuditLogType.VDS_FAILURE);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
index 9a78181c0a1..791705c97f4 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilder.java
@@ -411,7 +411,7 @@ void writeCpu(boolean addVmNumaNodes) {
         writer.writeStartElement("cpu");
 
         String cpuType = vm.getCpuName();
-        if (vm.isUseHostCpuFlags()){
+        if (vm.isUseHostCpuFlags()) {
             cpuType = "hostPassthrough";
         }
         if (vm.getUseTscFrequency() && tscFrequencySupplier.get() != null) {
@@ -433,13 +433,13 @@ void writeCpu(boolean addVmNumaNodes) {
 
         String[] typeAndFlags = cpuType.split(",");
 
-        switch(vm.getClusterArch().getFamily()) {
+        switch (vm.getClusterArch().getFamily()) {
         case x86:
         case s390x:
             writer.writeAttributeString("match", "exact");
 
             // is this a list of strings??..
-            switch(typeAndFlags[0]) {
+            switch (typeAndFlags[0]) {
             case "hostPassthrough":
                 writer.writeAttributeString("mode", "host-passthrough");
                 writeCpuFlags(typeAndFlags);
@@ -503,7 +503,7 @@ void writeCpu(boolean addVmNumaNodes) {
     private void writeCpuFlags(String[] typeAndFlags) {
         Stream.of(typeAndFlags).skip(1).filter(StringUtils::isNotEmpty).forEach(flag -> {
             writer.writeStartElement("feature");
-            switch(flag.charAt(0)) {
+            switch (flag.charAt(0)) {
             case '+':
                 writer.writeAttributeString("name", flag.substring(1));
                 writer.writeAttributeString("policy", "require");
@@ -538,7 +538,7 @@ private void writeCpuTune() {
         if (ioEmulatorCpus != null) {
             for (int i = 0; i < vm.getNumOfIoThreads(); i++) {
                 writer.writeStartElement("iothreadpin");
-                writer.writeAttributeString("iothread", String.valueOf(i+1));
+                writer.writeAttributeString("iothread", String.valueOf(i + 1));
                 writer.writeAttributeString("cpuset", ioEmulatorCpus);
                 writer.writeEndElement();
             }
@@ -1066,7 +1066,7 @@ void writeDevices() {
 
         writer.writeStartElement("devices");
 
-        switch(vm.getClusterArch().getFamily()) {
+        switch (vm.getClusterArch().getFamily()) {
         // No mouse or tablet for s390x and for headless HP VMS with ppc architecture type.
         case x86:
             writeInput();
@@ -1128,7 +1128,7 @@ void writeDevices() {
                 writeVideo(device);
                 break;
             case CONTROLLER:
-                switch(device.getDevice()) {
+                switch (device.getDevice()) {
                 case "usb":
                     if ("qemu-xhci".equals(device.getSpecParams().get("model"))) {
                         device.getSpecParams().put("ports", 8);
@@ -1181,7 +1181,7 @@ void writeDevices() {
                 }
                 break;
             case DISK:
-                switch(VmDeviceType.getByName(device.getDevice())) {
+                switch (VmDeviceType.getByName(device.getDevice())) {
                 case CDROM:
                     cdromDevices.add(device);
                     break;
@@ -1364,7 +1364,7 @@ void writeVGpu() {
             writer.writeEndElement();
 
             Map<String, String> metadata = new HashMap<>();
-            String mdevTypeMeta = (String)mdevSpecParams.get(MDevTypesUtils.MDEV_TYPE);
+            String mdevTypeMeta = (String) mdevSpecParams.get(MDevTypesUtils.MDEV_TYPE);
             if (FeatureSupported.isVgpuPlacementSupported(compatibilityVersion)) {
                 VgpuPlacement vgpuPlacement = hostVgpuPlacementSupplier.get();
                 String vgpuPlacementString;
@@ -1477,7 +1477,7 @@ private void writeDisks(List<VmDevice> devices, Map<Integer, Map<VmDevice, Integ
             DiskInterface diskInterface = dve.getDiskInterface();
             int index = 0;
             int pinTo = 0;
-            switch(diskInterface) {
+            switch (diskInterface) {
             case IDE:
                 index = hdIndex = skipCdIndices(++hdIndex, diskInterface);
                 break;
@@ -1695,8 +1695,8 @@ private void writeHostdevDisks(List<Pair<VmDevice, HostDevice>> hostDevDisks) {
         hostDevDisks.sort(Comparator
                 .comparing((Pair<VmDevice, HostDevice> p) -> Integer.parseInt(p.getSecond().getAddress().get("host")))
                 .thenComparing(p -> Integer.parseInt(p.getSecond().getAddress().get("bus")))
-                .thenComparing(p-> Integer.parseInt(p.getSecond().getAddress().get("target")))
-                .thenComparing(p-> Integer.parseInt(p.getSecond().getAddress().get("lun")))
+                .thenComparing(p -> Integer.parseInt(p.getSecond().getAddress().get("target")))
+                .thenComparing(p -> Integer.parseInt(p.getSecond().getAddress().get("lun")))
         );
 
         for (Pair<VmDevice, HostDevice> pair : hostDevDisks) {
@@ -1872,13 +1872,13 @@ private void writePciHostDevice(VmHostDevice device, HostDevice hostDevice) {
 
     private void writeNvdimmHostDevice(VmHostDevice device, HostDevice hostDevice) {
         Map<String, Object> specParams = hostDevice.getSpecParams();
-        String numaNode = (String)specParams.get(VdsProperties.NUMA_NODE);
+        String numaNode = (String) specParams.get(VdsProperties.NUMA_NODE);
         String targetNode = vmInfoBuildUtils.getMatchingNumaNode(getNumaTuneSetting(), vmNumaNodesSupplier, numaNode);
         if (targetNode == null) {
             log.error("No NUMA node, cannot add NVDIMM devices");
             return;
         }
-        Long alignSize = (Long)specParams.get(VdsProperties.ALIGN_SIZE);
+        Long alignSize = (Long) specParams.get(VdsProperties.ALIGN_SIZE);
         if (alignSize == null) {
             // If we didn't specify alignsize, libvirt would select one based on memory page size.
             // Better to set it ourselves, to the memory block size.
@@ -1911,7 +1911,7 @@ private void writeNvdimmHostDevice(VmHostDevice device, HostDevice hostDevice) {
         writer.writeAttributeString("access", "shared");
 
         writer.writeStartElement("source");
-        writer.writeElement("path", (String)specParams.get(VdsProperties.DEVICE_PATH));
+        writer.writeElement("path", (String) specParams.get(VdsProperties.DEVICE_PATH));
         writer.writeStartElement("alignsize");
         writer.writeAttributeString("unit", "KiB");
         writer.writeRaw(String.valueOf(alignSize / 1024));
@@ -1973,7 +1973,7 @@ private void writeRng(VmDevice device) {
 
         writer.writeStartElement("backend");
         writer.writeAttributeString("model", "random");
-        switch(specParams.get("source").toString()) {
+        switch (specParams.get("source").toString()) {
         case "random":
             writer.writeRaw("/dev/random");
             break;
@@ -2312,7 +2312,7 @@ private void writeDiskDriver(VmDevice device, Disk disk, DiskVmElement dve, int
         switch (disk.getDiskStorageType()) {
         case IMAGE:
             DiskImage diskImage = (DiskImage) disk;
-            nativeIO =  vmInfoBuildUtils.shouldUseNativeIO(vm, diskImage, device);
+            nativeIO = vmInfoBuildUtils.shouldUseNativeIO(vm, diskImage, device);
             writer.writeAttributeString("io", nativeIO ? "native" : "threads");
             writer.writeAttributeString("type", diskImage.getVolumeFormat() == VolumeFormat.COW ? "qcow2" : "raw");
             writer.writeAttributeString("error_policy", disk.getPropagateErrors() == PropagateErrors.On ? "enospace" : "stop");
@@ -2465,7 +2465,7 @@ private void writeDiskSource(VmDevice device, Disk disk, String dev, DiskVmEleme
             } else if (managedBlockStorageDisk.getCinderVolumeDriver() == CinderVolumeDriver.BLOCK) {
                 Map<String, Object> attachment =
                         (Map<String, Object>) managedBlockStorageDisk.getDevice().get(DeviceInfoReturn.ATTACHMENT);
-                metadata.put("GUID", (String)attachment.get(DeviceInfoReturn.SCSI_WWN));
+                metadata.put("GUID", (String) attachment.get(DeviceInfoReturn.SCSI_WWN));
             }
 
             metadata.put("managed", "true");
@@ -3094,7 +3094,7 @@ private void writeInput() {
             writer.writeAttributeString("bus", "usb");
         } else {
             writer.writeAttributeString("type", "mouse");
-            writer.writeAttributeString("bus", vm.getClusterArch().getFamily() == ArchitectureType.x86 ? "ps2" :"usb");
+            writer.writeAttributeString("bus", vm.getClusterArch().getFamily() == ArchitectureType.x86 ? "ps2" : "usb");
         }
 
         writer.writeEndElement();
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/VmInfoBuildUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/VmInfoBuildUtils.java
index 92559042bff..ef2613a0725 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/VmInfoBuildUtils.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/VmInfoBuildUtils.java
@@ -884,7 +884,7 @@ public static int javaZoneToOffset(String javaZoneId, long now) {
     }
 
     public String getEmulatedMachineByClusterArch(ArchitectureType arch) {
-        switch(arch) {
+        switch (arch) {
         case ppc64:
         case ppc64le:
             return "pseries";
@@ -963,14 +963,14 @@ public List<VmDevice> createGraphicsDevices(
     public String makeDiskName(String diskInterface, int index) {
         String devIndex = "";
         while (index > 0) {
-            devIndex = (char)('a' + (index % 26)) + devIndex;
+            devIndex = (char) ('a' + (index % 26)) + devIndex;
             index /= 26;
         }
         return diskInterfaceToDevName(diskInterface) + (devIndex.isEmpty() ? 'a' : devIndex);
     }
 
     public String diskInterfaceToDevName(String iface) {
-        switch(iface) {
+        switch (iface) {
         case "virtio":
             return "vd";
         case "fdc":
@@ -1095,9 +1095,9 @@ public String getIoThreadsAndEmulatorPinningCpus(VM vm, Map<String, Object> cpuP
         Optional<VmNumaNode> pinnedVmNumaNode = vmNumaNodes.stream().filter(d -> !d.getVdsNumaNodeList().isEmpty()).findAny();
 
         if (MapUtils.isEmpty(cpuPinning) || !pinnedVmNumaNode.isPresent() || vm.getNumOfIoThreads() == 0) {
-            String msgReason1 = MapUtils.isEmpty(cpuPinning) ? "CPU Pinning topology is not set": null;
-            String msgReason2 = vm.getNumOfIoThreads() == 0 ? "IO Threads is not enabled": null;
-            String msgReason3 = !pinnedVmNumaNode.isPresent() ? "vm's virtual NUMA nodes are not pinned to host's NUMA nodes": null;
+            String msgReason1 = MapUtils.isEmpty(cpuPinning) ? "CPU Pinning topology is not set" : null;
+            String msgReason2 = vm.getNumOfIoThreads() == 0 ? "IO Threads is not enabled" : null;
+            String msgReason3 = !pinnedVmNumaNode.isPresent() ? "vm's virtual NUMA nodes are not pinned to host's NUMA nodes" : null;
             String finalMsgReason = Stream.of(msgReason1, msgReason2, msgReason3)
                     .filter(Objects::nonNull).collect(Collectors.joining(", ")) + ".";
 
@@ -1182,7 +1182,7 @@ private String findCpusToPinIoAndEmulator(VM vm, Map<String, Object> cpuPinning,
     private static Set<Integer> getAllPinnedPCpus(Map<String, Object> cpuPinning) {
         final Set<Integer> pinnedCpus = new LinkedHashSet<>();
         cpuPinning.forEach((vcpu, cpuSet) -> {
-            pinnedCpus.addAll(parsePCpuPinningNumbers((String)cpuSet));
+            pinnedCpus.addAll(parsePCpuPinningNumbers((String) cpuSet));
         });
         return pinnedCpus;
     }
@@ -1232,7 +1232,7 @@ private static List<Integer> createRange(int start, int end) {
 
     // Get list of pCPUs used both for CPU pinning and IO/emulator pinning
     private String getOverriddenPinnedCpusList(Set<Integer> vdsPinnedCpus, List<Integer> ioEmulatorPinnedCpus) {
-        List<Integer> overriddenCpus = (List<Integer>)CollectionUtils.intersection(vdsPinnedCpus, ioEmulatorPinnedCpus);
+        List<Integer> overriddenCpus = (List<Integer>) CollectionUtils.intersection(vdsPinnedCpus, ioEmulatorPinnedCpus);
 
         if (overriddenCpus.isEmpty()) {
             return "";
@@ -1245,7 +1245,7 @@ private String getOverriddenPinnedCpusList(Set<Integer> vdsPinnedCpus, List<Inte
 
     private static VdsNumaNode getNumaNodeWithLowerCpuIds(VdsNumaNode mostPinnedPnumaNode, VdsNumaNode currNode) {
         return Objects.compare(currNode.getCpuIds(), mostPinnedPnumaNode.getCpuIds(), Comparator.comparing(Collections::min)) < 0 ?
-                currNode: mostPinnedPnumaNode;
+                currNode : mostPinnedPnumaNode;
     }
 
 
@@ -1274,7 +1274,7 @@ public List<VdsNumaNode> getVdsNumaNodes(Guid vdsId) {
     public List<VmNumaNode> getVmNumaNodes(VM vm) {
         int onlineCpus = VmCpuCountHelper.getDynamicNumOfCpu(vm);
         int vcpus = FeatureSupported.hotPlugCpu(vm.getCompatibilityVersion(), vm.getClusterArch(), vm.getCpuPinningPolicy()) ?
-                VmCpuCountHelper.calcMaxVCpu(vm, vm.getCompatibilityVersion()): onlineCpus;
+                VmCpuCountHelper.calcMaxVCpu(vm, vm.getCompatibilityVersion()) : onlineCpus;
         int offlineCpus = vcpus - onlineCpus;
         List<VmNumaNode> vmNumaNodes = vmNumaNodeDao.getAllVmNumaNodeByVmId(vm.getId());
         if (!vmNumaNodes.isEmpty()) {
@@ -1294,9 +1294,9 @@ public List<VmNumaNode> getVmNumaNodes(VM vm) {
                         Comparator.comparingInt(o -> o.getCpuIds().size());
                 Collections.sort(vmNumaNodes, compareBySize);
                 int numaCount = vmNumaNodes.size();
-                int start = totalCpusInNodes-1;
+                int start = totalCpusInNodes - 1;
                 for (VmNumaNode vmNode : vmNumaNodes) {
-                    int index = start = start+1;
+                    int index = start = start + 1;
                     while (index < vcpus) {
                         vmNode.getCpuIds().add(index);
                         index += numaCount;
@@ -1408,7 +1408,7 @@ public boolean isKASLRDumpEnabled(int osId) {
         return osRepository.isLinux(osId) && Config.<Boolean> getValue(ConfigValues.EnableKASLRDump);
     }
 
-    public List<VmNicFilterParameter> getAllNetworkFiltersForVmNic(Guid nicId)  {
+    public List<VmNicFilterParameter> getAllNetworkFiltersForVmNic(Guid nicId) {
         return vmNicFilterParameterDao.getAllForVmNic(nicId);
     }
 
@@ -1529,7 +1529,7 @@ private Map<String, String> createDiskUuidsMap(Guid poolId, Guid domainId, Guid
     }
 
     public int getDefaultHugepageSize(VM vm) {
-        switch(vm.getClusterArch().getFamily()) {
+        switch (vm.getClusterArch().getFamily()) {
         case ppc:
             return DEFAULT_HUGEPAGESIZE_PPC64LE;
         default:
@@ -1636,10 +1636,10 @@ public Long getNvdimmAlignedSize(VM vm, HostDevice hostDevice) {
         // Beware: The sizes computed here cannot be changed otherwise data corruption/loss may happen!
         Map<String, Object> specParams = hostDevice.getSpecParams();
         final Long hotplugAlignment = new Long(vm.getClusterArch().getHotplugMemorySizeFactorMb() * 1024 * 1024);
-        final Long nvdimmAlignment = (Long)specParams.getOrDefault(VdsProperties.ALIGN_SIZE, hotplugAlignment);
+        final Long nvdimmAlignment = (Long) specParams.getOrDefault(VdsProperties.ALIGN_SIZE, hotplugAlignment);
         // Libvirt performs size alignments, sometimes up rather than down, let's make an initial alignment down
         // here to be safe.
-        Long size = alignDown((Long)specParams.get(VdsProperties.DEVICE_SIZE), hotplugAlignment);
+        Long size = alignDown((Long) specParams.get(VdsProperties.DEVICE_SIZE), hotplugAlignment);
         // Libvirt subtracts label size on POWER before checking for alignments.
         if (vm.getClusterArch().getFamily() == ArchitectureType.ppc) {
             size += NVDIMM_LABEL_SIZE;
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java
index 11c0c3b0647..d9b4bc57818 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java
@@ -40,7 +40,7 @@ protected void executeVdsBrokerCommand() {
         // Handle errors if any
         proceedProxyReturnValue();
 
-        if(getVDSReturnValue().getSucceeded()) {
+        if (getVDSReturnValue().getSucceeded()) {
             // set the volume updated with id as the return value
             volume.setId(Guid.createGuidFromStringDefaultEmpty(uuidReturn.uuid));
             setReturnValue(volume);
@@ -49,13 +49,13 @@ protected void executeVdsBrokerCommand() {
 
     private String[] getTransportTypeArr(GlusterVolumeEntity volume) {
         Set<TransportType> transportTypes = volume.getTransportTypes();
-        if(transportTypes == null) {
+        if (transportTypes == null) {
             return null;
         }
 
         String[] transportTypeArr = new String[transportTypes.size()];
         int index = 0;
-        for(TransportType transportType : transportTypes) {
+        for (TransportType transportType : transportTypes) {
             transportTypeArr[index++] = transportType.name();
         }
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterLocalPhysicalVolumeListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterLocalPhysicalVolumeListVDSCommand.java
index 325a57e7374..81ffee69f9b 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterLocalPhysicalVolumeListVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterLocalPhysicalVolumeListVDSCommand.java
@@ -5,7 +5,7 @@
 import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
 import org.ovirt.engine.core.vdsbroker.vdsbroker.Status;
 
-public class GetGlusterLocalPhysicalVolumeListVDSCommand<P extends VdsIdVDSCommandParametersBase> extends AbstractGlusterBrokerCommand<P>  {
+public class GetGlusterLocalPhysicalVolumeListVDSCommand<P extends VdsIdVDSCommandParametersBase> extends AbstractGlusterBrokerCommand<P> {
     private GlusterLocalPhysicalVolumeListReturn result;
 
     public GetGlusterLocalPhysicalVolumeListVDSCommand(P parameters) {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturn.java
index 2351654f4c8..7ac9754a63a 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturn.java
@@ -34,7 +34,7 @@ public GlusterHooksListReturn(Map<String, Object> innerMap) {
 
         if (hooksArr != null) {
             for (Object hookMap : hooksArr) {
-                hooks.add(getHook((Map<String, Object>)hookMap));
+                hooks.add(getHook((Map<String, Object>) hookMap));
             }
         }
     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturn.java
index 1f703f4ac63..c6101b466be 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHostsPubKeyReturn.java
@@ -16,7 +16,7 @@ public class GlusterHostsPubKeyReturn extends StatusReturn {
     @SuppressWarnings("unchecked")
     public GlusterHostsPubKeyReturn(Map<String, Object> innerMap) {
         super(innerMap);
-        if(innerMap.containsKey("info")) {
+        if (innerMap.containsKey("info")) {
             innerMap = (Map<String, Object>) innerMap.get(INFO);
         }
         if (innerMap.containsKey(GEO_REP_PUB_KEYS)) {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalLogicalVolumeListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalLogicalVolumeListReturn.java
index 67c574f465b..8ecc7b8cb8f 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalLogicalVolumeListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalLogicalVolumeListReturn.java
@@ -21,7 +21,7 @@ public GlusterLocalLogicalVolumeListReturn(Map<String, Object> innerMap) {
         super(innerMap);
 
         Object[] volumeInfo = (Object[]) innerMap.get(LOGICAL_VOLUME_LIST);
-        for(Object volumeObject : volumeInfo) {
+        for (Object volumeObject : volumeInfo) {
             Map<String, Object> volumeData = (Map<String, Object>) volumeObject;
 
             GlusterLocalLogicalVolume volume = new GlusterLocalLogicalVolume();
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalPhysicalVolumeListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalPhysicalVolumeListReturn.java
index bff3d31f914..e2056788a4b 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalPhysicalVolumeListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterLocalPhysicalVolumeListReturn.java
@@ -18,7 +18,7 @@ public GlusterLocalPhysicalVolumeListReturn(Map<String, Object> innerMap) {
         super(innerMap);
 
         Object[] volumeInfo = (Object[]) innerMap.get(PHYSICAL_VOLUME_LIST);
-        for(Object volumeObject : volumeInfo) {
+        for (Object volumeObject : volumeInfo) {
             Map<String, Object> volumeData = (Map<String, Object>) volumeObject;
 
             GlusterLocalPhysicalVolume volume = new GlusterLocalPhysicalVolume();
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTaskInfoReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTaskInfoReturn.java
index 37fedeb9993..80be9b4cd44 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTaskInfoReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTaskInfoReturn.java
@@ -6,14 +6,14 @@
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.vdsbroker.irsbroker.StatusReturn;
 
-public class GlusterTaskInfoReturn extends  StatusReturn {
+public class GlusterTaskInfoReturn extends StatusReturn {
     private static final String TASK_ID = "taskId";
     private final GlusterAsyncTask glusterTask = new GlusterAsyncTask();
 
     public GlusterTaskInfoReturn(Map<String, Object> innerMap) {
         super(innerMap);
         if (innerMap.containsKey(TASK_ID)) {
-            glusterTask.setTaskId(Guid.createGuidFromString((String)innerMap.get(TASK_ID)));
+            glusterTask.setTaskId(Guid.createGuidFromString((String) innerMap.get(TASK_ID)));
         }
     }
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturn.java
index be95a79b3a1..1aa88028834 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturn.java
@@ -42,8 +42,8 @@ public GlusterTasksListReturn(Map<String, Object> innerMap) {
         Map<String, Object> tasksMap = (Map<String, Object>) innerMap.get(TASKS_LIST);
         if (tasksMap != null) {
             for (Entry<String, Object> entry: tasksMap.entrySet()) {
-                GlusterAsyncTask task = getTask(entry.getKey(), (Map<String, Object>)entry.getValue());
-                if(GlusterTaskType.UNKNOWN != task.getType()){
+                GlusterAsyncTask task = getTask(entry.getKey(), (Map<String, Object>) entry.getValue());
+                if (GlusterTaskType.UNKNOWN != task.getType()) {
                     tasks.add(task);
                 }
             }
@@ -55,12 +55,12 @@ public GlusterTasksListReturn(Map<String, Object> innerMap) {
     private GlusterAsyncTask getTask(String taskId, Map<String, Object> map) {
         GlusterAsyncTask task = new GlusterAsyncTask();
         task.setTaskId(Guid.createGuidFromString(taskId));
-        task.setStatus(GlusterAsyncTaskStatus.from((String)map.get(STATUS)).getJobExecutionStatus());
-        task.setType(GlusterTaskType.fromValue((String)map.get(TASK_TYPE)));
-        if(GlusterTaskType.UNKNOWN != task.getType()){
-            task.setMessage(getMessage((Map<String, Object>)map.get(DATA)));
+        task.setStatus(GlusterAsyncTaskStatus.from((String) map.get(STATUS)).getJobExecutionStatus());
+        task.setType(GlusterTaskType.fromValue((String) map.get(TASK_TYPE)));
+        if (GlusterTaskType.UNKNOWN != task.getType()) {
+            task.setMessage(getMessage((Map<String, Object>) map.get(DATA)));
             task.setTaskParameters(new GlusterTaskParameters());
-            task.getTaskParameters().setVolumeName((String)map.get(VOLUME_NAME));
+            task.getTaskParameters().setVolumeName((String) map.get(VOLUME_NAME));
             task.getTaskParameters().setBricks(getBrickNames(map.get(BRICK_NAMES)));
         }
         return task;
@@ -79,17 +79,17 @@ private String formatTotalSizeMoved(long size) {
         NumberFormat formatSize = NumberFormat.getInstance();
         formatSize.setMaximumFractionDigits(2);
         formatSize.setMinimumFractionDigits(2);
-        Pair<SizeConverter.SizeUnit, Double> sizeMoved= SizeConverter.autoConvert(size, SizeUnit.BYTES);
+        Pair<SizeConverter.SizeUnit, Double> sizeMoved = SizeConverter.autoConvert(size, SizeUnit.BYTES);
         return formatSize.format(sizeMoved.getSecond().doubleValue()).toString().concat(" ").concat(sizeMoved.getFirst().toString());
     }
 
-    private String[] getBrickNames(Object bricksObj){
+    private String[] getBrickNames(Object bricksObj) {
         if (bricksObj == null || !(bricksObj instanceof Object[])) {
             return null;
         }
-        Object[] brickObjectArray = (Object[])bricksObj;
+        Object[] brickObjectArray = (Object[]) bricksObj;
         String[] brickNames = new String[brickObjectArray.length];
-        for (int i=0; i< brickNames.length; i++){
+        for (int i = 0; i < brickNames.length; i++) {
             brickNames[i] = brickObjectArray[i].toString();
         }
         return brickNames;
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVDOVolumeListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVDOVolumeListReturn.java
index 50dbb7786ee..4af796e7511 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVDOVolumeListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVDOVolumeListReturn.java
@@ -22,18 +22,18 @@ public GlusterVDOVolumeListReturn(Map<String, Object> innerMap) {
         super(innerMap);
 
         Object[] volumeInfo = (Object[]) innerMap.get(VDO_VOLUME_LIST);
-        for(Object volumeObject : volumeInfo) {
+        for (Object volumeObject : volumeInfo) {
             Map<String, Object> volumeData = (Map<String, Object>) volumeObject;
 
             GlusterVDOVolume volume = new GlusterVDOVolume();
-            volume.setName((String)volumeData.get(VDO_VOLUME_NAME));
-            volume.setDevice((String)volumeData.get(VDO_VOLUME_DEVICE));
-            volume.setSize((Number)volumeData.get(VDO_VOLUME_SIZE));
-            volume.setFree((Number)volumeData.get(VDO_VOLUME_FREE));
+            volume.setName((String) volumeData.get(VDO_VOLUME_NAME));
+            volume.setDevice((String) volumeData.get(VDO_VOLUME_DEVICE));
+            volume.setSize((Number) volumeData.get(VDO_VOLUME_SIZE));
+            volume.setFree((Number) volumeData.get(VDO_VOLUME_FREE));
 
             //This data may be missing, so some safe default values are needed.
-            volume.setLogicalBlocks((Number)volumeData.getOrDefault(VDO_VOLUME_LOGICAL_BLOCKS, 0));
-            volume.setPhysicalBlocks((Number)volumeData.getOrDefault(VDO_VOLUME_PHYSICAL_BLOCKS, 0));
+            volume.setLogicalBlocks((Number) volumeData.getOrDefault(VDO_VOLUME_LOGICAL_BLOCKS, 0));
+            volume.setPhysicalBlocks((Number) volumeData.getOrDefault(VDO_VOLUME_PHYSICAL_BLOCKS, 0));
 
             vdoVolumes.add(volume);
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatus.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatus.java
index adae7e8fdc4..9b2bb84a7e4 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatus.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeGeoRepStatus.java
@@ -78,7 +78,7 @@ protected GlusterGeoRepSession getSession(String masterVolumeName, Map<String, O
         String[] sessSplit = sessionKey.split("([://]+)");
         // Older gluster versions doesn't have slave volume ID in the sessionKey, it is added in Glusterfs 3.7.12
         String slaveNode = sessSplit[2];
-        if(slaveNode.contains("@")) {
+        if (slaveNode.contains("@")) {
             String[] hostComponents = slaveNode.split("@");
             slaveNode = hostComponents[hostComponents.length - 1];
             geoRepSession.setUserName(hostComponents[0]);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeProfileInfoReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeProfileInfoReturn.java
index 9d98b083abf..d1bdafa88f9 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeProfileInfoReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeProfileInfoReturn.java
@@ -70,10 +70,10 @@ public GlusterVolumeProfileInfoReturn(Guid clusterId, Map<String, Object> innerM
             GlusterVolumeEntity volume = getGlusterVolumeDao().getByName(clusterId, volumeName);
 
             glusterVolumeProfileInfo.setVolumeId(volume.getId());
-            if(profileInfo.containsKey(BRICKS)) {
+            if (profileInfo.containsKey(BRICKS)) {
                 glusterVolumeProfileInfo.setBrickProfileDetails(prepareBrickProfileDetails(volume,
                     (Object[]) profileInfo.get(BRICKS)));
-            } else if(profileInfo.containsKey(NFSSERVERS)){
+            } else if (profileInfo.containsKey(NFSSERVERS)) {
                 glusterVolumeProfileInfo.setNfsProfileDetails(prepareNfsProfileDetails((Object[]) profileInfo.get(NFSSERVERS)));
             }
         }
@@ -81,7 +81,7 @@ public GlusterVolumeProfileInfoReturn(Guid clusterId, Map<String, Object> innerM
 
     private List<GlusterVolumeProfileStats> prepareNfsProfileDetails(Object[] nfsServerProfileDetails) {
         List<GlusterVolumeProfileStats> nfsProfileDetails = new ArrayList<>();
-        for(Object nfsObject : nfsServerProfileDetails) {
+        for (Object nfsObject : nfsServerProfileDetails) {
             GlusterVolumeProfileStats nfsDetails = new GlusterVolumeProfileStats();
             Map<String, Object> nfsProfile = (Map<String, Object>) nfsObject;
             nfsDetails.setIdentity((String) nfsProfile.get(NFS));
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeStatusReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeStatusReturn.java
index cca4a8f9c43..e754c6d2ece 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeStatusReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumeStatusReturn.java
@@ -150,15 +150,15 @@ private GlusterServerService parseServiceInfo(Map<String, Object> volumeServiceI
             if (brickStatus.toUpperCase().equals(ONLINE)) {
                 serviceInfo.setStatus(GlusterServiceStatus.RUNNING);
                 // parse the port and pid only if the service is running.
-                if (volumeServiceInfo.containsKey(PORT) && StringUtils.isNumeric((String)volumeServiceInfo.get(PORT))) {
+                if (volumeServiceInfo.containsKey(PORT) && StringUtils.isNumeric((String) volumeServiceInfo.get(PORT))) {
                     serviceInfo.setPort(Integer.parseInt((String) volumeServiceInfo.get(PORT)));
                 }
 
-                if (volumeServiceInfo.containsKey(RDMA_PORT) && StringUtils.isNumeric((String)volumeServiceInfo.get(RDMA_PORT))) {
+                if (volumeServiceInfo.containsKey(RDMA_PORT) && StringUtils.isNumeric((String) volumeServiceInfo.get(RDMA_PORT))) {
                     serviceInfo.setRdmaPort(Integer.parseInt((String) volumeServiceInfo.get(RDMA_PORT)));
                 }
 
-                if (volumeServiceInfo.containsKey(PID) && StringUtils.isNumeric((String)volumeServiceInfo.get(PID))) {
+                if (volumeServiceInfo.containsKey(PID) && StringUtils.isNumeric((String) volumeServiceInfo.get(PID))) {
                     serviceInfo.setPid(Integer.parseInt((String) volumeServiceInfo.get(PID)));
                 }
             } else {
@@ -208,11 +208,11 @@ private BrickProperties getBrickProperties(GlusterVolumeEntity volume, Map<Strin
             if (brickStatus.toUpperCase().equals(ONLINE)) {
                 brickProperties.setStatus(GlusterStatus.UP);
                 boolean portPresent = false;
-                if (brick.containsKey(PORT) && StringUtils.isNumeric((String)brick.get(PORT))) {
+                if (brick.containsKey(PORT) && StringUtils.isNumeric((String) brick.get(PORT))) {
                     brickProperties.setPort(Integer.parseInt((String) brick.get(PORT)));
                     portPresent = true;
                 }
-                if (brick.containsKey(RDMA_PORT) && StringUtils.isNumeric((String)brick.get(RDMA_PORT))) {
+                if (brick.containsKey(RDMA_PORT) && StringUtils.isNumeric((String) brick.get(RDMA_PORT))) {
                     brickProperties.setRdmaPort(Integer.parseInt((String) brick.get(RDMA_PORT)));
                     portPresent = true;
                 }
@@ -221,7 +221,7 @@ private BrickProperties getBrickProperties(GlusterVolumeEntity volume, Map<Strin
                     brickProperties.setStatus(GlusterStatus.DOWN);
                 }
 
-                if (brick.containsKey(PID) && StringUtils.isNumeric((String)brick.get(PID))) {
+                if (brick.containsKey(PID) && StringUtils.isNumeric((String) brick.get(PID))) {
                     brickProperties.setPid(Integer.parseInt((String) brick.get(PID)));
                 }
             } else {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturn.java
index 612861fbab2..e7cb5ec2d1d 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturn.java
@@ -60,7 +60,7 @@ public GlusterVolumesListReturn(Guid clusterId, Map<String, Object> innerMap) {
         super(innerMap);
         this.clusterId = clusterId;
 
-        if(getStatus().code != 0) {
+        if (getStatus().code != 0) {
             return;
         }
 
@@ -69,7 +69,7 @@ public GlusterVolumesListReturn(Guid clusterId, Map<String, Object> innerMap) {
         for (Entry<String, Object> entry : volumesMap.entrySet()) {
             log.debug("received volume '{}'", entry.getKey());
 
-            GlusterVolumeEntity volume = getVolume((Map<String, Object>)entry.getValue());
+            GlusterVolumeEntity volume = getVolume((Map<String, Object>) entry.getValue());
             volumes.put(volume.getId(), volume);
         }
     }
@@ -79,11 +79,11 @@ private GlusterVolumeEntity getVolume(Map<String, Object> map) {
         GlusterVolumeEntity volume = new GlusterVolumeEntity();
 
         volume.setClusterId(clusterId);
-        volume.setId(Guid.createGuidFromStringDefaultEmpty((String)map.get(UUID)));
-        volume.setName((String)map.get(VOLUME_NAME));
-        volume.setVolumeType((String)map.get(VOLUME_TYPE));
+        volume.setId(Guid.createGuidFromStringDefaultEmpty((String) map.get(UUID)));
+        volume.setName((String) map.get(VOLUME_NAME));
+        volume.setVolumeType((String) map.get(VOLUME_TYPE));
 
-        if (volume.getVolumeType() !=null) {
+        if (volume.getVolumeType() != null) {
             if (volume.getVolumeType().isReplicatedType()) {
                 volume.setReplicaCount(Integer.valueOf((String) map.get(REPLICA_COUNT)));
                 boolean isArbiter = map.containsKey(IS_ARBITER)
@@ -98,36 +98,36 @@ private GlusterVolumeEntity getVolume(Map<String, Object> map) {
                 volume.setRedundancyCount(Integer.valueOf((String) map.get(REDUNDANCY_COUNT)));
             }
         }
-        for(Object transportType : (Object[])map.get(TRANSPORT_TYPE)) {
-            volume.addTransportType(TransportType.valueOf((String)transportType));
+        for (Object transportType : (Object[]) map.get(TRANSPORT_TYPE)) {
+            volume.addTransportType(TransportType.valueOf((String) transportType));
         }
 
-        String volStatus = (String)map.get(VOLUME_STATUS);
-        if(volStatus.toUpperCase().equals(VOLUME_STATUS_ONLINE)) {
+        String volStatus = (String) map.get(VOLUME_STATUS);
+        if (volStatus.toUpperCase().equals(VOLUME_STATUS_ONLINE)) {
             volume.setStatus(GlusterStatus.UP);
         } else {
             volume.setStatus(GlusterStatus.DOWN);
         }
 
         try {
-            if (map.get(BRICKS_INFO) != null && ((Object[])map.get(BRICKS_INFO)).length > 0) {
-                volume.setBricks(getBricks(volume.getId(), (Object[])map.get(BRICKS_INFO), true));
+            if (map.get(BRICKS_INFO) != null && ((Object[]) map.get(BRICKS_INFO)).length > 0) {
+                volume.setBricks(getBricks(volume.getId(), (Object[]) map.get(BRICKS_INFO), true));
             } else {
-                volume.setBricks(getBricks(volume.getId(), (Object[])map.get(BRICKS), false));
+                volume.setBricks(getBricks(volume.getId(), (Object[]) map.get(BRICKS), false));
             }
         } catch (Exception e) {
             log.error("Could not populate bricks of volume '{}' on cluster '{}': {}", volume.getName(), clusterId, e.getMessage());
             log.debug("Exception", e);
         }
-        volume.setOptions(getOptions((Map<String, Object>)map.get(OPTIONS)));
+        volume.setOptions(getOptions((Map<String, Object>) map.get(OPTIONS)));
 
         return volume;
     }
 
     private Map<String, String> getOptions(Map<String, Object> map) {
         Map<String, String> options = new HashMap<>();
-        for(Entry<String, Object> entry : map.entrySet()) {
-            options.put(entry.getKey(), (String)entry.getValue());
+        for (Entry<String, Object> entry : map.entrySet()) {
+            options.put(entry.getKey(), (String) entry.getValue());
         }
         return options;
     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeBrickVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeBrickVDSCommand.java
index 71f6b3eca21..02be33fbb84 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeBrickVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ResetGlusterVolumeBrickVDSCommand.java
@@ -11,7 +11,7 @@ public ResetGlusterVolumeBrickVDSCommand(P parameters) {
     protected void executeVdsBrokerCommand() {
         status = getBroker().glusterVolumeResetBrickStart(getParameters().getVolumeName(),
                 getParameters().getExistingBrickDir());
-        if(status.status.code == 0) {
+        if (status.status.code == 0) {
              status = getBroker().glusterVolumeResetBrickCommitForce(getParameters().getVolumeName(),
                     getParameters().getExistingBrickDir());
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/HttpImageTaskVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/HttpImageTaskVDSCommand.java
index ad3f42438f0..ce2ff2b7ae1 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/HttpImageTaskVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/HttpImageTaskVDSCommand.java
@@ -96,7 +96,7 @@ protected void executeHttpMethod(final T method) {
         String response = null;
         try {
             HttpEntity entity = httpResponse.getEntity();
-            if(entity!=null){
+            if (entity != null) {
                 response = EntityUtils.toString(entity);
             }
         } catch (Exception e) {
@@ -114,7 +114,7 @@ protected void executeHttpMethod(final T method) {
         proceedProxyReturnValue();
     }
 
-    protected void handleOkResponse(HttpResponse httpResponse) {}
+    protected void handleOkResponse(HttpResponse httpResponse) { }
 
     protected String processResponseHeaderValue(HttpResponse response, String headerName, String expectedValue) {
         Header header = response.getFirstHeader(headerName);
@@ -164,7 +164,7 @@ protected void throwVdsErrorException(String message, EngineError error) {
         throw outEx;
     }
 
-    protected void prepareMethod() {}
+    protected void prepareMethod() { }
 
     protected abstract ConfigValues getConfigValueTimeLimitForOperation();
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
index aa62183701f..6d444f1b3f5 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
@@ -245,7 +245,7 @@ public static Long assignLongValue(Map<String, Object> input, String name) {
     }
 
     @Override
-    protected void logToAudit(){
+    protected void logToAudit() {
         AuditLogable logable = new AuditLogableImpl();
         logable.addCustomValue("CommandName", getCommandName());
         logable.addCustomValue("message", getReturnStatus().message);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyImpl.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyImpl.java
index bcb58f4f547..b851ed17de2 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyImpl.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsProxyImpl.java
@@ -722,7 +722,7 @@ private void runStoragePoolUpEvent(final StoragePool storagePool) {
             @Override
             public void run() {
                 try {
-                    if (isMasterDomainUp())  {
+                    if (isMasterDomainUp()) {
                         getEventListener().storagePoolUpEvent(storagePool);
                     }
                 } catch (RuntimeException exp) {
@@ -952,7 +952,7 @@ private void waitForVdsIfIsInitializing(Guid curVdsId) {
             VDS vds = vdsDao.get(curVdsId);
             String vdsName = vds.getName();
             if (vds.getStatus() == VDSStatus.Initializing) {
-                final int DELAY = 5;// 5 Sec
+                final int DELAY = 5; // 5 Sec
                 int total = 0;
                 Integer maxSecToWait = Config.getValue(ConfigValues.WaitForVdsInitInSec);
                 while (total <= maxSecToWait
@@ -1249,7 +1249,7 @@ private static boolean shouldProcessVdsDomainReport(VDS vds) {
      * @link StorageDomainStatus#Maintenance or @link StorageDomainStatus#PreparingForMaintenance.
      */
     private Set<Guid> handleDomainsInMaintenanceForHost(Collection<Guid> monitoredDomains) {
-        Set<Guid>  domainsInMaintenance = new HashSet<>();
+        Set<Guid> domainsInMaintenance = new HashSet<>();
         Set<Guid> maintInPool = new HashSet<>(
                 storageDomainStaticDao.getAllIds(
                         storagePoolId, StorageDomainStatus.Maintenance));
@@ -1614,7 +1614,7 @@ public void hostsStorageConnectionsAndPoolMetadataRefresh() {
         final StoragePool storagePool = storagePoolDao.get(storagePoolId);
         final Guid masterDomainId =
                 storageDomainDao.getMasterStorageDomainIdForPool(storagePoolId);
-        final  List<StoragePoolIsoMap> storagePoolIsoMap = storagePoolIsoMapDao.getAllForStoragePool(storagePoolId);
+        final List<StoragePoolIsoMap> storagePoolIsoMap = storagePoolIsoMapDao.getAllForStoragePool(storagePoolId);
 
         Map<String, Pair<String, String>> acquiredLocks = new HashMap<>();
         try {
@@ -1829,7 +1829,7 @@ private void removeVdsAsProblematic(List<Guid> nonOpVdss) {
 
     private void removeVdsFromUnseenDomainsReport(List<Guid> nonOpVdss) {
         log.info("Removing host(s) '{}' from hosts unseen domain report cache", nonOpVdss);
-        for(Guid id : nonOpVdss) {
+        for (Guid id : nonOpVdss) {
             clearVdsReportInfoOnUnseenDomain(id);
         }
     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/LeaseTaskInfoReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/LeaseTaskInfoReturn.java
index 63ffcbff222..413ce3bc8bd 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/LeaseTaskInfoReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/LeaseTaskInfoReturn.java
@@ -10,7 +10,7 @@ public LeaseTaskInfoReturn(Map<String, Object> innerMap) {
         super(innerMap);
     }
 
-    public String getTaskId(){
+    public String getTaskId() {
         return (String) innerMap.get(TASK_ID_KEY);
     }
 }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java
index a36456b63f0..fd0eb5b64e8 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcUtils.java
@@ -46,7 +46,7 @@ public static JsonRpcClient createStompClient(String hostname,
         connectionPolicy.setEventQueue(eventQueue);
 
         ClientPolicy clientPolicy = new ClientPolicy(clientTimeout, connectionRetry, heartbeat, IOException.class);
-        if (Config.getValue(ConfigValues.UseHostNameIdentifier)){
+        if (Config.getValue(ConfigValues.UseHostNameIdentifier)) {
             log.debug(identifierLogMessage, hostname);
             connectionPolicy.setIdentifier(hostname);
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
index 12fedf04ed5..ecfa7d5db87 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/jsonrpc/JsonRpcVdsServer.java
@@ -1214,7 +1214,7 @@ public GlusterTaskInfoReturn glusterVolumeRemoveBricksStart(String volumeName,
             int replicaCount,
             Boolean forceRemove) {
         String command = "GlusterVolume.removeBrickStart";
-        if(forceRemove) {
+        if (forceRemove) {
             command = "GlusterVolume.removeBrickForce";
         }
         JsonRpcRequest request = new RequestBuilder(command).withParameter("volumeName", volumeName)
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/DomainXmlUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/DomainXmlUtils.java
index 76996c5aa34..a1a9e65a4a8 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/DomainXmlUtils.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/DomainXmlUtils.java
@@ -17,7 +17,7 @@ public class DomainXmlUtils {
     private static final List<String> ADDRESS_PROPERTIES = Arrays.asList(
             "type", "slot", "bus", "domain", "function", "controller", "target", "unit", "port", "multifunction", "base");
 
-    public static  String parseMacAddress(XmlNode node) {
+    public static String parseMacAddress(XmlNode node) {
         XmlNode macNode = node.selectSingleNode("mac");
         return macNode.attributes.get("address").getValue();
     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/Hotunplug.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/Hotunplug.java
index 5b93b9fedcf..f6b76b43d76 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/Hotunplug.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/Hotunplug.java
@@ -32,7 +32,7 @@ public Hotunplug setDevices(Devices devices) {
         return this;
     }
 
-    public static class Devices  {
+    public static class Devices {
         private Device nic;
         private Device disk;
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmConverter.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmConverter.java
index ca7b7807ded..7cff67be432 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmConverter.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmConverter.java
@@ -103,7 +103,7 @@ private Map<String, Object> parseVideo(XmlNode dev) {
     }
 
     private Map<String, Object> parseInterface(XmlNode dev) {
-        switch(DomainXmlUtils.parseAttribute(dev, "type")) {
+        switch (DomainXmlUtils.parseAttribute(dev, "type")) {
         case "bridge":
             Map<String, Object> device = new HashMap<>();
             device.put(VdsProperties.Device, DomainXmlUtils.parseAttribute(dev, "type"));
@@ -121,7 +121,7 @@ private Map<String, Object> parseInterface(XmlNode dev) {
     }
 
     private Map<String, Object> parseDisk(XmlNode dev) {
-        switch(DomainXmlUtils.parseAttribute(dev, "device")) {
+        switch (DomainXmlUtils.parseAttribute(dev, "device")) {
         case "disk":
             Map<String, String> uuids = parseDiskUuids(DomainXmlUtils.parseDiskPath(dev));
             if (uuids == null) {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmDevicesConverter.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmDevicesConverter.java
index 52b2bda30cb..17eae32f76a 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmDevicesConverter.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/libvirt/VmDevicesConverter.java
@@ -267,7 +267,7 @@ private List<Map<String, Object>> parseMemories(XmlDocument document, List<VmDev
     }
 
     private String getDevicePath(final HostDevice hostDevice) {
-        return (String)hostDevice.getSpecParams().get(VdsProperties.DEVICE_PATH);
+        return (String) hostDevice.getSpecParams().get(VdsProperties.DEVICE_PATH);
     }
 
     private List<Map<String, Object>> parseNvdimms(XmlDocument document, List<VmDevice> devices, Guid hostId) {
@@ -399,7 +399,7 @@ private List<Map<String, Object>> parseManagedHostDevices(XmlDocument document,
     }
 
     private List<Map<String, Object>> parseRedirs(XmlDocument document, List<VmDevice> devices) {
-        List<VmDevice> dbDevices= filterDevices(devices, VmDeviceGeneralType.REDIR);
+        List<VmDevice> dbDevices = filterDevices(devices, VmDeviceGeneralType.REDIR);
 
         List<Map<String, Object>> result = new ArrayList<>();
         for (XmlNode node : document.selectNodes("//*/redirdev")) {
@@ -680,7 +680,7 @@ private Optional<VmDevice> correlateWithAlias(Map<String, Object> device, List<V
             if (result.isPresent()) {
                 return result;
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             log.debug("Received unexpected user-alias: {}", alias);
         }
         // We need it in case the user have a VM running from old versions(4.1) without shutting it down as a backward
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoring.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoring.java
index 6e497cc27d1..a8e93628f69 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoring.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/HostMonitoring.java
@@ -125,7 +125,7 @@ public void postProcessRefresh(boolean succeeded) {
         } catch (Throwable t) {
             logFailureMessage("ResourceManager::refreshVdsRunTimeInfo:", t);
             log.debug("Exception", t);
-        }  finally {
+        } finally {
             vdsManager.afterRefreshTreatment(succeeded);
         }
     }
@@ -322,7 +322,7 @@ private void checkVdsMemoryThreshold(Cluster cluster, VdsStatistics stat) {
 
         if (LogMaxMemoryUsedThresholdType.PERCENTAGE == cluster.getLogMaxMemoryUsedThresholdType()) {
             checkVdsMemoryThresholdPercentage(cluster, stat);
-        }  else {
+        } else {
             checkVdsMemoryThresholdAbsoluteValue(cluster, stat);
         }
     }
@@ -433,7 +433,7 @@ private void checkVdsSwapThreshold(VdsStatistics stat) {
 
         // Allow the space to be up to 2% lower than as defined in configuration
         Long allowedMinAvailableThreshold = Math.round(minAvailableThreshold.doubleValue() * THRESHOLD);
-        AuditLogType valueToLog = stat.getSwapFree() <  allowedMinAvailableThreshold ?
+        AuditLogType valueToLog = stat.getSwapFree() < allowedMinAvailableThreshold ?
                 AuditLogType.VDS_LOW_SWAP :
                 AuditLogType.VDS_HIGH_SWAP_USE;
 
@@ -544,7 +544,7 @@ public void onResponse(Map<String, Object> response) {
                     vdsManager.setStatus(VDSStatus.Up, vds);
                 }
                 refreshVdsRunTimeInfo(vdsUpOrGoingToMaintenance);
-            } catch(Throwable t) {
+            } catch (Throwable t) {
                 onFailure(t);
             }
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/RefresherFactory.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/RefresherFactory.java
index 00c41c94f5c..0208e8ed84c 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/RefresherFactory.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/RefresherFactory.java
@@ -17,7 +17,7 @@ public VmStatsRefresher createVmStatsRefresher(VdsManager vdsManager, ResourceMa
 
     public HostConnectionRefresherInterface createHostConnectionRefresher(VdsManager vdsManager,
             ResourceManager resourceManager) {
-        switch(vdsManager.getVdsType()) {
+        switch (vdsManager.getVdsType()) {
         case KubevirtNode:
             return Injector.injectMembers(new KubevirtHostConnectionRefresher(vdsManager));
         default:
@@ -26,7 +26,7 @@ public HostConnectionRefresherInterface createHostConnectionRefresher(VdsManager
     }
 
     private VmStatsRefresher getVmStatsRefresher(VdsManager vdsManager, ResourceManager resourceManager) {
-        switch(vdsManager.getVdsType()) {
+        switch (vdsManager.getVdsType()) {
         case KubevirtNode:
             return new KubevirtVmStatsRefresher(vdsManager);
         default:
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmAnalyzer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmAnalyzer.java
index 5e769670b13..dd46dee7529 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmAnalyzer.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmAnalyzer.java
@@ -214,7 +214,7 @@ private void processUnmanagedVm() {
     }
 
     void proceedVmReportedOnOtherHost() {
-        switch(vdsmVm.getVmDynamic().getStatus()) {
+        switch (vdsmVm.getVmDynamic().getStatus()) {
         case MigratingTo:
             if (dbVm.getRunOnVds() == null) {
                 log.info("VM '{}' is found as migrating on VDS '{}'({}) ",
@@ -483,7 +483,7 @@ private void abortVmMigration(VmExitStatus exitStatus, String exitMessage, VmExi
     }
 
     private void auditVmMigrationAbort(String exitMessage) {
-        AuditLogableBase logable =Injector.injectMembers(new AuditLogableBase(vdsManager.getVdsId(), dbVm.getId()));
+        AuditLogableBase logable = Injector.injectMembers(new AuditLogableBase(vdsManager.getVdsId(), dbVm.getId()));
         logable.addCustomValue("MigrationError", exitMessage);
         auditLog(logable, AuditLogType.VM_MIGRATION_ABORT);
     }
@@ -961,7 +961,7 @@ private void updateVmStatistics() {
     }
 
     private void updateDiskImageDynamics() {
-        vmDiskImageDynamicToSave =  vdsmVm.getDiskStatistics().stream()
+        vmDiskImageDynamicToSave = vdsmVm.getDiskStatistics().stream()
                 .map(diskImageDynamic -> new Pair<>(dbVm.getId(), diskImageDynamic))
                 .collect(Collectors.toList());
     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmDevicesMonitoring.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmDevicesMonitoring.java
index 8abfecd6655..530ca601422 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmDevicesMonitoring.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmDevicesMonitoring.java
@@ -165,7 +165,7 @@ private void addVmToSaveHash(Guid vmId) {
          */
         public void updateVm(Guid vmId, String vdsmHash) {
             DevicesChange devicesChange = isVmDevicesChanged(vmId, vdsmHash, fetchTime);
-            switch(devicesChange) {
+            switch (devicesChange) {
             case CHANGED:
                 if (!tryLockVmDevices(vmId)) {
                     break;
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AttachManagedBlockStorageVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AttachManagedBlockStorageVolumeVDSCommand.java
index 5910f1036d1..a7d191ea7cc 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AttachManagedBlockStorageVolumeVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/AttachManagedBlockStorageVolumeVDSCommand.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.common.vdscommands.AttachManagedBlockStorageVolumeVDSCommandParameters;
 
-public class AttachManagedBlockStorageVolumeVDSCommand<P extends AttachManagedBlockStorageVolumeVDSCommandParameters> extends VdsBrokerCommand<P>{
+public class AttachManagedBlockStorageVolumeVDSCommand<P extends AttachManagedBlockStorageVolumeVDSCommandParameters> extends VdsBrokerCommand<P> {
 
     private DeviceInfoReturn deviceInfoReturn;
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java
index 5ddc063ece4..fa155a79ccf 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/BrokerCommandBase.java
@@ -204,7 +204,7 @@ protected void proceedProxyReturnValue() {
         throw outEx;
     }
 
-    private void logToAuditIfNeeded(){
+    private void logToAuditIfNeeded() {
         if (shouldLogToAudit()) {
             logToAudit();
         }
@@ -215,7 +215,7 @@ protected boolean shouldLogToAudit() {
         return !getParameters().getExpectedEngineErrors().contains(getReturnValueFromStatus(getReturnStatus()));
     }
 
-    protected void logToAudit(){
+    protected void logToAudit() {
     }
 
     private VDSExceptionBase createException() {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ChangeDiskVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ChangeDiskVDSCommand.java
index 58e566afa31..e5b92c55fd9 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ChangeDiskVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ChangeDiskVDSCommand.java
@@ -17,7 +17,7 @@ public ChangeDiskVDSCommand(P parameters) {
 
     @Override
     protected void executeVdsBrokerCommand() {
-        if (getParameters().getIface() != null)  {
+        if (getParameters().getIface() != null) {
             Map<String, Object> driveSpec = new HashMap<>();
             driveSpec.put(VdsProperties.INTERFACE, getParameters().getIface());
             driveSpec.put(VdsProperties.Index, Integer.toString(getParameters().getIndex()));
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
index 4c951510e38..fb3b5d0aa8f 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandler.java
@@ -70,7 +70,7 @@ private CloudInitHandler() {
         files = null;
     }
 
-    public CloudInitHandler (VmInit vmInit){
+    public CloudInitHandler (VmInit vmInit) {
         this.vmInit = vmInit;
         metaData = new HashMap<>();
         userData = new HashMap<>();
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DestroyVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DestroyVDSCommand.java
index f8cdde9941e..ea65464fa39 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DestroyVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DestroyVDSCommand.java
@@ -36,7 +36,7 @@ protected void proceedProxyReturnValue() {
             EngineError returnStatus = getReturnValueFromStatus(getReturnStatus());
             switch (returnStatus) {
                 case noVM:
-                    if (getParameters().isIgnoreNoVm()) {// do not log error
+                    if (getParameters().isIgnoreNoVm()) { // do not log error
                         log.info("Failed to destroy VM '{}' because VM does not exist, ignoring", getParameters().getVmId());
                         return;
                     }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java
index c00c00299be..af271b8ec23 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DetachManagedBlockStorageVolumeVDSCommand.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.common.vdscommands.AttachManagedBlockStorageVolumeVDSCommandParameters;
 
-public class DetachManagedBlockStorageVolumeVDSCommand<P extends AttachManagedBlockStorageVolumeVDSCommandParameters> extends VdsBrokerCommand<P>{
+public class DetachManagedBlockStorageVolumeVDSCommand<P extends AttachManagedBlockStorageVolumeVDSCommandParameters> extends VdsBrokerCommand<P> {
 
     public DetachManagedBlockStorageVolumeVDSCommand(P parameters) {
         super(parameters);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DevicesVisibilityMapReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DevicesVisibilityMapReturn.java
index 34f1ae7545e..4e23a7508b1 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DevicesVisibilityMapReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DevicesVisibilityMapReturn.java
@@ -14,7 +14,7 @@ public class DevicesVisibilityMapReturn extends StatusReturn {
     @SuppressWarnings("unchecked")
     public DevicesVisibilityMapReturn(Map<String, Object> innerMap) {
         super(innerMap);
-        devicesVisibilityResult = (Map<String, String>)innerMap.get(DEVICES_VISIBILITY);
+        devicesVisibilityResult = (Map<String, String>) innerMap.get(DEVICES_VISIBILITY);
     }
 
     public Map<String, String> getDevicesVisibilityResult() {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetLldpVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetLldpVDSCommand.java
index d95bd325c88..19ec908e62f 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetLldpVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetLldpVDSCommand.java
@@ -26,13 +26,13 @@ protected void executeVdsBrokerCommand() {
 
     private Map<String, LldpInfo> parseLldpInfos(Map<String, Object> lldps) {
         return lldps.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey,
-                entry -> parseLldpInfo((Map<String, Object>)entry.getValue())));
+                entry -> parseLldpInfo((Map<String, Object>) entry.getValue())));
     }
 
     private LldpInfo parseLldpInfo(Map<String, Object> lldp) {
         LldpInfo lldpInfo = new LldpInfo();
-        lldpInfo.setEnabled((boolean)lldp.get(VdsProperties.LLDP_ENABLED));
-        lldpInfo.setTlvs(parseTlvs((Object[])lldp.get(VdsProperties.LLDP_TLVS)));
+        lldpInfo.setEnabled((boolean) lldp.get(VdsProperties.LLDP_ENABLED));
+        lldpInfo.setTlvs(parseTlvs((Object[]) lldp.get(VdsProperties.LLDP_TLVS)));
         return lldpInfo;
     }
 
@@ -43,13 +43,13 @@ private List<Tlv> parseTlvs(Object[] tlvs) {
 
     private Tlv parseTlv(Map<String, Object> in) {
         Tlv out = new Tlv();
-        out.setName((String)(in.get(VdsProperties.TLV_NAME)));
-        out.setType((Integer)(in.get(VdsProperties.TLV_TYPE)));
+        out.setName((String) (in.get(VdsProperties.TLV_NAME)));
+        out.setType((Integer) (in.get(VdsProperties.TLV_TYPE)));
         if (in.containsKey(VdsProperties.TLV_OUI)) {
-            out.setOui((Integer)(in.get(VdsProperties.TLV_OUI)));
+            out.setOui((Integer) (in.get(VdsProperties.TLV_OUI)));
         }
         if (in.containsKey(VdsProperties.TLV_SUBTYPE)) {
-            out.setSubtype((Integer)(in.get(VdsProperties.TLV_SUBTYPE)));
+            out.setSubtype((Integer) (in.get(VdsProperties.TLV_SUBTYPE)));
         }
         Map<String, String> entries = (Map<String, String>) in.get(VdsProperties.TLV_PROPERTIES);
         out.getProperties().putAll(entries);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
index c53714282cd..3f5a2b6b665 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
@@ -99,7 +99,7 @@ private Pair<StorageDomainStatic, Guid> buildStorageStaticFromStruct(Map<String,
                     false));
         }
         returnValue.setFirst(sdStatic);
-        Object[] poolUUIDs = (Object[])struct.get("pool");
+        Object[] poolUUIDs = (Object[]) struct.get("pool");
         if (poolUUIDs.length != 0) {
             returnValue.setSecond(Guid.createGuidFromString(poolUUIDs[0].toString()));
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkQosMapper.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkQosMapper.java
index 843d6cb277d..2ab62b620a2 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkQosMapper.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HostNetworkQosMapper.java
@@ -78,6 +78,6 @@ private Integer deserializeValue(Map<String, Object> entry, String curveKey, lon
         // json-rpc de-serializes a value to integer or to long according
         // to its magnitude, so convert int to long
         long avg = ((Number) parameters.get(VdsProperties.HOST_QOS_AVERAGE)).longValue();
-        return (int)(avg / conversionRate);
+        return (int) (avg / conversionRate);
     }
 }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugOrUnplugNicVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugOrUnplugNicVDSCommand.java
index 5a9f3239ed7..051be7892b3 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugOrUnplugNicVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HotPlugOrUnplugNicVDSCommand.java
@@ -7,7 +7,7 @@
 
 import org.ovirt.engine.core.common.vdscommands.VmNicDeviceVDSParameters;
 
-public abstract class HotPlugOrUnplugNicVDSCommand<P  extends VmNicDeviceVDSParameters> extends VdsBrokerCommand<P> {
+public abstract class HotPlugOrUnplugNicVDSCommand<P extends VmNicDeviceVDSParameters> extends VdsBrokerCommand<P> {
 
     public HotPlugOrUnplugNicVDSCommand(P parameters) {
         super(parameters);
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
index 1b3f460ab0b..05fc2073886 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java
@@ -151,7 +151,7 @@ Future<Map<String, Object>> setupNetworks(Map networks,
     StatusOnlyReturn setSafeNetworkConfig();
 
     FenceStatusReturn fenceNode(String ip, String port, String type, String user, String password,
-             String action, String secured, String options,  Map<String, Object> fencingPolicy);
+             String action, String secured, String options, Map<String, Object> fencingPolicy);
 
     ServerConnectionStatusReturn connectStorageServer(int serverType, String spUUID, Map<String, String>[] args);
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IgnitionHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IgnitionHandler.java
index a1e79bd4004..3c994132324 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IgnitionHandler.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IgnitionHandler.java
@@ -239,7 +239,7 @@ private boolean userExists(String customScript) {
         JsonObject reader = Json.createReader(new StringReader(customScript)).readObject();
         if (reader.containsKey("passwd")) {
             if (reader.getJsonObject("passwd").containsKey("users")) {
-                for(JsonValue user: reader.getJsonObject("passwd").getJsonArray("users")){
+                for (JsonValue user: reader.getJsonObject("passwd").getJsonArray("users")) {
                     return user.toString().replace("\"", "").contains(vmInit.getUserName());
                 }
             }
@@ -258,7 +258,7 @@ private JsonObject userIgnitionSnippet() {
         if (vmInit.getAuthorizedKeys() != null && !vmInit.getAuthorizedKeys().isEmpty()) {
             JsonArrayBuilder keys = Json.createArrayBuilder();
             // adding ssh keys
-            for(String key: vmInit.getAuthorizedKeys().split("(\\r?\\n|\\r)+")){
+            for (String key: vmInit.getAuthorizedKeys().split("(\\r?\\n|\\r)+")) {
                 if (!StringUtils.isEmpty(key)) {
                     keys.add(key);
                 }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IoTuneUtils.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IoTuneUtils.java
index 80d12c13742..d32fca5facc 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IoTuneUtils.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IoTuneUtils.java
@@ -22,8 +22,8 @@ public static Map<String, Long> ioTuneMapFrom(StorageQos storageQos) {
 
         ioTuneMap.put(VdsProperties.TotalBytesSec, convertThroughput(storageQos.getMaxThroughput()));
         ioTuneMap.put(VdsProperties.TotalIopsSec, convertIops(storageQos.getMaxIops()));
-        ioTuneMap.put(VdsProperties.ReadBytesSec,  convertThroughput(storageQos.getMaxReadThroughput()));
-        ioTuneMap.put(VdsProperties.ReadIopsSec,  convertIops(storageQos.getMaxReadIops()));
+        ioTuneMap.put(VdsProperties.ReadBytesSec, convertThroughput(storageQos.getMaxReadThroughput()));
+        ioTuneMap.put(VdsProperties.ReadIopsSec, convertIops(storageQos.getMaxReadIops()));
         ioTuneMap.put(VdsProperties.WriteBytesSec, convertThroughput(storageQos.getMaxWriteThroughput()));
         ioTuneMap.put(VdsProperties.WriteIopsSec, convertIops(storageQos.getMaxWriteIops()));
 
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IsoPrefixVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IsoPrefixVDSCommand.java
index 430efcfe48b..9c25a933a38 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IsoPrefixVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IsoPrefixVDSCommand.java
@@ -30,7 +30,7 @@ private String getIsoPrefix() {
             return cachedIsoPrefix;
         }
 
-        synchronized(getLockObjForStoragePool(storagePoolId)) {
+        synchronized (getLockObjForStoragePool(storagePoolId)) {
             cachedIsoPrefix = storagePoolIdToIsoPrefix.get(storagePoolId);
             if (cachedIsoPrefix != null) {
                 return cachedIsoPrefix;
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/PrepareImageReturn.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/PrepareImageReturn.java
index 21d7c1b724d..df249448c63 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/PrepareImageReturn.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/PrepareImageReturn.java
@@ -5,14 +5,14 @@
 import org.ovirt.engine.core.vdsbroker.irsbroker.StatusReturn;
 
 public class PrepareImageReturn extends StatusReturn {
-    private static final String PATH= "path";
-    private static final String INFO= "info";
+    private static final String PATH = "path";
+    private static final String INFO = "info";
     private String imagePath;
 
     @SuppressWarnings("unchecked")
     public PrepareImageReturn(Map<String, Object> innerMap) {
         super(innerMap);
-        imagePath = (String) ((Map<String, Object>)innerMap.get(INFO)).get(PATH);
+        imagePath = (String) ((Map<String, Object>) innerMap.get(INFO)).get(PATH);
     }
 
     public String getImagePath() {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStopVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStopVDSCommand.java
index 33e368bb961..16f262c6801 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStopVDSCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStopVDSCommand.java
@@ -54,7 +54,7 @@ private EngineLock retrieveVdsExecutionLock() {
             Map<String, Pair<String, String>> exsluciveLock = Collections.singletonMap(getParameters().getVdsId().toString(), new Pair<>(LockingGroup.VDS_EXECUTION.toString(), EngineMessage.ACTION_TYPE_FAILED_OBJECT_LOCKED.toString()));
             lock = new EngineLock(exsluciveLock, null);
         }
-        return  lock;
+        return lock;
     }
 
     @Override
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
index 43f9bbad71e..79b67d76401 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SysprepHandler.java
@@ -54,7 +54,7 @@ public String getSysPrep(VM vm, SysPrepParams sysPrepParams) {
 
         Integer nameLength = Config.getValue(ConfigValues.MaxVmNameLengthSysprep);
         if (hostName != null && hostName.length() > nameLength) {
-            hostName  = hostName.substring(0, nameLength);
+            hostName = hostName.substring(0, nameLength);
         }
 
         if (sysPrepContent.length() > 0) {
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java
index 900a148e76a..147318bc2a5 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerCommand.java
@@ -181,7 +181,7 @@ protected VDSNetworkException createNetworkException(Exception ex) {
     }
 
     @Override
-    protected void logToAudit(){
+    protected void logToAudit() {
         if (isPolicyResetMessage(getReturnStatus().message)) {
             return;
         }
diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
index 311dad4f977..bede27c286a 100644
--- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
+++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java
@@ -244,7 +244,7 @@ public ArrayList<VmNetworkInterface> buildVmNetworkInterfacesFromDevices(Map<Str
                 Map<String, Object> deviceMap = (Map<String, Object>) device;
                 if (VdsProperties.VM_INTERFACE_DEVICE_TYPE.equals(deviceMap.get(VdsProperties.Type))) {
                     VmNetworkInterface nic = new VmNetworkInterface();
-                    nic.setId(Guid.createGuidFromString((String)deviceMap.get(VdsProperties.DeviceId)));
+                    nic.setId(Guid.createGuidFromString((String) deviceMap.get(VdsProperties.DeviceId)));
                     nic.setMacAddress((String) deviceMap.get(VdsProperties.MAC_ADDR));
                     nic.setName((String) deviceMap.get(VdsProperties.Name));
                     // FIXME we can't deduce the network profile by the network name. its many to many.
@@ -270,7 +270,7 @@ public ArrayList<VmNetworkInterface> buildVmNetworkInterfacesFromDevices(Map<Str
         return nics;
     }
 
-    public VmDevice buildConsoleDevice(Map<String, Object> vmStruct, Guid vmId){
+    public VmDevice buildConsoleDevice(Map<String, Object> vmStruct, Guid vmId) {
         Object[] devices = (Object[]) vmStruct.get(VdsProperties.Devices);
         if (devices != null) {
             for (Object device : devices) {
@@ -349,7 +349,7 @@ private VmStatic buildVmStaticDataFromExternalProvider(Map<String, Object> struc
      */
     private static void addGraphicsDeviceFromExternalProvider(VmStatic vmStatic, Map<String, Object> struct) {
         Object graphicsName = struct.get(VdsProperties.GRAPHICS_DEVICE);
-        Object videoName =  struct.get(VdsProperties.VIDEO_DEVICE);
+        Object videoName = struct.get(VdsProperties.VIDEO_DEVICE);
         if (graphicsName == null || videoName == null) {
             return;
         }
@@ -682,11 +682,11 @@ private static void adjustDisplayIp(Map<GraphicsType, GraphicsInfo> graphicsInfo
 
     private static void updateGuestOsInfo(VmDynamic vm, Map<String, Object> struct) {
         Map<String, Object> guestOsInfoStruct = (Map<String, Object>) struct.get(VdsProperties.GUEST_OS_INFO);
-        if(guestOsInfoStruct.containsKey(VdsProperties.GUEST_OS_INFO_ARCH)) {
+        if (guestOsInfoStruct.containsKey(VdsProperties.GUEST_OS_INFO_ARCH)) {
             String arch = assignStringValue(guestOsInfoStruct, VdsProperties.GUEST_OS_INFO_ARCH);
             try {
                 vm.setGuestOsArch(arch);
-            } catch(IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 log.warn("Invalid or unknown guest architecture type '{}' received from guest agent", arch);
             }
         }
@@ -694,12 +694,12 @@ private static void updateGuestOsInfo(VmDynamic vm, Map<String, Object> struct)
         vm.setGuestOsCodename(assignStringValue(guestOsInfoStruct, VdsProperties.GUEST_OS_INFO_CODENAME));
         vm.setGuestOsDistribution(assignStringValue(guestOsInfoStruct, VdsProperties.GUEST_OS_INFO_DISTRIBUTION));
         vm.setGuestOsKernelVersion(assignStringValue(guestOsInfoStruct, VdsProperties.GUEST_OS_INFO_KERNEL));
-        if(guestOsInfoStruct.containsKey(VdsProperties.GUEST_OS_INFO_TYPE)) {
+        if (guestOsInfoStruct.containsKey(VdsProperties.GUEST_OS_INFO_TYPE)) {
             String osType = assignStringValue(guestOsInfoStruct, VdsProperties.GUEST_OS_INFO_TYPE);
             try {
                 OsType type = EnumUtils.valueOf(OsType.class, osType, true);
                 vm.setGuestOsType(type);
-            } catch(IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 log.warn("Invalid or unknown guest os type '{}' received from guest agent", osType);
             }
         } else {
@@ -874,7 +874,7 @@ public void updateVMStatisticsData(VmStatistics vm, Map<String, Object> struct)
         vm.setUsageMemPercent(assignIntValue(struct, VdsProperties.vm_usage_mem_percent));
 
         if (struct.containsKey(VdsProperties.vm_guest_mem_stats)) {
-            Map<String, Object> sub = (Map<String, Object>)struct.get(VdsProperties.vm_guest_mem_stats);
+            Map<String, Object> sub = (Map<String, Object>) struct.get(VdsProperties.vm_guest_mem_stats);
             if (sub.containsKey(VdsProperties.vm_guest_mem_buffered)) {
                 vm.setGuestMemoryBuffered(Long.parseLong(sub.get(VdsProperties.vm_guest_mem_buffered).toString()));
             }
@@ -990,11 +990,11 @@ public void updateVDSDynamicData(VDS vds, Map<String, String> vdsmNameMap, Map<S
 
         // parse out the HBAs available in this host
         Map<String, List<Map<String, String>>> hbas = new HashMap<>();
-        for (Map.Entry<String, Object[]> el: ((Map<String, Object[]>)struct.get(VdsProperties.HBAInventory)).entrySet()) {
+        for (Map.Entry<String, Object[]> el: ((Map<String, Object[]>) struct.get(VdsProperties.HBAInventory)).entrySet()) {
             List<Map<String, String>> devicesList = new ArrayList<>();
 
             for (Object device: el.getValue()) {
-                devicesList.add((Map<String, String>)device);
+                devicesList.add((Map<String, String>) device);
             }
 
             hbas.put(el.getKey(), devicesList);
@@ -1234,7 +1234,7 @@ private static RpmVersion getPackageRpmVersion(String packageName, Map<String, O
         return new RpmVersion(sb.toString());
     }
 
-    public void updateHardwareSystemInformation(Map<String, Object> hwInfo, VDS vds){
+    public void updateHardwareSystemInformation(Map<String, Object> hwInfo, VDS vds) {
         vds.setHardwareManufacturer(assignStringValue(hwInfo, VdsProperties.hwManufacturer));
         vds.setHardwareProductName(assignStringValue(hwInfo, VdsProperties.hwProductName));
         vds.setHardwareVersion(assignStringValue(hwInfo, VdsProperties.hwVersion));
@@ -1606,18 +1606,18 @@ private static void updateVDSDomainData(VDS vds, Map<String, Object> struct) {
                     data.setDelay(delay);
                     Boolean actual = Boolean.TRUE;
                     if (internalValue.containsKey(VdsProperties.actual)) {
-                        actual = (Boolean)internalValue.get(VdsProperties.actual);
+                        actual = (Boolean) internalValue.get(VdsProperties.actual);
                     }
                     data.setActual(actual);
                     Boolean acquired = Boolean.FALSE;
                     if (internalValue.containsKey(VdsProperties.acquired)) {
-                        acquired = (Boolean)internalValue.get(VdsProperties.acquired);
+                        acquired = (Boolean) internalValue.get(VdsProperties.acquired);
                     }
                     data.setAcquired(acquired);
 
                     Boolean valid = Boolean.FALSE;
                     if (internalValue.containsKey(VdsProperties.valid)) {
-                        valid = (Boolean)internalValue.get(VdsProperties.valid);
+                        valid = (Boolean) internalValue.get(VdsProperties.valid);
                     }
                     data.setValid(valid);
                     domainsData.add(data);
@@ -1847,7 +1847,7 @@ private static void initAppsList(Map<String, Object> vmStruct, VmDynamic vm) {
                         log.warn("Failed to convert app: [null] to string");
                         continue; // Don't process this
                     }
-                    if(appString == null) {
+                    if (appString == null) {
                         // Note: app cannot be null here anymore
                         log.warn("Failed to convert app: [" + app.getClass().getName() + "] is not a string");
                         continue; // Don't process this
@@ -1871,19 +1871,19 @@ private static void initGuestContainers(Map<String, Object> vmStruct, VmDynamic
             vm.setGuestContainers(new ArrayList<>());
             Object obj = vmStruct.get(VdsProperties.guest_containers);
             if (obj instanceof Object[]) {
-                Object[] containers = (Object[])obj;
+                Object[] containers = (Object[]) obj;
                 for (Object containerObj : containers) {
                     Map<String, Object> container = (Map<String, Object>) containerObj;
                     ArrayList<String> names = new ArrayList<>();
-                    for(Object o : (Object[]) container.get(VdsProperties.guest_container_names)) {
-                        names.add((String)o);
+                    for (Object o : (Object[]) container.get(VdsProperties.guest_container_names)) {
+                        names.add((String) o);
                     }
                     vm.getGuestContainers().add(new GuestContainer(
-                            (String)container.get(VdsProperties.guest_container_id),
+                            (String) container.get(VdsProperties.guest_container_id),
                             names,
-                            (String)container.get(VdsProperties.guest_container_image),
-                            (String)container.get(VdsProperties.guest_container_command),
-                            (String)container.get(VdsProperties.guest_container_status)
+                            (String) container.get(VdsProperties.guest_container_image),
+                            (String) container.get(VdsProperties.guest_container_command),
+                            (String) container.get(VdsProperties.guest_container_status)
                     ));
                 }
             }
@@ -1893,7 +1893,7 @@ private static void initGuestContainers(Map<String, Object> vmStruct, VmDynamic
     }
 
     public VMStatus convertToVmStatus(String status) {
-        switch(status) {
+        switch (status) {
         case VdsProperties.MIGRATION_SOURCE:
             return VMStatus.MigratingFrom;
 
@@ -2192,7 +2192,7 @@ private static String parseBondOptions(Map<String, Object> struct) {
 
         List<String> bondOptions = new ArrayList<>();
 
-        for(String key : reservedPositionKeys) {
+        for (String key : reservedPositionKeys) {
             String value = (String) struct.get(key);
             if (value != null) {
                 bondOptions.add(
@@ -2210,7 +2210,7 @@ private static String parseBondOptions(Map<String, Object> struct) {
         return normalizeBondOptions(StringUtils.join(bondOptions, ' '));
     }
 
-    private static String normalizeBondOptions(String bondOptions){
+    private static String normalizeBondOptions(String bondOptions) {
         Matcher matcher = Pattern.compile("mode=([\\w-\\.]+)").matcher(bondOptions);
         if (!matcher.find()) {
             return bondOptions;
@@ -2553,7 +2553,7 @@ private static void updateNumaNodesData(VDS vds, Map<String, Object> struct) {
                 int index = Integer.parseInt(item.getKey());
                 Map<String, Object> itemMap = item.getValue();
                 List<Integer> cpuIds = extractList(itemMap, VdsProperties.NUMA_NODE_CPU_LIST);
-                long memTotal =  assignLongValue(itemMap, VdsProperties.NUMA_NODE_TOTAL_MEM);
+                long memTotal = assignLongValue(itemMap, VdsProperties.NUMA_NODE_TOTAL_MEM);
                 VdsNumaNode numaNode = new VdsNumaNode();
                 numaNode.setIndex(index);
                 if (cpuIds != null) {
@@ -2617,7 +2617,7 @@ public void updateCpuTopology(VDS vds, Map<String, Object> struct) {
     }
 
     private static <T> List<T> extractList(Map<String, Object> struct, String propertyName) {
-        if (struct.containsKey(propertyName)){
+        if (struct.containsKey(propertyName)) {
             Object[] items = (Object[]) struct.get(propertyName);
             if (items.length > 0) {
                 return Arrays.stream(items).map(item -> (T) item).collect(Collectors.toList());
diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/NetworkStatisticsBuilderTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/NetworkStatisticsBuilderTest.java
index fec19d74882..27d1338dd00 100644
--- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/NetworkStatisticsBuilderTest.java
+++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/NetworkStatisticsBuilderTest.java
@@ -123,7 +123,6 @@ public static Stream<Arguments> buildStatistics2() {
         );
     }
 
-
     public static Stream<Arguments> buildArguments(
             BigInteger bi0,
             BigInteger bi100,
diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/PollVmStatsRefresherTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/PollVmStatsRefresherTest.java
index 5626834fbc0..828983d428a 100644
--- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/PollVmStatsRefresherTest.java
+++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/monitoring/PollVmStatsRefresherTest.java
@@ -52,22 +52,22 @@ public static Stream<MockConfigDescriptor<?>> mockConfiguration() {
     public static Stream<Arguments> monitoringNeededByStatus() {
         return Stream.of(
                 // host status              is monitoring needed
-                Arguments.of(Up,                       true),
-                Arguments.of(NonResponsive,            false),
-                Arguments.of(Error,                    true),
-                Arguments.of(NonOperational,           true),
-                Arguments.of(PreparingForMaintenance,  true),
-                Arguments.of(Initializing,             false),
-                Arguments.of(Connecting,               false),
-                Arguments.of(Unassigned,               false),
-                Arguments.of(Down,                     false),
-                Arguments.of(Maintenance,              false),
-                Arguments.of(Installing,               false),
-                Arguments.of(InstallFailed,            false),
-                Arguments.of(Reboot,                   false),
-                Arguments.of(PendingApproval,          false),
-                Arguments.of(InstallingOS,             false),
-                Arguments.of(Kdumping,                 false)
+                Arguments.of(Up, true),
+                Arguments.of(NonResponsive, false),
+                Arguments.of(Error, true),
+                Arguments.of(NonOperational, true),
+                Arguments.of(PreparingForMaintenance, true),
+                Arguments.of(Initializing, false),
+                Arguments.of(Connecting, false),
+                Arguments.of(Unassigned, false),
+                Arguments.of(Down, false),
+                Arguments.of(Maintenance, false),
+                Arguments.of(Installing, false),
+                Arguments.of(InstallFailed, false),
+                Arguments.of(Reboot, false),
+                Arguments.of(PendingApproval, false),
+                Arguments.of(InstallingOS, false),
+                Arguments.of(Kdumping, false)
         );
     }
 
diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandlerMetadataProtocolTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandlerMetadataProtocolTest.java
index 72ba962a2eb..a9839a0fc53 100644
--- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandlerMetadataProtocolTest.java
+++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CloudInitHandlerMetadataProtocolTest.java
@@ -78,8 +78,8 @@ public void test(VmInit vmInit, Object expected) {
                 assertEquals(0, underTest.validate(vmInit).size());
             }
         } catch (Exception e) {
-            assertEquals(((Exception)expected).getMessage(), e.getMessage());
-            assertEquals(((Exception)expected).getCause().getMessage(), e.getCause().getMessage());
+            assertEquals(((Exception) expected).getMessage(), e.getMessage());
+            assertEquals(((Exception) expected).getCause().getMessage(), e.getCause().getMessage());
             assertNotEquals(0, underTest.validate(vmInit).size());
         }
     }
diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java
index 4b8637b6e92..1821858833c 100644
--- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java
+++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/NumaSettingFactoryTest.java
@@ -119,7 +119,7 @@ private static List<VdsNumaNode> createTestVdsNumaNodes() {
 
         List<VdsNumaNode> newVdsNodes = new ArrayList<>();
 
-        VdsNumaNode newVdsNumaNode= new VdsNumaNode();
+        VdsNumaNode newVdsNumaNode = new VdsNumaNode();
         newVdsNumaNode.setCpuIds(generateCpuList(0, 4));
         newVdsNumaNode.setId(Guid.newGuid());
         newVdsNumaNode.setIndex(0);
@@ -127,7 +127,7 @@ private static List<VdsNumaNode> createTestVdsNumaNodes() {
         newVdsNumaNode.setNumaNodeStatistics(newNodeStatistics);
         newVdsNodes.add(newVdsNumaNode);
 
-        newVdsNumaNode= new VdsNumaNode();
+        newVdsNumaNode = new VdsNumaNode();
         newVdsNumaNode.setCpuIds(generateCpuList(4, 4));
         newVdsNumaNode.setId(Guid.newGuid());
         newVdsNumaNode.setIndex(1);
diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilderTest.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilderTest.java
index 7e7153c905e..f41dc76e853 100644
--- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilderTest.java
+++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilderTest.java
@@ -208,14 +208,14 @@ public void testNoDiskStatsDataForDisks() {
     }
 
     @Test
-    public void testAddNicWithId(){
+    public void testAddNicWithId() {
         String nicId = Guid.newGuid().toString();
         Map<String, Object> vmStruct = createNicDeviceStruct(nicId);
         validateVmNetworkInterfaceId(nicId, vmStruct);
     }
 
     @Test
-    public void testAddNicWithNullId(){
+    public void testAddNicWithNullId() {
         String nicId = null;
         Map<String, Object> vmStruct = createNicDeviceStruct(nicId);
         validateVmNetworkInterfaceId(nicId, vmStruct);
@@ -285,7 +285,7 @@ private static Map<String, Object> setDisks(Map<String, Map<String, Object>> dis
         return map;
     }
 
-    private static Map<String, Object>  setDisksUsage(Object[] disksUsageData) {
+    private static Map<String, Object> setDisksUsage(Object[] disksUsageData) {
         Map<String, Object> map = new HashMap<>();
         map.put(VdsProperties.VM_DISKS_USAGE, disksUsageData);
         return map;
diff --git a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/LogoutServlet.java b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/LogoutServlet.java
index 7b1747373e0..bce0a91d4b5 100644
--- a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/LogoutServlet.java
+++ b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/LogoutServlet.java
@@ -26,7 +26,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
         String errorDescription = null;
         String error = null;
         try {
-            Map<String, Object> revokeResponse =  SsoOAuthServiceUtils.revoke(
+            Map<String, Object> revokeResponse = SsoOAuthServiceUtils.revoke(
                     (String) request.getSession(true).getAttribute(WelcomeUtils.TOKEN));
             errorDescription = (String) revokeResponse.get(WelcomeUtils.ERROR_DESCRIPTION);
             error = (String) revokeResponse.get(WelcomeUtils.ERROR);
diff --git a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/OAuthCallbackServlet.java b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/OAuthCallbackServlet.java
index 73cfc489360..1a6c652da6f 100644
--- a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/OAuthCallbackServlet.java
+++ b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/OAuthCallbackServlet.java
@@ -53,7 +53,7 @@ protected void doGet(final HttpServletRequest request, final HttpServletResponse
     }
 
     private String getTokenForAuthCode(HttpServletRequest request, String authCode, String scope, String redirectUri) {
-        String token  = null;
+        String token = null;
         Map<String, Object> tokenMap = SsoOAuthServiceUtils.getToken(WelcomeUtils.AUTHORIZATION_CODE, authCode, scope, redirectUri);
         if (tokenMap.containsKey(WelcomeUtils.ERROR_DESCRIPTION)) {
             request.getSession(true).setAttribute(WelcomeUtils.ERROR_DESCRIPTION,
diff --git a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
index 5c7b6715ea0..83a2c9584f8 100644
--- a/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
+++ b/backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java
@@ -190,7 +190,7 @@ public String getCredentialsChangeUrl(HttpServletRequest request) throws Malform
     }
 
     public String getCurrentSsoSessionUser(HttpServletRequest request, Map<String, Object> userInfoMap) {
-        String username  = null;
+        String username = null;
         if (userInfoMap.containsKey(WelcomeUtils.ERROR_DESCRIPTION)) {
             request.getSession(true).setAttribute(WelcomeUtils.ERROR_DESCRIPTION,
                     userInfoMap.get(WelcomeUtils.ERROR_DESCRIPTION));
diff --git a/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/core/SsoLocalConfig.java b/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/core/SsoLocalConfig.java
index 05b719494ce..f686c3ddb72 100644
--- a/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/core/SsoLocalConfig.java
+++ b/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/core/SsoLocalConfig.java
@@ -29,7 +29,7 @@ public static SsoLocalConfig getInstance(Map<String, String> values) {
             instance = new SsoLocalConfig(values);
         } else {
             if (instance == null) {
-                synchronized(SsoLocalConfig.class) {
+                synchronized (SsoLocalConfig.class) {
                     if (instance == null) {
                         instance = new SsoLocalConfig();
                     }
diff --git a/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/db/StandaloneDataSource.java b/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/db/StandaloneDataSource.java
index 7cd25de5c69..e2b58ac473c 100644
--- a/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/db/StandaloneDataSource.java
+++ b/backend/manager/sso-client-registration-tool/src/main/java/org/ovirt/engine/ssoreg/db/StandaloneDataSource.java
@@ -49,7 +49,7 @@ public StandaloneDataSource() throws SQLException {
         // Load the driver:
         try {
             Class.forName(driver);
-        } catch(ClassNotFoundException exception) {
+        } catch (ClassNotFoundException exception) {
             throw new SQLException("Failed to load database driver \"" + driver + "\".", exception);
         }
 
@@ -90,7 +90,7 @@ private void closeConnection () {
             if (connection != null) {
                 connection.close();
             }
-        } catch(SQLException exception) {
+        } catch (SQLException exception) {
             log.error("Can't close connection.", exception);
         }
         connection = null;
@@ -119,7 +119,7 @@ public Connection getConnection () throws SQLException {
                 openConnection();
             }
             checkConnection();
-        } catch(SQLException exception) {
+        } catch (SQLException exception) {
             log.warn("Can't check the connection, will close it and open a new one.", exception);
             closeConnection();
             openConnection();
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
index 7e9dcfb7424..6e888070559 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/EngineConfigLogic.java
@@ -384,7 +384,7 @@ private void mergeValue() throws Exception {
             String valueInDb = configKey.getDisplayValue().trim();
             String delimiter = node.get(DELIMITER_TOKEN).asText(";");
             value = mergedValues(value, valueInDb, delimiter);
-            if(valueInDb.equals(value)) {
+            if (valueInDb.equals(value)) {
                 console.writeFormat(MERGE_SAME_VALUE_MSG);
                 console.writeLine();
                 return;
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java
index 4de9edb7ea3..4e4707093ef 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/ConfigKeyFactory.java
@@ -17,7 +17,7 @@
 public class ConfigKeyFactory {
     private static ConfigKeyFactory instance;
     private EngineConfigCLIParser parser;
-    private  Map<String, JsonNode> props;
+    private Map<String, JsonNode> props;
 
     static {
         instance = new ConfigKeyFactory();
@@ -74,7 +74,7 @@ private boolean isDeprecated(String key) {
             return Boolean.parseBoolean(node.asText());
         } catch (ClassCastException e) {
             throw new IllegalArgumentException("Configuration error;" +
-                    " Key \""+key+"\" should be either 'true' or 'false'. Value '"+node+"' is not valid.");
+                    " Key \"" + key + "\" should be either 'true' or 'false'. Value '" + node + "' is not valid.");
         }
     }
 
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/DoubleValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/DoubleValueHelper.java
index 365d087af65..4c2b13ef5c1 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/DoubleValueHelper.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/DoubleValueHelper.java
@@ -18,7 +18,7 @@ public String setValue(String value) {
     @Override public ValidationResult validate(ConfigKey key, String value) {
        try {
            Double doubleValue = Double.parseDouble(value);
-           return  new ValidationResult(true);
+           return new ValidationResult(true);
        } catch (NumberFormatException e) {
            // invalid number
            return new ValidationResult(false);
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/FenceConfigValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/FenceConfigValueHelper.java
index 61adf798b9d..c238c1ce44a 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/FenceConfigValueHelper.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/FenceConfigValueHelper.java
@@ -4,7 +4,7 @@
 import org.ovirt.engine.core.config.entity.ConfigKey;
 import org.ovirt.engine.core.utils.pm.FenceConfigHelper;
 
-public class FenceConfigValueHelper extends StringValueHelper{
+public class FenceConfigValueHelper extends StringValueHelper {
     @Override
     public ValidationResult validate(ConfigKey configKey, String value) {
         String key = configKey.getKey();
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java
index 1e5fba82242..a8d74324ccc 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/PasswordValueHelper.java
@@ -42,7 +42,7 @@ public String getValue(String value) throws GeneralSecurityException {
          * On failure we return an error.
          */
         String returnedValue = "Empty";
-        if (value != null && !value.equals("")){
+        if (value != null && !value.equals("")) {
             try {
                 decrypt(value);
                 returnedValue = "Set";
@@ -74,7 +74,7 @@ public String setValue(String value) throws GeneralSecurityException {
                 return StringUtils.EMPTY;
             }
             returnedValue = encrypt(password);
-        } catch(Throwable exception) {
+        } catch (Throwable exception) {
             String msg = "Failed to encrypt the current value.";
             console.writeLine(msg);
             log.error(msg, exception);
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/StringValueHelper.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/StringValueHelper.java
index 9c19be2665c..de06d51f033 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/StringValueHelper.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/config/entity/helper/StringValueHelper.java
@@ -28,7 +28,7 @@ public ValidationResult validate(ConfigKey key, String value) {
         } else {
             isValid = validValues.contains(value);
             if (!isValid) {
-                details = "Valid values are "+key.getValidValues();
+                details = "Valid values are " + key.getValidValues();
             }
         }
         return new ValidationResult(isValid, details);
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/cryptotool/Main.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/cryptotool/Main.java
index 8bd9511fff5..293bf006535 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/cryptotool/Main.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/cryptotool/Main.java
@@ -56,11 +56,11 @@ private enum Action {
         PBE_ENCODE(
             argMap -> System.out.println(
                 EnvelopePBE.encode(
-                    (String)argMap.get("algorithm"),
-                    (Integer)argMap.get("key-size"),
-                    (Integer)argMap.get("iterations"),
+                    (String) argMap.get("algorithm"),
+                    (Integer) argMap.get("key-size"),
+                    (Integer) argMap.get("iterations"),
                     null,
-                    getPassword("Password: ", (String)argMap.get("password"))
+                    getPassword("Password: ", (String) argMap.get("password"))
                 )
             )
         ),
@@ -69,7 +69,7 @@ private enum Action {
                 if (
                     !EnvelopePBE.check(
                         new String(readStream(System.in), StandardCharsets.UTF_8),
-                        getPassword("Password: ", (String)argMap.get("password"))
+                        getPassword("Password: ", (String) argMap.get("password"))
                     )
                 ) {
                     System.err.println("FAILED");
@@ -79,13 +79,13 @@ private enum Action {
         ),
         ENC_ENCODE(
             argMap -> {
-                try(InputStream in = new FileInputStream((String)argMap.get("certificate"))) {
+                try (InputStream in = new FileInputStream((String) argMap.get("certificate"))) {
                     System.out.println(
                         EnvelopeEncryptDecrypt.encrypt(
-                            (String)argMap.get("algorithm"),
-                            (Integer)argMap.get("key-size"),
+                            (String) argMap.get("algorithm"),
+                            (Integer) argMap.get("key-size"),
                             CertificateFactory.getInstance("X.509").generateCertificate(in),
-                            (Integer)argMap.get("block-size"),
+                            (Integer) argMap.get("block-size"),
                             readStream(System.in)
                         )
                     );
@@ -94,18 +94,18 @@ private enum Action {
         ),
         ENC_DECODE(
             argMap -> {
-                String keystorePassword = getPassword("Key store password: ", (String)argMap.get("keystore-password"));
+                String keystorePassword = getPassword("Key store password: ", (String) argMap.get("keystore-password"));
                 System.out.write(
                     EnvelopeEncryptDecrypt.decrypt(
                         getPrivateKeyEntry(
                             getKeyStore(
-                                (String)argMap.get("keystore-type"),
-                                (String)argMap.get("keystore"),
+                                (String) argMap.get("keystore-type"),
+                                (String) argMap.get("keystore"),
                                 keystorePassword
                             ),
-                            (String)argMap.get("keystore-alias"),
+                            (String) argMap.get("keystore-alias"),
                                 argMap.get("key-password") != null ?
-                                getPassword("Key password: ", (String)argMap.get("key-password")) :
+                                getPassword("Key password: ", (String) argMap.get("key-password")) :
                                 keystorePassword
                         ),
                         new String(readStream(System.in), StandardCharsets.UTF_8)
@@ -126,12 +126,12 @@ void execute(Properties props, List<String> cmdArgs) throws IOException, General
             parser.parse(cmdArgs);
             Map<String, Object> argMap = parser.getParsedArgs();
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     System.err.format("FATAL: %s%n", t.getMessage());
                 }
                 throw new ExitException("Parsing error", 1);
@@ -154,7 +154,7 @@ private static KeyStore getKeyStore(String storeType, String store, String passw
     }
 
     private static KeyStore.PrivateKeyEntry getPrivateKeyEntry(KeyStore ks, String alias, String password) throws IOException, GeneralSecurityException {
-        KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry)ks.getEntry(alias, new KeyStore.PasswordProtection(password.toCharArray()));
+        KeyStore.PrivateKeyEntry entry = (KeyStore.PrivateKeyEntry) ks.getEntry(alias, new KeyStore.PasswordProtection(password.toCharArray()));
         if (entry == null) {
             throw new IllegalArgumentException(String.format("Keystore alias '%s' is missing", alias));
         }
@@ -180,7 +180,7 @@ private static String getPassword(String prompt, String what) throws IOException
         if ("pass".equals(type)) {
             password = value;
         } else if ("file".equals(type)) {
-            try(
+            try (
                 InputStream is = new FileInputStream(value);
                 Reader reader = new InputStreamReader(is);
                 BufferedReader breader = new BufferedReader(reader);
@@ -228,15 +228,15 @@ public static void main(String... args) throws IOException {
             parser.parse(cmdArgs);
             Map<String, Object> argMap = parser.getParsedArgs();
 
-            if((Boolean)argMap.get("help")) {
+            if ((Boolean) argMap.get("help")) {
                 System.out.format("Usage: %s", parser.getUsage());
                 throw new ExitException("Help", 0);
-            } else if((Boolean)argMap.get("version")) {
+            } else if ((Boolean) argMap.get("version")) {
                 System.out.format("%s-%s (%s)%n", PACKAGE_NAME, PACKAGE_VERSION, PACKAGE_DISPLAY_NAME);
                 throw new ExitException("Version", 0);
             }
-            if(!parser.getErrors().isEmpty()) {
-                for(Throwable t : parser.getErrors()) {
+            if (!parser.getErrors().isEmpty()) {
+                for (Throwable t : parser.getErrors()) {
                     System.err.format("FATAL: %s%n", t.getMessage());
                 }
                 throw new ExitException("Parsing error", 1);
@@ -250,7 +250,7 @@ public static void main(String... args) throws IOException {
             Action action;
             try {
                 action = Action.valueOf(cmdArgs.get(0).toUpperCase().replace("-", "_"));
-            } catch(IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
                 System.err.printf("Invalid action '%s'%n", cmdArgs.get(0));
                 throw new ExitException("Invalid action", 1);
             }
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java
index 94d0338c711..e4ccc091e1d 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/EngineMonitorService.java
@@ -188,7 +188,7 @@ private void initServerUrl() throws NotificationServiceException {
                 serverUrl = config.getExternalHttpUrl(HEALTH_SERVLET_PATH);
             }
             log.info("Engine health servlet URL is \"{}\".", serverUrl);
-        } catch(MalformedURLException exception) {
+        } catch (MalformedURLException exception) {
             throw new NotificationServiceException("Can't get engine health servlet URL.", exception);
         }
     }
@@ -289,7 +289,7 @@ private void reportServerStatus(boolean isResponsive) {
             } else {
                 // reports an error for non responsive server
                 EngineLocalConfig config = EngineLocalConfig.getInstance();
-                if(config.getEngineUpMark().exists()) {
+                if (config.getEngineUpMark().exists()) {
                     // assumed crash, since engine up file is still there
                     insertEventIntoAuditLogSafe(AuditLogType.VDC_STOP,
                             AuditLogSeverity.ERROR,
@@ -394,7 +394,7 @@ private void insertEventIntoAuditLog(String eventType, int eventId, int severity
     private void initConnectivity() throws NotificationServiceException {
         try {
             ds = new StandaloneDataSource();
-        } catch(SQLException exception) {
+        } catch (SQLException exception) {
             throw new NotificationServiceException("Failed to obtain database connectivity", exception);
         }
     }
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
index da64a33fac6..2e1e045825f 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/NotificationService.java
@@ -52,7 +52,7 @@ private void markOldEventsAsProcessed() {
         eventsManager.markOldEventsAsProcessed(prop.getInteger(NotificationProperties.DAYS_TO_SEND_ON_STARTUP));
     }
 
-    public void registerTransport(Transport transport){
+    public void registerTransport(Transport transport) {
         if (transport.isActive()) {
             firstMatchSimpleFilter.registerTransport(transport);
             transport.registerObserver(this.eventsManager);
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageBody.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageBody.java
index a7c820ceb09..e19f683ece0 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageBody.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/MessageBody.java
@@ -7,7 +7,7 @@
 /**
  * Describes a message content
  */
-public class MessageBody{
+public class MessageBody {
     private String userInfo;
     private String vmInfo;
     private String hostInfo;
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java
index efb9eaea808..6f35370d139 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/smtp/Smtp.java
@@ -85,7 +85,7 @@ public Smtp(NotificationProperties props) {
     }
 
     private void init(NotificationProperties props) {
-        Properties mailSessionProps =  new Properties();
+        Properties mailSessionProps = new Properties();
 
         try {
             hostName = InetAddress.getLocalHost().getHostName();
@@ -224,7 +224,7 @@ private void sendMail(String recipient, String messageSubject, String messageBod
                 msg.setReplyTo(new Address[] { replyTo });
             }
             msg.setSubject(messageSubject);
-            if (isBodyHtml){
+            if (isBodyHtml) {
                 msg.setContent(String.format("<html><head><title>%s</title></head><body><p>%s</body></html>",
                         messageSubject,
                         messageBody), "text/html");
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
index e5ae30ce026..f1f87e25bfa 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/transport/snmp/Snmp.java
@@ -150,7 +150,7 @@ public Snmp(NotificationProperties props) {
 
     private int getSnmpVersion(String ver) {
         int version;
-        switch(ver) {
+        switch (ver) {
             case "2":
                 version = SnmpConstants.version2c;
                 break;
@@ -164,7 +164,7 @@ private int getSnmpVersion(String ver) {
     }
 
     private OID getAuthProtocol(String authProtocol) {
-        switch(authProtocol) {
+        switch (authProtocol) {
             case "MD5":
                 return AuthMD5.ID;
             case "SHA":
@@ -175,7 +175,7 @@ private OID getAuthProtocol(String authProtocol) {
     }
 
     private OID getPrivProtocol(String privProtocol) {
-        switch(privProtocol) {
+        switch (privProtocol) {
             case "AES128":
                 return PrivAES128.ID;
             case "AES192":
@@ -297,7 +297,7 @@ private UsmUser getUsmUser(Profile profile) {
         OctetString authenticationPassphrase = null;
         OID privacyProtocol = null;
         OctetString privacyPassphrase = null;
-        switch(profile.securityLevel) {
+        switch (profile.securityLevel) {
             case SecurityLevel.AUTH_NOPRIV:
                 authenticationProtocol = profile.authProtocol;
                 authenticationPassphrase = profile.authPassphrase;
diff --git a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java
index 89640605dd3..36106d415b8 100644
--- a/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java
+++ b/backend/manager/tools/src/main/java/org/ovirt/engine/core/notifier/utils/ShutdownHook.java
@@ -23,7 +23,7 @@ public class ShutdownHook extends Thread {
 
     public static ShutdownHook getInstance() {
         if (instance == null) {
-            synchronized(ShutdownHook.class) {
+            synchronized (ShutdownHook.class) {
                 if (instance == null) {
                     instance = new ShutdownHook();
                 }
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AsyncQuery.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AsyncQuery.java
index 906462f6939..e1d3f6f61d7 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AsyncQuery.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AsyncQuery.java
@@ -5,7 +5,7 @@ public class AsyncQuery<T> {
     /**
      * Null object singleton that represents an empty (no-op) query callback.
      */
-    private static final AsyncCallback EMPTY_CALLBACK = returnValue -> {};
+    private static final AsyncCallback EMPTY_CALLBACK = returnValue -> { };
 
     private final Object model;
     private final AsyncCallback<T> asyncCallback;
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperation.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperation.java
index 2bf8a6c627f..13f6b791420 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperation.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/communication/VdcOperation.java
@@ -119,7 +119,7 @@ public VdcOperation(final T operation, final P operationParameter, final boolean
      * @param callback The callback to call when the operation is finished.
      */
     public VdcOperation(final T operation, final P operationParameter, final boolean isPublicOperation,
-            final boolean fromList, final VdcOperationCallback<?, ?> callback)  {
+            final boolean fromList, final VdcOperationCallback<?, ?> callback) {
         this(operation, operationParameter, callback, null, isPublicOperation, fromList, false);
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/DashboardDataServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/DashboardDataServlet.java
index a85509354ce..4c202ae29c5 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/DashboardDataServlet.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/DashboardDataServlet.java
@@ -308,7 +308,7 @@ private Dashboard populateUtilizationCache() throws DashboardDataException {
         } else {
             dashboardCache.put(UTILIZATION_KEY, dashboard, UTILIZATION_CACHE_UPDATE_INTERVAL, TimeUnit.SECONDS);
         }
-        log.debug("Dashboard utilization cache updated in {}ms", endTime-startTime); //$NON-NLS-1$
+        log.debug("Dashboard utilization cache updated in {}ms", endTime - startTime); //$NON-NLS-1$
         return dashboard;
     }
 
@@ -322,7 +322,7 @@ private Inventory populateInventoryCache() throws DashboardDataException {
         } else {
             inventoryCache.put(INVENTORY_KEY, inventory, INVENTORY_CACHE_UPDATE_INTERVAL, TimeUnit.SECONDS);
         }
-        log.debug("Dashboard inventoy cache updated in {}ms", endTime-startTime); //$NON-NLS-1$
+        log.debug("Dashboard inventoy cache updated in {}ms", endTime - startTime); //$NON-NLS-1$
         return inventory;
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/UtilizationHelper.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/UtilizationHelper.java
index 14fa4840bd1..555aec524d9 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/UtilizationHelper.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/UtilizationHelper.java
@@ -22,7 +22,7 @@ public static void populateCpuUtilizationHosts(Utilization utilization, DataSour
             throws DashboardDataException {
         HostDwhDao dao = new HostDwhDao(dwhDataSource);
         List<TrendResources> resourceUsage = dao.getCpuUtilizationHosts();
-        for(TrendResources usage : resourceUsage) {
+        for (TrendResources usage : resourceUsage) {
             UtilizedEntity entity = new UtilizedEntity();
             entity.setName(usage.getName());
             entity.setUsed(usage.getUsed() * usage.getTotal() / 100);
@@ -94,7 +94,7 @@ public static void populateStorageUtilizationDomains(Utilization utilization, Da
             throws DashboardDataException {
         StorageDomainDwhDao dao = new StorageDomainDwhDao(dwhDataSource);
         List<TrendResources> usageList = dao.getStorageDomainUtilization();
-        for(TrendResources usage: usageList) {
+        for (TrendResources usage: usageList) {
             UtilizedEntity entity = new UtilizedEntity();
             entity.setName(usage.getName());
             //Dividing by 1024 to report TB instead of GB
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/GlusterVolumeEngineDao.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/GlusterVolumeEngineDao.java
index 1ba664f9aea..18e8af8df3b 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/GlusterVolumeEngineDao.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/GlusterVolumeEngineDao.java
@@ -14,8 +14,8 @@ public class GlusterVolumeEngineDao extends BaseDao {
 
     private static final String STATUS = "status"; //$NON-NLS-1$
     private static final String BRICKS_NOT_UP = "bricks_not_up"; //$NON-NLS-1$
-    private static final String VDO_SAVINGS = "vdo_savings";//$NON-NLS-1$
-    private static final String VOLUME_NAME = "vol_name";//$NON-NLS-1$
+    private static final String VDO_SAVINGS = "vdo_savings"; //$NON-NLS-1$
+    private static final String VOLUME_NAME = "vol_name"; //$NON-NLS-1$
 
     private static final String GLUSTER_VOLUME_INVENTORY = "glusterVolume.inventory"; //$NON-NLS-1$
     private static final String GLUSTER_VOLUME_VDO_SAVINGS = "glusterVolume.vdoSavings"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/HostDwhDao.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/HostDwhDao.java
index 086570a5c96..e6ee221bd67 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/HostDwhDao.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/HostDwhDao.java
@@ -21,7 +21,7 @@ public class HostDwhDao extends BaseDao {
     private static final String TOTAL = "total"; //$NON-NLS-1$
     private static final String MEM_TOTAL = MEM + TOTAL;
     private static final String CPU_TOTAL = CPU + TOTAL;
-    private static final String NAME="name"; //$NON-NLS-1$
+    private static final String NAME = "name"; //$NON-NLS-1$
     private static final String CPU_USAGE_PERCENT = "cpu_usage_percent"; //$NON-NLS-1$
     private static final String CORES_HOST = "number_of_cores"; //$NON-NLS-1$
     private static final String PREVIOUS_CPU_PERCENT = "previous_cpu_percent"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/StorageDomainDwhDao.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/StorageDomainDwhDao.java
index 7d44b493ad6..cf32e10002b 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/StorageDomainDwhDao.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/StorageDomainDwhDao.java
@@ -17,9 +17,9 @@ public class StorageDomainDwhDao extends BaseDao {
     private static final String USED = "used"; //$NON-NLS-1$
     private static final String DATE = "the_date"; //$NON-NLS-1$
     private static final String TOTAL = "total"; //$NON-NLS-1$
-    private static final String AVAILABLE="available"; //$NON-NLS-1$
-    private static final String PREVIOUS_USED="previous_used"; //$NON-NLS-1$
-    private static final String PREVIOUS_TOTAL="previous_total"; //$NON-NLS-1$
+    private static final String AVAILABLE = "available"; //$NON-NLS-1$
+    private static final String PREVIOUS_USED = "previous_used"; //$NON-NLS-1$
+    private static final String PREVIOUS_TOTAL = "previous_total"; //$NON-NLS-1$
 
     private static final String STORAGE_LAST24_AVERAGE = "storage.last24hours_average"; //$NON-NLS-1$
     private static final String HOURLY_STORAGE_HISTORY = "storage.hourly_history"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/VmDwhDao.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/VmDwhDao.java
index 192881a0b72..7c8c5ecc687 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/VmDwhDao.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/dao/VmDwhDao.java
@@ -12,7 +12,7 @@
 
 public class VmDwhDao extends BaseDao {
 
-    private static final String NAME="name"; //$NON-NLS-1$
+    private static final String NAME = "name"; //$NON-NLS-1$
     private static final String TOTAL_VMS = "total_vms"; //$NON-NLS-1$
     private static final String USED_VMS = "used_vms"; //$NON-NLS-1$
     private static final String CPU = "cpu_"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/fake/FakeDataGenerator.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/fake/FakeDataGenerator.java
index 47bf5e86466..e13977b9007 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/fake/FakeDataGenerator.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/fake/FakeDataGenerator.java
@@ -135,7 +135,7 @@ private static GlobalUtilizationResourceSummary populateUtilizationObject(
     private static void createFakeUtilization(Utilization utilization, Random random) {
         int sendValues = random.nextInt(10);
         if (sendValues > 1) {
-            for(int i = 0; i < random.nextInt(10) + 1; i++) {
+            for (int i = 0; i < random.nextInt(10) + 1; i++) {
                 UtilizedEntity host = new UtilizedEntity();
                 if (utilization instanceof ResourceUtilization) {
                     host.setName("fake_host_" + i); //$NON-NLS-1$
@@ -150,7 +150,7 @@ private static void createFakeUtilization(Utilization utilization, Random random
         }
         sendValues = random.nextInt(10);
         if (sendValues > 1) {
-            for(int i = 0; i < random.nextInt(10) + 1; i++) {
+            for (int i = 0; i < random.nextInt(10) + 1; i++) {
                 UtilizedEntity vm = new UtilizedEntity();
                 vm.setName("fake_vm" + i); //$NON-NLS-1$
                 vm.setTotal(random.nextDouble() * 100 + 1);
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/DcStatusMap.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/DcStatusMap.java
index ce49f75ba2e..5aa4555ad5d 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/DcStatusMap.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/DcStatusMap.java
@@ -17,7 +17,7 @@ public enum DcStatusMap {
 
     private StoragePoolStatus[] values;
 
-    private DcStatusMap(StoragePoolStatus ...values) {
+    private DcStatusMap(StoragePoolStatus ... values) {
         this.values = values.clone();
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/HostStatusMap.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/HostStatusMap.java
index 0f7c85bce4e..a46417b24a8 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/HostStatusMap.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/HostStatusMap.java
@@ -20,7 +20,7 @@ public enum HostStatusMap {
 
     private VDSStatus[] values;
 
-    private HostStatusMap(VDSStatus ...values) {
+    private HostStatusMap(VDSStatus ... values) {
         this.values = values.clone();
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/StorageStatusMap.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/StorageStatusMap.java
index c4fba99f08a..5f907a43d13 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/StorageStatusMap.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/StorageStatusMap.java
@@ -19,7 +19,7 @@ public enum StorageStatusMap {
 
     private StorageDomainStatus[] values;
 
-    private StorageStatusMap(StorageDomainStatus ...values) {
+    private StorageStatusMap(StorageDomainStatus ... values) {
         this.values = values.clone();
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/VmStatusMap.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/VmStatusMap.java
index c9ecd991ed3..8b2eb763d83 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/VmStatusMap.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/dashboard/maps/VmStatusMap.java
@@ -18,7 +18,7 @@ public enum VmStatusMap {
 
     private VMStatus[] values;
 
-    private VmStatusMap(VMStatus ...values) {
+    private VmStatusMap(VMStatus ... values) {
         this.values = values.clone();
     }
 
diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
index 94fa3070d58..ba772f16a82 100644
--- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
+++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
@@ -86,9 +86,9 @@ public String getKey() {
 
     private static final String HOST_JSP = "/GwtHostPage.jsp"; //$NON-NLS-1$
     private static final String UTF_CONTENT_TYPE = "text/html; charset=UTF-8"; //$NON-NLS-1$
-    private  static  final String USER_OPTION_WEBADMIN = "webAdmin"; //$NON-NLS-1$
-    private  static  final String USER_OPTION_USE_CUSTOM_HOME_PAGE = "webAdmin.useCustomHomePage"; //$NON-NLS-1$
-    private  static  final String USER_OPTION_CUSTOM_HOME_PAGE = "webAdmin.customHomePage"; //$NON-NLS-1$
+    private static final String USER_OPTION_WEBADMIN = "webAdmin"; //$NON-NLS-1$
+    private static final String USER_OPTION_USE_CUSTOM_HOME_PAGE = "webAdmin.useCustomHomePage"; //$NON-NLS-1$
+    private static final String USER_OPTION_CUSTOM_HOME_PAGE = "webAdmin.customHomePage"; //$NON-NLS-1$
 
     private BackendLocal backend;
     private ObjectMapper mapper;
@@ -192,7 +192,7 @@ private String getSsoToken(final String engineSessionId) {
     }
 
     private UserProfileProperty getUserOption(final Guid userId, final String engineSessionId, String name) {
-        return (UserProfileProperty)runQuery(
+        return (UserProfileProperty) runQuery(
                 QueryType.GetUserProfilePropertyByNameAndUserId,
                 new IdAndNameQueryParameters(userId, name),
                 engineSessionId);
diff --git a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/WebAdminSettingsTest.java b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/WebAdminSettingsTest.java
index e8c56da2e93..b75da47d7ad 100644
--- a/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/WebAdminSettingsTest.java
+++ b/frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/WebAdminSettingsTest.java
@@ -80,7 +80,7 @@ public void parseEmptyStorage() {
     public void parseVersion() {
         WebAdminSettings.Builder builder = new WebAdminSettings.Builder(str -> parser);
         when(parser.parseStorage()).thenReturn(Collections.emptyMap());
-        when(parser.getVersion()).thenReturn("1");//$NON-NLS-1$
+        when(parser.getVersion()).thenReturn("1"); //$NON-NLS-1$
         when(parser.getLocalStoragePersistence()).thenReturn(null);
 
         UserProfileProperty property = createWebAdminProperty();
@@ -96,7 +96,7 @@ public void parsePersistenceFlag() {
         WebAdminSettings.Builder builder = new WebAdminSettings.Builder(str -> parser);
         when(parser.parseStorage()).thenReturn(Collections.emptyMap());
         when(parser.getVersion()).thenReturn(null);
-        when(parser.getLocalStoragePersistence()).thenReturn("false");//$NON-NLS-1$
+        when(parser.getLocalStoragePersistence()).thenReturn("false"); //$NON-NLS-1$
 
         UserProfileProperty property = createWebAdminProperty();
         WebAdminSettings settings = builder.fromProperty(property).build();
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/AutoLoginData.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/AutoLoginData.java
index ff7ae59b25d..840fdae59ae 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/AutoLoginData.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/auth/AutoLoginData.java
@@ -59,7 +59,7 @@ public DbUser getDbUser() {
     }
 
     public UserProfileProperty getWebAdminUserOption() {
-        if(getUserOptions() == null || getUserOptionsId() == null) {
+        if (getUserOptions() == null || getUserOptionsId() == null) {
             return WebAdminSettings.defaultSettings().getOriginalUserOptions();
         }
         return UserProfileProperty.builder()
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/editor/UiCommonEditorVisitor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/editor/UiCommonEditorVisitor.java
index d5a5cd2a652..fd662dd2e20 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/editor/UiCommonEditorVisitor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/editor/UiCommonEditorVisitor.java
@@ -137,14 +137,14 @@ public <T> boolean visit(final EditorContext<T> ctx) {
         eventMap.registerListener(absolutePath, "SelectedItemChanged", (ev, sender, args) -> { //$NON-NLS-1$
             T selectedItem = (T) ((ListModel) sender).getSelectedItem();
             if (editor instanceof TakesConstrainedValueListEditor && ownerModels.get(absolutePath) instanceof ListModel) {
-                editor.setValue((T)Arrays.asList(selectedItem));
+                editor.setValue((T) Arrays.asList(selectedItem));
             } else {
                 editor.setValue(selectedItem);
             }
         });
         eventMap.registerListener(absolutePath, "SelectedItemsChanged", (ev, sender, args) -> { //$NON-NLS-1$
             if (editor instanceof TakesConstrainedValueListEditor && ownerModels.get(absolutePath) instanceof ListModel) {
-                ((TakesConstrainedValueListEditor)editor).setListValue((List<T>)((ListModel) sender).getSelectedItems());
+                ((TakesConstrainedValueListEditor) editor).setListValue((List<T>) ((ListModel) sender).getSelectedItems());
             }
         });
 
@@ -201,7 +201,7 @@ <O> void updateListEditor(TakesConstrainedValueEditor<O> listEditor, ListModel<O
                 if (items.contains(value)) {
                     if (listEditor instanceof TakesConstrainedValueListEditor) {
                         if (parentModel.getSelectedItems() != null) {
-                            ((TakesConstrainedValueListEditor<O>)listEditor).setListValue(parentModel.getSelectedItems());
+                            ((TakesConstrainedValueListEditor<O>) listEditor).setListValue(parentModel.getSelectedItems());
                         }
                     } else {
                         listEditor.setValue(value);
@@ -209,7 +209,7 @@ <O> void updateListEditor(TakesConstrainedValueEditor<O> listEditor, ListModel<O
                 }
             }
             if (listEditor instanceof TakesConstrainedValueListEditor) {
-                ((TakesConstrainedValueListEditor<O>)listEditor).setAcceptableListValues(items);
+                ((TakesConstrainedValueListEditor<O>) listEditor).setAcceptableListValues(items);
             } else {
                 listEditor.setAcceptableValues(items);
             }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DetailActionPanelPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DetailActionPanelPresenterWidget.java
index 2e96aa44f49..11ea737c642 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DetailActionPanelPresenterWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DetailActionPanelPresenterWidget.java
@@ -23,7 +23,7 @@ public DetailActionPanelPresenterWidget(EventBus eventBus,
     }
 
     protected D getDetailModel() {
-        return (D) ((SearchableDetailModelProvider<T, ?, ?>)getDataProvider()).getModel();
+        return (D) ((SearchableDetailModelProvider<T, ?, ?>) getDataProvider()).getModel();
     }
 
 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DynamicTabProxy.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DynamicTabProxy.java
index 11fcaf0fed4..8b3412e37e1 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DynamicTabProxy.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/DynamicTabProxy.java
@@ -34,7 +34,7 @@ public WrappedProxy(PlaceManager placeManager, EventBus eventBus,
                 Type<ChangeTabHandler> changeTabEventType,
                 String label, float priority, String historyToken) {
             bind(placeManager, eventBus);
-            this.tabData = new DynamicTabData(label, (int)priority, historyToken);
+            this.tabData = new DynamicTabData(label, (int) priority, historyToken);
             this.targetHistoryToken = historyToken;
             this.requestTabsEventType = requestTabsEventType;
             this.changeTabEventType = changeTabEventType;
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/FragmentParams.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/FragmentParams.java
index 1d75eccb000..f9250d3f09f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/FragmentParams.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/FragmentParams.java
@@ -47,7 +47,7 @@ public static <T> List<T> findItemByName(String name, SearchableListModel<?, T>
         List<T> namedItems = null;
         if (items != null) {
             namedItems = items.stream().filter(item ->
-                item instanceof Nameable && name.equals(((Nameable)item).getName())).collect(Collectors.toList());
+                item instanceof Nameable && name.equals(((Nameable) item).getName())).collect(Collectors.toList());
         }
         return namedItems;
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/numa/UnassignedVNumaNodesPanelPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/numa/UnassignedVNumaNodesPanelPresenterWidget.java
index aa215b92dff..c4b5116d590 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/numa/UnassignedVNumaNodesPanelPresenterWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/popup/numa/UnassignedVNumaNodesPanelPresenterWidget.java
@@ -55,7 +55,7 @@ public void populateView() {
         getView().clear();
         Collection<VNodeModel> unassignedNodeList = model.getUnassignedNumaNodes();
         Map<VM, List<VNodeModel>> vmToNodeMap = new HashMap<>();
-        for(VM currentVM: this.model.getVmsWithvNumaNodeList()) {
+        for (VM currentVM: this.model.getVmsWithvNumaNodeList()) {
             List<VNodeModel> nodeModelList = new ArrayList<>();
             vmToNodeMap.put(currentVM, nodeModelList);
         }
@@ -64,7 +64,7 @@ public void populateView() {
             List<VNodeModel> nodeModels = vmToNodeMap.get(currentVM);
             nodeModels.add(vNodeModel);
         }
-        for(Map.Entry<VM, List<VNodeModel>> entry: vmToNodeMap.entrySet()) {
+        for (Map.Entry<VM, List<VNodeModel>> entry: vmToNodeMap.entrySet()) {
             CollapsiblePanelPresenterWidget nodePanelPresenter = collapisblePanelProvider.get();
             addToSlot(TYPE_RevealUnassignedPanels, nodePanelPresenter);
             nodePanelPresenter.getView().setTitleWidget(getView().getNodePanelTitle(entry.getKey(), entry.getValue()));
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java
index db7c5ae76a4..101153a302e 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/AbstractRdp.java
@@ -21,7 +21,7 @@ public String getUserNameAndDomain() {
         String username = Frontend.getInstance().getLoggedInUser().getLoginName();
         String domain = Frontend.getInstance().getLoggedInUser().getDomain();
 
-        return username.contains("@") ? username : username + "@" + domain;//$NON-NLS-1$ //$NON-NLS-2$
+        return username.contains("@") ? username : username + "@" + domain; //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public String getUserName() {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
index c5aadfea36d..b2bd703c12a 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/ContextSensitiveHelpManager.java
@@ -35,7 +35,7 @@ public class ContextSensitiveHelpManager {
     // GWT overlay for the JSON object
     private static class Mapping extends JavaScriptObject {
         @SuppressWarnings("unused")
-        protected Mapping() {} // required for GWT
+        protected Mapping() { } // required for GWT
     }
 
     /**
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpNativeImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpNativeImpl.java
index 064f158deeb..391023cb2e4 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpNativeImpl.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpNativeImpl.java
@@ -42,7 +42,7 @@ public class RdpNativeImpl extends AbstractRdp implements IRdpNative {
         "gatewaycredentialssource:i:4\n" + //$NON-NLS-1$
         "gatewayprofileusagemethod:i:0\n" + //$NON-NLS-1$
         "promptcredentialonce:i:1\n" + //$NON-NLS-1$
-        "use redirection server name:i:0";//$NON-NLS-1$
+        "use redirection server name:i:0"; //$NON-NLS-1$
 
     private int getScreenMode() {
         if (getFullScreen()) {
@@ -79,12 +79,12 @@ public void connect() {
         configBuilder.append("\nfull address:s:").append(getAddress()); //$NON-NLS-1$
         configBuilder.append("\nenablecredsspsupport:i:").append(booleanToInt(getEnableCredSspSupport())); //$NON-NLS-1$
         configBuilder.append(getredirectDrivesLines());
-        configBuilder.append("\nredirectprinters:i:").append(booleanToInt(getRedirectPrinters()));//$NON-NLS-1$
-        configBuilder.append("\nredirectsmartcards:i:").append(booleanToInt(getRedirectSmartCards()));//$NON-NLS-1$
-        configBuilder.append("\nredirectclipboard:i:").append(booleanToInt(getRedirectClipboard()));//$NON-NLS-1$
-        configBuilder.append("\nusername:s:").append(getUserNameAndDomain());//$NON-NLS-1$
+        configBuilder.append("\nredirectprinters:i:").append(booleanToInt(getRedirectPrinters())); //$NON-NLS-1$
+        configBuilder.append("\nredirectsmartcards:i:").append(booleanToInt(getRedirectSmartCards())); //$NON-NLS-1$
+        configBuilder.append("\nredirectclipboard:i:").append(booleanToInt(getRedirectClipboard())); //$NON-NLS-1$
+        configBuilder.append("\nusername:s:").append(getUserNameAndDomain()); //$NON-NLS-1$
 
-        ConsoleModel.makeConsoleConfigRequest("console.rdp", "application/rdp; charset=UTF-8", configBuilder.toString());//$NON-NLS-1$$NON-NLS-2$
+        ConsoleModel.makeConsoleConfigRequest("console.rdp", "application/rdp; charset=UTF-8", configBuilder.toString()); //$NON-NLS-1$$NON-NLS-2$
     }
 
     @Override
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java
index c932e19de1d..b7259217758 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/RdpPluginImpl.java
@@ -39,7 +39,7 @@ public void setParentModel(RdpConsoleModel model) {
     }
 
     public String getRDPCabURL() {
-        return GWT.getModuleBaseURL() + "msrdp.cab";//$NON-NLS-1$
+        return GWT.getModuleBaseURL() + "msrdp.cab"; //$NON-NLS-1$
     }
 
     @Override
@@ -127,7 +127,7 @@ function OnDisconnected(disconnectCode){
 
     @Override
     public boolean getEnableCredSspSupport() {
-        return false;// Disable 'Credential Security Support Provider (CredSSP)' to enable SSO
+        return false; // Disable 'Credential Security Support Provider (CredSSP)' to enable SSO
     }
 
 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java
index b627eef0696..1be2452283a 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/UiCommonDefaultTypeResolver.java
@@ -40,7 +40,7 @@ public class UiCommonDefaultTypeResolver implements ITypeResolver {
 
     @Inject
     public UiCommonDefaultTypeResolver(Configurator configurator, ILogger logger,
-            ConsoleUtils consoleUtils,  ErrorPopupManager errorPopupManager,
+            ConsoleUtils consoleUtils, ErrorPopupManager errorPopupManager,
             ConsoleOptionsFrontendPersister consoleOptionsFrontendPersister,
             CurrentUserRole currentUserRole,
             Provider<ISpiceNative> spiceNativeProvider,
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebsocketProxyConfig.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebsocketProxyConfig.java
index b162477cbab..2337179b167 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebsocketProxyConfig.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/WebsocketProxyConfig.java
@@ -9,8 +9,8 @@ public class WebsocketProxyConfig {
     private final String configValue;
     private String targetHost;
 
-    private static final String ENGINE = "Engine";//$NON-NLS-1$
-    private static final String HOST = "Host";//$NON-NLS-1$
+    private static final String ENGINE = "Engine"; //$NON-NLS-1$
+    private static final String HOST = "Host"; //$NON-NLS-1$
 
     /**
      * @param configValue - websocket proxy config string
@@ -18,7 +18,7 @@ public class WebsocketProxyConfig {
      */
     public WebsocketProxyConfig(String configValue, String targetHost) {
         if (!matchesHostColonPort(configValue)) {
-            throw new IllegalArgumentException("Config value must be in following form: host:port");//$NON-NLS-1$
+            throw new IllegalArgumentException("Config value must be in following form: host:port"); //$NON-NLS-1$
         }
 
         this.configValue = configValue;
@@ -26,7 +26,7 @@ public WebsocketProxyConfig(String configValue, String targetHost) {
     }
 
     public String getProxyHost() {
-        String val = configValue.split(":")[0];//$NON-NLS-1$
+        String val = configValue.split(":")[0]; //$NON-NLS-1$
         if (val.equals(ENGINE)) {
             return Location.getHostName(); //the proxy runs on the engine
         } else if (val.equals(HOST)) {
@@ -36,7 +36,7 @@ public String getProxyHost() {
     }
 
     public String getProxyPort() {
-        return configValue.split(":")[1];//$NON-NLS-1$
+        return configValue.split(":")[1]; //$NON-NLS-1$
     }
 
     private boolean matchesHostColonPort(String s) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/PopupUtils.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/PopupUtils.java
index 14db3257d11..ef78e77c86c 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/PopupUtils.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/PopupUtils.java
@@ -74,7 +74,7 @@ private static void adjustPopupLocationToFitScreenAndShow(final PopupPanel popup
             top += relativeHeight;
         } else if (distanceFromWindowTop >= popup.getOffsetHeight()) {
             top -= popup.getOffsetHeight() - itemHeight;
-        } else {// Position above the relative object and add scroll
+        } else { // Position above the relative object and add scroll
             top += relativeHeight;
             style.setHeight(distanceToWindowBottom, Unit.PX);
             style.setOverflowY(Overflow.SCROLL);
@@ -133,7 +133,7 @@ private static void adjustPopupLocationToFitScreenAndShow(final PopupPanel popup
                     // Align with the left edge of the relative object.
                     left = relativeTarget;
                 }
-            }else{
+            } else {
                 style.setWidth(relativeWidth, Unit.PX);
             }
         } else { // LTR case
@@ -169,7 +169,7 @@ private static void adjustPopupLocationToFitScreenAndShow(final PopupPanel popup
                     left -= offsetWidthDiff;
 
                 }
-            }else{
+            } else {
                 style.setWidth(relativeWidth, Unit.PX);
             }
         }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ActionPanelView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ActionPanelView.java
index c5bd24b531e..c8c1caa3f01 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ActionPanelView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/ActionPanelView.java
@@ -128,7 +128,7 @@ public ActionButton addDropdownComboActionButton(ActionButtonDefinition<E, T> bu
         DropdownActionButton<E, T> dropdownActionButton;
         if (buttonDef.getIcon() instanceof IconType) {
             dropdownActionButton = new DropdownActionButton<>(subActions, selectedItemsProvider,
-                true, (IconType)buttonDef.getIcon());
+                true, (IconType) buttonDef.getIcon());
         } else {
             dropdownActionButton = new DropdownActionButton<>(subActions, selectedItemsProvider,
                     true, null);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/OvirtBreadCrumbsView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/OvirtBreadCrumbsView.java
index f9e341d7de0..75346575096 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/OvirtBreadCrumbsView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/OvirtBreadCrumbsView.java
@@ -145,7 +145,7 @@ protected SafeHtml getName(Object item) {
     public SafeHtml getName(T item) {
         String result = "";
         if (item instanceof Nameable) {
-            result = ((Nameable)item).getName();
+            result = ((Nameable) item).getName();
         }
         return SafeHtmlUtils.fromString(result);
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java
index 9a9febc8d4b..dfd16b0dcc5 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ConsolePopupView.java
@@ -325,9 +325,9 @@ public ConsoleModel read(boolean value, ConsoleModel model) {
         Label rdpInvocationLabel = new Label();
         rdpInvocationLabel.setText(constants.consoleInvocation());
 
-        vncHeadline= new WidgetWithInfo(vncInvocationLabel);
+        vncHeadline = new WidgetWithInfo(vncInvocationLabel);
         vncHeadline.setIconTooltipText(SafeHtmlUtils.fromTrustedString(createVncInvocationInfo()));
-        rdpHeadline= new WidgetWithInfo(rdpInvocationLabel);
+        rdpHeadline = new WidgetWithInfo(rdpInvocationLabel);
         rdpHeadline.setIconTooltipText(SafeHtmlUtils.fromTrustedString(createRdpInvocationInfo()));
 
         initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
@@ -447,7 +447,7 @@ private void initSelectedSpiceImpl() {
     }
 
     private void setSelectedVncImpl() {
-        VncConsoleModel vncConsoleModel= model.getVmConsoles().getConsoleModel(VncConsoleModel.class);
+        VncConsoleModel vncConsoleModel = model.getVmConsoles().getConsoleModel(VncConsoleModel.class);
 
         if (vncConsoleModel == null) {
             return;
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ErrorPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ErrorPopupView.java
index 05a1e56d59e..d0914709acf 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ErrorPopupView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/ErrorPopupView.java
@@ -44,7 +44,7 @@ void localize() {
 
     @Override
     public void setErrorMessage(String errorMessage) {
-        messageLabel.setHTML(errorMessage.replace("\n", "<br/>"));//$NON-NLS-1$ //$NON-NLS-2$
+        messageLabel.setHTML(errorMessage.replace("\n", "<br/>")); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     @Override
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/HostMaintenanceConfirmationPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/HostMaintenanceConfirmationPopupView.java
index 4568d283d4e..d3b196fdaeb 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/HostMaintenanceConfirmationPopupView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/HostMaintenanceConfirmationPopupView.java
@@ -194,7 +194,7 @@ public void edit(HostMaintenanceConfirmationModel object) {
 
     @Override
     public void setMessage(String message) {
-        messageHTML.setHTML(SafeHtmlUtils.fromString(message != null ? message : "").asString().replace("\n", "<br>"));//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+        messageHTML.setHTML(SafeHtmlUtils.fromString(message != null ? message : "").asString().replace("\n", "<br>")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
     public void updatePinnedVMsInfoVisibility(HostMaintenanceConfirmationModel model) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/OptionsPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/OptionsPopupView.java
index 4dea5465d05..e7687298618 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/OptionsPopupView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/OptionsPopupView.java
@@ -115,7 +115,7 @@ public OptionsPopupView(EventBus eventBus, PlaceManager manager) {
         localStoragePersistedOnServerCheckBox = new EntityModelCheckBoxEditor(Align.RIGHT);
         confirmSuspendingVmCheckBox = new EntityModelCheckBoxEditor(Align.RIGHT);
         isHomePageCustom = new EntityModelRadioButtonEditor("homePage", Align.RIGHT); // $NON-NLS-1$
-        isHomePageDefault = new EntityModelRadioButtonEditor("homePage", Align.RIGHT);// $NON-NLS-1$
+        isHomePageDefault = new EntityModelRadioButtonEditor("homePage", Align.RIGHT); // $NON-NLS-1$
 
         initWidget(ViewUiBinder.uiBinder.createAndBindUi(this));
         ViewIdHandler.idHandler.generateAndSetIds(this);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/HostSummaryContentPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/HostSummaryContentPanel.java
index 3785639536e..5e51ae4691f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/HostSummaryContentPanel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/HostSummaryContentPanel.java
@@ -47,12 +47,12 @@ public HostSummaryContentPanel() {
     }
 
     public void setModel(List<VdsNumaNode> numaNodes, List<VNodeModel> vNodeModels) {
-        for(VNodeModel vNodeModel: vNodeModels) {
+        for (VNodeModel vNodeModel: vNodeModels) {
             VirtualNumaPanel panel = virtualNumaPanelProvider.get();
             panel.setModel(vNodeModel);
             vNumaPanel.add(panel);
         }
-        for(VdsNumaNode numaNode: numaNodes) {
+        for (VdsNumaNode numaNode: numaNodes) {
             numaPanel.add(new HTML(messages.numaNode(numaNode.getIndex())));
         }
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaPanel.java
index 7f9a286709e..fc2014800f0 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaPanel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaPanel.java
@@ -12,10 +12,10 @@ interface WidgetUiBinder extends UiBinder<Widget, NumaPanel> {
         WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class);
     }
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     CpuSummaryPanel cpuSummaryPanel;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     MemorySummaryPanel memorySummaryPanel;
 
     @Inject
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaSupportPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaSupportPopupView.java
index 41f2cfaab96..2add8806923 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaSupportPopupView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/NumaSupportPopupView.java
@@ -159,7 +159,7 @@ public IsWidget getHostSummaryContent(VDS selectedItem, NumaSupportModel support
         List<VM> vmsWithVNuma = supportModel.getVmsWithvNumaNodeList();
         List<VNodeModel> numaNodes = new ArrayList<>();
         for (VM vm: vmsWithVNuma) {
-            for(VmNumaNode vmNumaNode: vm.getvNumaNodeList()) {
+            for (VmNumaNode vmNumaNode: vm.getvNumaNodeList()) {
                 numaNodes.add(new VNodeModel(vm, vmNumaNode, false));
             }
         }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VirtualNumaPanelDetails.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VirtualNumaPanelDetails.java
index 0e7d7bb65b9..26839c8d594 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VirtualNumaPanelDetails.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VirtualNumaPanelDetails.java
@@ -37,7 +37,7 @@ interface Style extends CssResource {
 
     @Inject
     public VirtualNumaPanelDetails() {
-        numaTuneMode = new ListModelListBox<>(new EnumRendererWithNull<NumaTuneMode>("&nbsp;"));//$NON-NLS-1$
+        numaTuneMode = new ListModelListBox<>(new EnumRendererWithNull<NumaTuneMode>("&nbsp;")); //$NON-NLS-1$
         initWidget(WidgetUiBinder.uiBinder.createAndBindUi(this));
         applyStyles();
     }
@@ -59,11 +59,11 @@ public void setModel(VNodeModel nodeModel) {
         }, ValueChangeEvent.getType());
 
         nodeModel.getNumaTuneModeList().getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if ("Items".equals(ev.getName())) {//$NON-NLS-1$
+            if ("Items".equals(ev.getName())) { //$NON-NLS-1$
                 setAcceptableValuesForNumaTune(nodeModel);
-            } else if ("SelectedItem".equals(ev.getName())) {//$NON-NLS-1$
+            } else if ("SelectedItem".equals(ev.getName())) { //$NON-NLS-1$
                 setSelectedValueNumaTune(nodeModel);
-            } else if ("IsChangable".equals(ev.getName())) {//$NON-NLS-1$
+            } else if ("IsChangable".equals(ev.getName())) { //$NON-NLS-1$
                 enableNumaTune(nodeModel);
             }
         });
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VmTitlePanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VmTitlePanel.java
index fe728ea883b..39c7a14b352 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VmTitlePanel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/numa/VmTitlePanel.java
@@ -20,7 +20,7 @@ interface WidgetUiBinder extends UiBinder<Widget, VmTitlePanel> {
         WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class);
     }
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     final CommonApplicationResources resources = AssetProvider.getResources();
 
     @UiField
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWidget.java
index b38f70e6315..57ae9eaf525 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWidget.java
@@ -39,7 +39,7 @@ interface ViewUiBinder extends UiBinder<Widget, AbstractItemSelectionWidget> {
     @UiField
     WidgetTooltip filterListLabelTooltip;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     protected ListModelTypeAheadListBoxEditor<T> filterListEditor;
 
     @UiField
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWithListWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWithListWidget.java
index 647567ecb40..c782c2b9c93 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWithListWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractItemSelectionWithListWidget.java
@@ -27,10 +27,10 @@ interface ViewUiBinder extends UiBinder<Widget, AbstractItemSelectionWithListWid
         ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class);
     }
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     protected AbstractItemSelectionWidget<T> selectionWidget;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     protected AbstractItemListWidget<T> listWidget;
 
     public AbstractItemSelectionWithListWidget() {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java
index 70a0aa7b206..9fed18a2539 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractUiCommandButton.java
@@ -43,7 +43,7 @@ public abstract class AbstractUiCommandButton extends Composite
     public HandlerRegistration addClickHandler(ClickHandler handler) {
         Widget widget = getButtonWidget();
         if (widget instanceof HasClickHandlers) {
-            return ((HasClickHandlers)widget).addClickHandler(handler);
+            return ((HasClickHandlers) widget).addClickHandler(handler);
         } else {
             return null;
         }
@@ -68,7 +68,7 @@ public String getLabel() {
         Widget widget = getButtonWidget();
         String result = null;
         if (widget instanceof HasText) {
-            result = ((HasText)widget).getText();
+            result = ((HasText) widget).getText();
         }
         return result;
     }
@@ -77,7 +77,7 @@ public String getLabel() {
     public void setLabel(String label) {
         Widget widget = getButtonWidget();
         if (widget instanceof HasText) {
-            ((HasText)widget).setText(label);
+            ((HasText) widget).setText(label);
         }
     }
 
@@ -85,7 +85,7 @@ protected void updateButton() {
         Widget widget = getButtonWidget();
         widget.setVisible(command.getIsAvailable() && command.getIsVisible());
         if (widget instanceof HasEnabled) {
-            ((HasEnabled)widget).setEnabled(command.getIsExecutionAllowed());
+            ((HasEnabled) widget).setEnabled(command.getIsExecutionAllowed());
         }
         String label = getLabel();
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java
index 5d22415c8e9..0bdf07948d8 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AbstractValidatedWidgetWithLabel.java
@@ -138,7 +138,7 @@ protected void initWidget(Widget wrapperWidget) {
 
     protected LabelWithTooltip getFormLabel() {
         if (label instanceof LabelWithTooltip) {
-            return (LabelWithTooltip)label;
+            return (LabelWithTooltip) label;
         }
         throw new IllegalStateException("No label defined in widget that requires a label"); //$NON-NLS-1$
     }
@@ -229,7 +229,7 @@ public void setWidgetColSize(ColumnSize size) {
     /**
      * Insert a widget that will be place directly after the {@link #getContentWidgetContainer()}.
      */
-    @UiChild(tagname="WidgetDecorator", limit=1)
+    @UiChild(tagname = "WidgetDecorator", limit = 1)
     public void addWidgetDecorator(Widget widget) {
         wrapperPanel.insert(widget, wrapperPanel.getWidgetIndex(contentWidgetContainerTooltip) + 1);
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AffinityGroupSelectionWithListWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AffinityGroupSelectionWithListWidget.java
index 8634acbe91d..7e7784ef3c8 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AffinityGroupSelectionWithListWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/AffinityGroupSelectionWithListWidget.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.core.common.scheduling.AffinityGroup;
 
-public class AffinityGroupSelectionWithListWidget extends AbstractItemSelectionWithListWidget<AffinityGroup>{
+public class AffinityGroupSelectionWithListWidget extends AbstractItemSelectionWithListWidget<AffinityGroup> {
 
     @Override
     public AbstractItemSelectionWidget<AffinityGroup> initItemSelectionWidget() {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
index 891a9e1af61..df9887a7583 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/EntityModelWidgetWithInfo.java
@@ -103,7 +103,7 @@ private void switchToBootstrapMode() {
     public void onAttach() {
         super.onAttach();
         if (contentWidget instanceof PatternFlyCompatible) {
-            ((PatternFlyCompatible)contentWidget).setUsePatternFly(usePatternfly);
+            ((PatternFlyCompatible) contentWidget).setUsePatternFly(usePatternfly);
         }
         if (alignment == Align.LEFT) {
             labelPanel.insert(contentWidgetContainer, 0);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java
index 97836144721..3ba2f485db8 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/MenuBar.java
@@ -42,7 +42,7 @@ public void onBrowserEvent(Event event) {
         case Event.ONCLICK:
             MenuItem item = findItem(DOM.eventGetTarget(event));
 
-            if (item !=null){
+            if (item != null) {
                 PopupPanel subMenuPopup = getSubMenuPopup();
                 if (subMenuPopup != null) {
                     PopupUtils.adjustPopupLocationToFitScreenAndShow(subMenuPopup,
@@ -56,7 +56,7 @@ public void onBrowserEvent(Event event) {
         }
     }
 
-    public boolean isEmpty(){
+    public boolean isEmpty() {
         return getItems() == null || getItems().isEmpty();
     }
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
index 83eca63d8a8..88fc5f3e732 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/dialog/tab/DialogTab.java
@@ -22,7 +22,7 @@ interface WidgetUiBinder extends UiBinder<Widget, DialogTab> {
         WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class);
     }
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     OvirtTabListItem tabListItem;
 
     private Widget tabContent;
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseListModelSuggestBox.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseListModelSuggestBox.java
index 60f0365c5aa..7651bda4b27 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseListModelSuggestBox.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/BaseListModelSuggestBox.java
@@ -184,7 +184,7 @@ public HandlerRegistration addValueChangeHandler(final ValueChangeHandler<T> han
         HandlerRegistration handlerRegistration = asSuggestBox().addValueChangeHandler(event -> {
             try {
                 T value = asEntity(event.getValue());
-                handler.onValueChange(new ValueChangeEvent<T>(value) {});
+                handler.onValueChange(new ValueChangeEvent<T>(value) { });
             } catch (IllegalArgumentException e) {
                 // ignore - the user entered an incorrect string. Just do not notify the listeners
             }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/CheckBoxGroup.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/CheckBoxGroup.java
index 5576a6ec964..cdd745fc61b 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/CheckBoxGroup.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/CheckBoxGroup.java
@@ -117,7 +117,7 @@ public boolean isEnabled() {
      *            boolean whether to enable/disable all checkboxes
      */
     public void setEnabled(boolean enabled) {
-        for(Entry<T, CheckBox> currentValue : checkBoxes.entrySet()) {
+        for (Entry<T, CheckBox> currentValue : checkBoxes.entrySet()) {
             currentValue.getValue().setEnabled(enabled);
         }
     }
@@ -145,7 +145,7 @@ public void setValue(List<T> value, boolean fireEvents) {
             return;
         }
         clearAllSelections();
-        if(value == null){
+        if (value == null) {
             return;
         }
         for (T currentvalue : value) {
@@ -174,11 +174,11 @@ public void setAcceptableValues(Collection<List<T>> values) {
         wrapperPanel.clear();
         checkBoxes.clear();
         if (values.isEmpty()) {
-            throw new IllegalArgumentException("Widget has nothing to do");//$NON-NLS-1$
+            throw new IllegalArgumentException("Widget has nothing to do"); //$NON-NLS-1$
         }
         List<T> acceptableValues = (List<T>) values.toArray()[0];
-        for(T currentValue : acceptableValues) {
-            if(!checkBoxes.containsKey(currentValue)) {
+        for (T currentValue : acceptableValues) {
+            if (!checkBoxes.containsKey(currentValue)) {
                 addCheckBox(currentValue);
             }
         }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/DaysOfMonthSelector.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/DaysOfMonthSelector.java
index 4696fde942e..2af46f7151c 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/DaysOfMonthSelector.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/DaysOfMonthSelector.java
@@ -111,7 +111,7 @@ private void showDaysOfMonth() {
     public void setValue(String value, boolean fireEvents) {
         clearSelections();
         if (value != null && !value.isEmpty()) {
-            for (String valueInProcess : Arrays.asList(value.split(","))) {//$NON-NLS-1$
+            for (String valueInProcess : Arrays.asList(value.split(","))) { //$NON-NLS-1$
                 int selectedIndex = getIndexFromDate(valueInProcess);
                 if (clickedList.get(selectedIndex) != null) {
                     clickedList.set(selectedIndex, true);
@@ -160,14 +160,14 @@ private String addSelectedDate(String selectedValues, String dateString) {
         if (selectedValues == null) {
             selectedValues = dateString;
         } else {
-            selectedValues = selectedValues.concat(",");//$NON-NLS-1$
+            selectedValues = selectedValues.concat(","); //$NON-NLS-1$
             selectedValues = selectedValues.concat(dateString);
         }
         return selectedValues;
     }
 
     private String removeSelectedDate(String selectedValues, String dayInProcess) {
-        List<String> selectedDatesList = new ArrayList<>(Arrays.asList(selectedValues.split(",")));//$NON-NLS-1$
+        List<String> selectedDatesList = new ArrayList<>(Arrays.asList(selectedValues.split(","))); //$NON-NLS-1$
         selectedDatesList.remove(dayInProcess);
         String selectedDatesString = null;
         for (String currentSelectedDate : selectedDatesList) {
@@ -177,11 +177,11 @@ private String removeSelectedDate(String selectedValues, String dayInProcess) {
     }
 
     private String getDateFromIndex(int dayInProcess) {
-        return dayInProcess == LAST_DAY_OF_MONTH_INDEX ? "L" : Integer.toString(dayInProcess + 1);//$NON-NLS-1$
+        return dayInProcess == LAST_DAY_OF_MONTH_INDEX ? "L" : Integer.toString(dayInProcess + 1); //$NON-NLS-1$
     }
 
     private int getIndexFromDate(String value) {
-        return value.equals("L") ? LAST_DAY_OF_MONTH_INDEX : Integer.parseInt(value) - 1;//$NON-NLS-1$
+        return value.equals("L") ? LAST_DAY_OF_MONTH_INDEX : Integer.parseInt(value) - 1; //$NON-NLS-1$
     }
 
     private int getRowForTheDay(int date) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GroupedListModelListBoxEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GroupedListModelListBoxEditor.java
index aefbcb279a1..90a14ea6f59 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GroupedListModelListBoxEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GroupedListModelListBoxEditor.java
@@ -6,7 +6,7 @@
 
 public class GroupedListModelListBoxEditor<T>
     extends AbstractValidatedWidgetWithLabel<T, GroupedListModelListBox<T>>
-    implements IsEditor<WidgetWithLabelEditor<T, GroupedListModelListBoxEditor<T>>>{
+    implements IsEditor<WidgetWithLabelEditor<T, GroupedListModelListBoxEditor<T>>> {
 
     private final WidgetWithLabelEditor<T, GroupedListModelListBoxEditor<T>> editor;
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GwtBootstrapDateTimePicker.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GwtBootstrapDateTimePicker.java
index 237efafa22b..22e6c3871a4 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GwtBootstrapDateTimePicker.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/GwtBootstrapDateTimePicker.java
@@ -20,9 +20,9 @@
 import com.google.gwt.user.client.ui.Widget;
 
 public class GwtBootstrapDateTimePicker implements IsWidget, TakesValue<Date> {
-    public static final String DEFAULT_DATE_TIME_FORMAT = "mm/dd/yyyy hh:ii";//$NON-NLS-1$
-    public static final String DEFAULT_TIME_FORMAT = "hh:ii P";//$NON-NLS-1$
-    public static final String DEFAULT_DATE_FORMAT = "mm/dd/yyyy";//$NON-NLS-1$
+    public static final String DEFAULT_DATE_TIME_FORMAT = "mm/dd/yyyy hh:ii"; //$NON-NLS-1$
+    public static final String DEFAULT_TIME_FORMAT = "hh:ii P"; //$NON-NLS-1$
+    public static final String DEFAULT_DATE_FORMAT = "mm/dd/yyyy"; //$NON-NLS-1$
     private final DateTimePicker dateTimePicker = new DateTimePicker();
     private String dateTimeFormat;
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelCheckBoxGroupEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelCheckBoxGroupEditor.java
index f42a9494b04..c2b3077380c 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelCheckBoxGroupEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelCheckBoxGroupEditor.java
@@ -15,7 +15,7 @@
  * ListModel bound CheckBoxGroup Editor with Label that uses {@link ListModelCheckBoxGroup}.
  */
 
-public class ListModelCheckBoxGroupEditor<T> extends AbstractValidatedWidgetWithLabel<List<T>, ListModelCheckBoxGroup<T>> implements IsEditor<WidgetWithLabelEditor<List<T>, ListModelCheckBoxGroupEditor<T>>>{
+public class ListModelCheckBoxGroupEditor<T> extends AbstractValidatedWidgetWithLabel<List<T>, ListModelCheckBoxGroup<T>> implements IsEditor<WidgetWithLabelEditor<List<T>, ListModelCheckBoxGroupEditor<T>>> {
 
     private final WidgetWithLabelEditor<List<T>, ListModelCheckBoxGroupEditor<T>> editor;
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelListBox.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelListBox.java
index 252d3ff3c8f..1dc97a75363 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelListBox.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelListBox.java
@@ -110,7 +110,7 @@ interface AnchorText extends SafeHtmlTemplates {
     @UiField
     protected FlowPanel dropdownPanel;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     protected Button dropdownButton;
 
     @UiField
@@ -239,7 +239,7 @@ private void updateCurrentValue(final T value, boolean fireEvents) {
         setChanging(!ignoreChanging());
         updateTitle(value);
         String renderedValue = renderer.render(value);
-        ((Element)dropdownButton.getElement().getChild(0)).setInnerHTML(renderedValue);
+        ((Element) dropdownButton.getElement().getChild(0)).setInnerHTML(renderedValue);
         Scheduler.get().scheduleDeferred(() -> listPanel.setSelected(value));
         currentValue = value;
         if (fireEvents) {
@@ -296,7 +296,7 @@ public void setAcceptableValues(Collection<T> values) {
         if (values.isEmpty()) {
             updateCurrentValue(null, false);
         }
-        for(T value: values) {
+        for (T value: values) {
             addValue(value);
         }
     }
@@ -417,13 +417,13 @@ protected ListModelListBox<T>.ListItem getListItem(String text, T value) {
 
         @SuppressWarnings("unchecked")
         public void setSelected(T value) {
-            for(Widget child: getChildren()) {
+            for (Widget child: getChildren()) {
                 if (child instanceof ListModelListBox.ListItem) {
                     ListItem item = (ListModelListBox<T>.ListItem) child;
                     //Clear any selection first
                     item.removeSelected();
                     if (value instanceof List) {
-                        if (((List<T>)value).contains(((List<T>)item.getValue()).get(0))) {
+                        if (((List<T>) value).contains(((List<T>) item.getValue()).get(0))) {
                             item.setSelected();
                         }
                     } else {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelMultipleSelectListBox.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelMultipleSelectListBox.java
index 718dd19556c..c3a30a3ac1e 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelMultipleSelectListBox.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/ListModelMultipleSelectListBox.java
@@ -89,7 +89,7 @@ private void updateCurrentValue(final List<T> value, boolean fireEvents) {
         } else {
             renderedValue = SafeHtmlUtils.htmlEscape(renderedValue);
         }
-        ((Element)dropdownButton.getElement().getChild(0)).setInnerHTML(renderedValue);
+        ((Element) dropdownButton.getElement().getChild(0)).setInnerHTML(renderedValue);
         dropdownButton.setTitle(renderedValue);
         Scheduler.get().scheduleDeferred(() -> listPanel.setSelected(value));
         if (fireEvents) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/TakesConstrainedValueListEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/TakesConstrainedValueListEditor.java
index fd5c4b392ae..e61efba8980 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/TakesConstrainedValueListEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/TakesConstrainedValueListEditor.java
@@ -40,6 +40,6 @@ private List<List<T>> createListOfLists(Collection<T> items) {
     public void setListValue(List<T> value) {
         //Make sure to send a copy so we don't accidentally wipe out the original values.
         List<T> listValue = value == null ? Collections.emptyList() : new ArrayList<>(value);
-        ((TakesListValue<T>)peer).setListValue(listValue);
+        ((TakesListValue<T>) peer).setListValue(listValue);
     }
 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/ListModelSearchBox.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/ListModelSearchBox.java
index 84190b8957e..3ed25369b00 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/ListModelSearchBox.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/ListModelSearchBox.java
@@ -129,7 +129,7 @@ private void configureDropDown() {
     }
 
     private AnchorListItem getAnchorListItem(int index) {
-        return (AnchorListItem)menu.getWidget(index);
+        return (AnchorListItem) menu.getWidget(index);
     }
 
     private void stopPropagation(DomEvent<?> event) {
@@ -152,7 +152,7 @@ private void startSearch(final String searchText) {
     @Override
     public void setVisible(boolean value) {
         if (value) {
-            Scheduler.get().scheduleDeferred( ()-> {
+            Scheduler.get().scheduleDeferred( () -> {
                 searchBox.setFocus(true);
                 currentFocusIndex = -1;
             });
@@ -170,7 +170,7 @@ public void onClick(ClickEvent event) {
     private void selectItem(String name) {
         M listModel = listModelProvider.getModel();
         for (T model: listModel.getItems()) {
-            if(getName(model).asString().equals(name)) {
+            if (getName(model).asString().equals(name)) {
                 for (ListModelSelectedCallback<T> callback: this.callbacks) {
                     callback.modelSelected(model);
                 }
@@ -188,7 +188,7 @@ private void emptyMenuHandlers() {
     protected SafeHtml getName(T item) {
         String result = "";
         if (item instanceof Nameable) {
-            result = ((Nameable)item).getName();
+            result = ((Nameable) item).getName();
         }
         return SafeHtmlUtils.fromString(result);
     }
@@ -198,7 +198,7 @@ private void setInternalRowData(int start, List<? extends T> values) {
         clearMenu();
         emptyMenuHandlers();
         for (T model: values) {
-            if(model instanceof Nameable) {
+            if (model instanceof Nameable) {
                 final String text = getName(model).asString();
                 final AnchorListItem item = new SearchBoxAnchorListItem(this);
                 item.setText(text);
@@ -223,7 +223,7 @@ public void execute() {
             currentFocusIndex = menu.getWidgetCount() - 1;
         }
         if (currentFocusIndex >= 0) {
-            ((AnchorListItem)menu.getWidget(currentFocusIndex)).setFocus(true);
+            ((AnchorListItem) menu.getWidget(currentFocusIndex)).setFocus(true);
         }
     }
 
@@ -244,7 +244,7 @@ public void onKeyUp(int keycode, boolean shiftKey) {
         } else if (keycode == KeyCodes.KEY_DOWN || keycode == KeyCodes.KEY_TAB && !shiftKey) {
             incrementCurrentIndex();
         } else if (keycode == KeyCodes.KEY_ENTER) {
-            selectItem(((AnchorListItem)menu.getWidget(currentFocusIndex)).getText());
+            selectItem(((AnchorListItem) menu.getWidget(currentFocusIndex)).getText());
         } else if (keycode == KeyCodes.KEY_ESCAPE) {
             for (ListModelSelectedCallback<T> callback: this.callbacks) {
                 callback.modelSelected(listModelProvider.getModel().getSelectedItem());
@@ -258,7 +258,7 @@ private void incrementCurrentIndex() {
             searchBox.setFocus(true);
             currentFocusIndex = -1;
         } else {
-            ((AnchorListItem)menu.getWidget(currentFocusIndex)).setFocus(true);
+            ((AnchorListItem) menu.getWidget(currentFocusIndex)).setFocus(true);
         }
     }
 
@@ -267,7 +267,7 @@ private void decrementCurrentIndex() {
         if (currentFocusIndex == -1) {
             searchBox.setFocus(true);
         } else {
-            ((AnchorListItem)menu.getWidget(currentFocusIndex)).setFocus(true);
+            ((AnchorListItem) menu.getWidget(currentFocusIndex)).setFocus(true);
         }
     }
 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/StringEntityModelTextBoxOnlyEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/StringEntityModelTextBoxOnlyEditor.java
index 65201400bbc..a427dd8249c 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/StringEntityModelTextBoxOnlyEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/editor/generic/StringEntityModelTextBoxOnlyEditor.java
@@ -25,7 +25,7 @@ private StringEntityModelTextBoxOnlyEditor(EntityModelTextBox<String> textBox, V
     }
 
     public static StringEntityModelTextBoxOnlyEditor newTrimmingEditor() {
-        return  newTrimmingEditor(new VisibilityRenderer.SimpleVisibilityRenderer());
+        return newTrimmingEditor(new VisibilityRenderer.SimpleVisibilityRenderer());
     }
 
     public static StringEntityModelTextBoxOnlyEditor newTrimmingEditor(VisibilityRenderer visibilityRenderer) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java
index 878e69ae2b8..86957c7417f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/form/AbstractFormPanel.java
@@ -50,7 +50,7 @@ interface Style extends CssResource {
     private final Map<Integer, Integer> nextAvailableRowForColumn = new HashMap<>();
 
     public int getNextAvailableRow(int column) {
-        if(!nextAvailableRowForColumn.containsKey(column)) {
+        if (!nextAvailableRowForColumn.containsKey(column)) {
             nextAvailableRowForColumn.put(column, 0);
         }
         return nextAvailableRowForColumn.get(column);
@@ -73,7 +73,7 @@ public void addFormDetailView(int numOfRows, int numOfColumns) {
     }
 
     public void setRelativeColumnWidth(int columnNum, int widthInGridColumns) {
-        for(int i = 0; i < container.getWidgetCount(); i++) {
+        for (int i = 0; i < container.getWidgetCount(); i++) {
             Row row = (Row) container.getWidget(i);
             Column column = (Column) row.getWidget(columnNum);
             column.setSize(COL_PREFIX + widthInGridColumns);
@@ -163,10 +163,10 @@ public void updateFormItem(FormItem item, Integer labelWidth) {
         if (widgetColumn != null) {
             IsWidget itemCell = widgetColumn.getWidget(0);
             if (itemCell instanceof Row) {
-                Row itemCellRow = (Row)itemCell;
+                Row itemCellRow = (Row) itemCell;
                 // Update item visibility
                 itemCellRow.setVisible(visible);
-                if(itemCellRow.getWidgetCount() > 1) {
+                if (itemCellRow.getWidgetCount() > 1) {
                     itemCellRow.remove(1); //Clear out old value.
                 }
                 Column valueColumn = new Column(COL_PREFIX + determineRealLabelWidth(item, labelWidth));
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListView.java
index a61710cc554..6dab38e5736 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListView.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListView.java
@@ -141,7 +141,7 @@ private void updateInfoPanel() {
             int i = 0;
             List<PatternflyListViewItem<T>> newCurrentState = new ArrayList<>();
             Set<Integer> selectedItemsIndexes = new HashSet<>();
-            for(T item: getModel().getItems()) {
+            for (T item: getModel().getItems()) {
                 if (item == null) {
                     continue;
                 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListViewItem.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListViewItem.java
index 13572228a3c..83cd3671952 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListViewItem.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/listgroup/PatternflyListViewItem.java
@@ -156,7 +156,7 @@ public void onClick(ClickEvent event) {
         event.stopPropagation();
         ExpandableListViewItem eventItem = null;
         if (event.getSource() instanceof ExpandableListViewItem) {
-            eventItem = (ExpandableListViewItem)event.getSource();
+            eventItem = (ExpandableListViewItem) event.getSource();
         }
         if (eventItem != null) {
             boolean active = eventItem.isActive();
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/popup/AbstractVmBasedPopupPresenterWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/popup/AbstractVmBasedPopupPresenterWidget.java
index a16d4b03c01..ade051b1ba4 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/popup/AbstractVmBasedPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/popup/AbstractVmBasedPopupPresenterWidget.java
@@ -22,7 +22,7 @@
 import com.google.inject.Provider;
 
 public class AbstractVmBasedPopupPresenterWidget<V extends AbstractVmBasedPopupPresenterWidget.ViewDef> extends
-    AbstractModelBoundPopupPresenterWidget<UnitVmModel, V>  {
+    AbstractModelBoundPopupPresenterWidget<UnitVmModel, V> {
 
     public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<UnitVmModel>, TabbedView {
         void switchMode(boolean isAdvanced);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java
index ae6d34b234d..af55dd8fb86 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/profile/ProfilesInstanceTypeEditor.java
@@ -70,8 +70,8 @@ protected void init(VnicInstancesModel model) {
     public void setUsePatternFly(boolean use) {
         super.setUsePatternFly(use);
         if (use) {
-            mainPanel.removeStyleName(((ProfileWidgetStyle)style).mainPanelPadding());
-            mainPanel.addStyleName(((ProfileWidgetStyle)style).fullWidth());
+            mainPanel.removeStyleName(((ProfileWidgetStyle) style).mainPanelPadding());
+            mainPanel.addStyleName(((ProfileWidgetStyle) style).fullWidth());
         }
     }
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java
index 776160a8e93..84cc6d14c0f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/DiskSizeRenderer.java
@@ -64,13 +64,13 @@ private String renderGibibyteSize(long size) {
 
     private String renderHumanReadableSize(long size) {
         long sizeInBytes = SizeConverter.convert(size, unit, SizeUnit.BYTES).longValue();
-        if(sizeInBytes >= SizeConverter.BYTES_IN_GB) {
+        if (sizeInBytes >= SizeConverter.BYTES_IN_GB) {
             return messages.gibibytes(String.valueOf(
                     SizeConverter.convert(sizeInBytes, SizeUnit.BYTES, SizeUnit.GiB).longValue()));
-        } else if(sizeInBytes >= SizeConverter.BYTES_IN_MB) {
+        } else if (sizeInBytes >= SizeConverter.BYTES_IN_MB) {
             return messages.megabytes(String.valueOf(
                     SizeConverter.convert(sizeInBytes, SizeUnit.BYTES, SizeUnit.MiB).longValue()));
-        } else if(sizeInBytes >= SizeConverter.BYTES_IN_KB) {
+        } else if (sizeInBytes >= SizeConverter.BYTES_IN_KB) {
             return messages.kilobytes(String.valueOf(
                     SizeConverter.convert(sizeInBytes, SizeUnit.BYTES, SizeUnit.KiB).longValue()));
         } else {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeRenderer.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeRenderer.java
index c0088245058..9fb3ccf2472 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeRenderer.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/renderer/FullDateTimeRenderer.java
@@ -43,7 +43,7 @@ public FullDateTimeRenderer(boolean includeTime) {
 
     @Override
     public String render(Date object) {
-        if(object == null){
+        if (object == null) {
             return constants.notAvailableLabel();
         }
         return formatPattern.format(object);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/DetailTabLayout.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/DetailTabLayout.java
index 75a5f4fad6a..475e36ce8c5 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/DetailTabLayout.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/DetailTabLayout.java
@@ -17,7 +17,7 @@ public class DetailTabLayout {
      */
     public int addGroupedTabData(TabData tabData) {
         DetailTabInfo tabDetails = new DetailTabInfo();
-        tabDetails.setDetailPriority((int)tabData.getPriority());
+        tabDetails.setDetailPriority((int) tabData.getPriority());
         tabDetails.setDetailTitle(tabData.getLabel());
         if (!detailLayout.contains(tabDetails)) {
             detailLayout.add(tabDetails);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/RepeatingPushButton.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/RepeatingPushButton.java
index 7bbe73cda47..cb4a522654a 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/RepeatingPushButton.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/RepeatingPushButton.java
@@ -42,7 +42,7 @@ public void setRepeatInterval(int interval) {
      * Called when the user finished clicking on this button.
      */
     @Override
-    protected void onClick(){
+    protected void onClick() {
         timer.cancel();
         super.onClick();
     }
@@ -53,7 +53,7 @@ protected void onClick(){
      * the mouse button.
      */
     @Override
-    protected void onClickCancel(){
+    protected void onClickCancel() {
         timer.cancel();
         super.onClickCancel();
     }
@@ -62,7 +62,7 @@ protected void onClickCancel(){
      * Called when the user begins to click on this button.
      */
     @Override
-    protected void onClickStart(){
+    protected void onClickStart() {
         timer.scheduleRepeating(period);
         super.onClickStart();
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/TabFactory.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/TabFactory.java
index e67c3343b4c..e36caf9d972 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/TabFactory.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tab/TabFactory.java
@@ -14,7 +14,7 @@ public static TabDefinition createTab(TabData tabData, AbstractTabPanel tabPanel
         if (tabData instanceof DynamicTabData) {
             // Tab widget added dynamically during runtime
             return new DynamicTab((DynamicTabData) tabData, tabPanel, eventBus);
-        } else  if (tabData instanceof GroupedTabData) {
+        } else if (tabData instanceof GroupedTabData) {
             // normal tab
             return new GroupedTab((GroupedTabData) tabData, tabPanel);
         } else {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
index b57696edb63..0f417711d42 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/AbstractActionTable.java
@@ -357,7 +357,7 @@ void initTable() {
                   return;
                 }
                 T value = event.getValue();
-                if(!this.selectionModel.asMultiSelectionModel().isMultiSelectEnabled() &&
+                if (!this.selectionModel.asMultiSelectionModel().isMultiSelectEnabled() &&
                    !this.selectionModel.asMultiSelectionModel().isMultiRangeSelectEnabled()) {
                     selectionModel.setSelected(value, true);
                 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ColumnResizeCellTable.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ColumnResizeCellTable.java
index 1123ace57c9..c32f2ff14c9 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ColumnResizeCellTable.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/ColumnResizeCellTable.java
@@ -575,7 +575,7 @@ public boolean isVisibleOnUserRequest(Column<T, ?> column) {
 
     private void addToVisibleByUserRequest(Column<T, ?> column) {
         Set<Column<T, ?>> alreadyStored = getVisibleByUserRequestColumns();
-        if(!columnResizePersistenceEnabled || alreadyStored.contains(column)) {
+        if (!columnResizePersistenceEnabled || alreadyStored.contains(column)) {
             return;
         }
 
@@ -587,11 +587,11 @@ private void addToVisibleByUserRequest(Column<T, ?> column) {
 
     private void storeVisibleByUserRequestList(Set<Column<T, ?>> toBeStored) {
         String key = getVisibleByUserRequestListKey();
-        if( key == null) {
+        if ( key == null) {
             return;
         }
 
-        if(toBeStored.isEmpty()) {
+        if (toBeStored.isEmpty()) {
             clientStorage.removeRemoteItem(key);
             return;
         }
@@ -609,7 +609,7 @@ private void storeVisibleByUserRequestList(Set<Column<T, ?>> toBeStored) {
 
     private void removeFromVisibleByUserRequest(Column<T, ?> column) {
         Set<Column<T, ?>> visibleColumns = getVisibleByUserRequestColumns();
-        if(!columnResizePersistenceEnabled || !visibleColumns.contains(column) || !isHiddenByDefault(column)) {
+        if (!columnResizePersistenceEnabled || !visibleColumns.contains(column) || !isHiddenByDefault(column)) {
             return;
         }
 
@@ -743,7 +743,7 @@ private int determineOriginalIndex(int index) {
 
     private int determineRealIndex(int originalIndex) {
         for (Map.Entry<Integer, Integer> entry: realToSwappedIndexes.entrySet()) {
-            if( entry.getValue().intValue() == originalIndex) {
+            if (entry.getValue().intValue() == originalIndex) {
                 return entry.getKey();
             }
         }
@@ -1065,7 +1065,7 @@ protected int determineBrowserHeightAdjustment(int height) {
         int contentHeight = height;
         if (clientAgentType.isFirefox()) {
             contentHeight += FF_HEIGHT_ADJUST;
-        } else if(clientAgentType.isIE()) {
+        } else if (clientAgentType.isIE()) {
             contentHeight += IE_HEIGHT_ADJUST;
         } else {
             contentHeight += CHROME_HEIGHT_ADJUST;
@@ -1122,7 +1122,7 @@ private void clearPersistedSettings() {
         clientStorage.removeRemoteItem(getSwappedColumnListKey());
         clientStorage.removeRemoteItem(getVisibleByUserRequestListKey());
 
-        for(Column column : getAllColumns().values()) {
+        for (Column column : getAllColumns().values()) {
             clientStorage.removeLocalItem(getColumnWidthKey(column));
             clientStorage.removeRemoteItem(getHiddenColumnWidthKey(column));
         }
@@ -1170,11 +1170,11 @@ public void resetGridSettings() {
 
         tuples.stream()
                 // sort columns by original index
-                .sorted(Comparator.comparingInt(tuple -> (Integer)tuple[0]))
+                .sorted(Comparator.comparingInt(tuple -> (Integer) tuple[0]))
                 .forEach(tuple -> {
-                    int originalIndex = (Integer)tuple[0];
-                    Header<?> header = (Header)tuple[1];
-                    Column column = (Column)tuple[2];
+                    int originalIndex = (Integer) tuple[0];
+                    Header<?> header = (Header) tuple[1];
+                    Column column = (Column) tuple[2];
 
                     insertColumn(originalIndex, column, header);
                     contextPopup.getContextMenu().addItem(column);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
index 5db2919a929..060d53f4d2b 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ImageResourceCell.java
@@ -7,7 +7,7 @@
 /**
  * Cell that renders an ImageResource. Supports setting a style / class. Supports tooltips.
  */
-public class ImageResourceCell extends AbstractImageCell<ImageResource>  {
+public class ImageResourceCell extends AbstractImageCell<ImageResource> {
 
     @Override
     protected SafeHtml getRenderedImage(ImageResource value) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ListModelListBoxCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ListModelListBoxCell.java
index 12080cd4caa..df4d383ac59 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ListModelListBoxCell.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/ListModelListBoxCell.java
@@ -79,7 +79,7 @@ public void render(Context context, ListModel value, SafeHtmlBuilder sb, String
         SafeHtmlBuilder sbDelegate = new SafeHtmlBuilder();
         delegate.render(context, renderer.render((T) value.getSelectedItem()), sbDelegate);
         String select = sbDelegate.toSafeHtml().asString();
-        select = select.replaceFirst(PATTERN_SELECT, PATTERN_SELECT + " id=\"" + id  + "\""); //$NON-NLS-1$ //$NON-NLS-2$
+        select = select.replaceFirst(PATTERN_SELECT, PATTERN_SELECT + " id=\"" + id + "\""); //$NON-NLS-1$ //$NON-NLS-2$
         if (value.getIsChangable()) {
             sb.append(SafeHtmlUtils.fromTrustedString(select));
         } else {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
index 23c10b84807..73a0069ec3a 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/LunSelectionCell.java
@@ -60,7 +60,7 @@ public void render(Context context, LunModel value, SafeHtmlBuilder sb, String i
         } else if (!value.getIsAccessible()) {
             // ImageResourceCell sets the id
             imageCell.render(context, resources.logWarningImage(), sb, id);
-        }  else if (!multiSelection){
+        } else if (!multiSelection) {
             boolean checked = value.getIsSelected();
             boolean disabled = value.getIsGrayedOut();
             String inputId = id + "_input"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/SafeHtmlCell.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/SafeHtmlCell.java
index b50dceb1f63..cf83c17d271 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/SafeHtmlCell.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/cell/SafeHtmlCell.java
@@ -8,7 +8,7 @@
 /**
  * A Cell used to render SafeHtml. Supports tooltips.
  */
-public class SafeHtmlCell extends AbstractCell<SafeHtml>  {
+public class SafeHtmlCell extends AbstractCell<SafeHtml> {
 
     interface CellTemplate extends SafeHtmlTemplates {
         @Template("<div id=\"{0}\" style='display:block'>{1}</div>")
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractLunActionsColumn.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractLunActionsColumn.java
index 025a646f095..8f112b66672 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractLunActionsColumn.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/table/column/AbstractLunActionsColumn.java
@@ -47,7 +47,7 @@ public void render(Context context, LunModel value, SafeHtmlBuilder sb, String i
                     input = templates.toggledDown(inputId, constants.addSanStorage());
                 } else if (!value.getIsIncluded()) {
                     input = templates.noButton(uiConstants.notAvailableLabel(), SafeStylesUtils.forTrustedColor("gray"), inputId); //$NON-NLS-1$
-                } else if (availableSizeToAdd == 0){
+                } else if (availableSizeToAdd == 0) {
                     input = templates.noButton(constants.cannotExtendSanStorage(), SafeStylesUtils.forTrustedColor("gray"), inputId); //$NON-NLS-1$
                 } else if (value.isAdditionalAvailableSizeSelected()) {
                     input = templates.toggledDown(inputId, availableSizeToAddString);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/OvirtPopover.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/OvirtPopover.java
index abcae382fa7..64c47e48e61 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/OvirtPopover.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/tooltip/OvirtPopover.java
@@ -47,7 +47,7 @@ public void setAutoClose(boolean value) {
 
     @Override
     public void show() {
-        Scheduler.get().scheduleDeferred( ()-> {
+        Scheduler.get().scheduleDeferred( () -> {
             isVisible = true;
         });
         if (autoClose) {
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
index 24ed4f951c4..afbf077202f 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/disks/DisksViewColumns.java
@@ -98,7 +98,7 @@ public String getValue(Disk object) {
                     DiskImage diskImage = (DiskImage) object;
                     List<String> quotaNamesArr = diskImage.getQuotaNames();
                     if (quotaNamesArr != null) {
-                        value = String.join(", ", quotaNamesArr);//$NON-NLS-1$
+                        value = String.join(", ", quotaNamesArr); //$NON-NLS-1$
                     }
                 }
                 return value;
@@ -226,7 +226,7 @@ public SafeHtml getTooltip(Disk object) {
         }
     };
 
-    public static final DiskContainersColumn getdiskContainersColumn(String sortBy){
+    public static final DiskContainersColumn getdiskContainersColumn(String sortBy) {
         DiskContainersColumn diskContainersColumn = new DiskContainersColumn();
         makeSortable(diskContainersColumn, sortBy);
         return diskContainersColumn;
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/instanceimages/InstanceImagesEditor.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/instanceimages/InstanceImagesEditor.java
index f4181bd2079..25385a02c1b 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/instanceimages/InstanceImagesEditor.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/instanceimages/InstanceImagesEditor.java
@@ -51,9 +51,9 @@ public InstanceImagesEditor() {
     public void setUsePatternFly(boolean use) {
         super.setUsePatternFly(use);
         if (use) {
-            title.removeStyleName(((InstanceImagesWidgetStyle)style).titleStylePadding());
-            mainPanel.removeStyleName(((InstanceImagesWidgetStyle)style).mainPanel());
-            contentPanel.removeStyleName(((InstanceImagesWidgetStyle)style).contentPanel());
+            title.removeStyleName(((InstanceImagesWidgetStyle) style).titleStylePadding());
+            mainPanel.removeStyleName(((InstanceImagesWidgetStyle) style).mainPanel());
+            contentPanel.removeStyleName(((InstanceImagesWidgetStyle) style).contentPanel());
         }
     }
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
index 76e33c90c08..97246bf88ac 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java
@@ -906,7 +906,7 @@ interface ViewUiBinder extends UiBinder<DialogTabPanel, AbstractVmPopupWidget> {
 
     @Path(value = "minAllocatedMemory.entity")
     @WithElementId("minAllocatedMemory")
-    @UiField(provided=true)
+    @UiField(provided = true)
     public MemorySizeEntityModelTextBoxEditor minAllocatedMemoryEditor;
 
     @UiField(provided = true)
@@ -1146,7 +1146,7 @@ protected String renderNullSafe(VmWatchdogAction object) {
         isUsbEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
         isSoundcardEnabledEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
         ssoMethodNone = new EntityModelRadioButtonEditor("ssoMethod", new ModeSwitchingVisibilityRenderer()); //$NON-NLS-1$
-        ssoMethodGuestAgent = new EntityModelRadioButtonEditor("ssoMethod", new ModeSwitchingVisibilityRenderer());//$NON-NLS-1$
+        ssoMethodGuestAgent = new EntityModelRadioButtonEditor("ssoMethod", new ModeSwitchingVisibilityRenderer()); //$NON-NLS-1$
         copyTemplatePermissionsEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
         isMemoryBalloonEnabled = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
         isIoThreadsEnabled = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer());
@@ -1437,7 +1437,7 @@ public String getDisplayStringNullSafe(VmTemplate data) {
                 new ModeSwitchingVisibilityRenderer());
 
         templateWithVersionEditor = new ListModelTypeAheadListBoxEditor<>(
-                new ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<TemplateWithVersion>(){
+                new ListModelTypeAheadListBoxEditor.NullSafeSuggestBoxRenderer<TemplateWithVersion>() {
                     @Override
                     public String getReplacementStringNullSafe(TemplateWithVersion templateWithVersion) {
                         return getFirstColumn(templateWithVersion)
@@ -1822,7 +1822,7 @@ protected void initListeners(final UnitVmModel object) {
             }
 
             boolean isWindows = AsyncDataProvider.getInstance().isWindowsOsType(osType);
-            if (isWindows){
+            if (isWindows) {
                 vmInitEnabledEditor.setLabel(constants.sysprep());
                 return;
             }
@@ -2503,6 +2503,6 @@ public String render(Boolean vmMigrateEncrypted) {
     }
 
     private String getNullMigrationDowntimeString() {
-        return constants.systemDefaultOption() + " (" + AsyncDataProvider.getInstance().getMigrationDowntime() + ")";//$NON-NLS-1$ //$NON-NLS-2$
+        return constants.systemDefaultOption() + " (" + AsyncDataProvider.getInstance().getMigrationDowntime() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java
index 65ecf2ca610..56c66ed6ff3 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmDiskAttachPopupWidget.java
@@ -508,7 +508,7 @@ public SafeHtml getTooltip(EntityModel object) {
                 @Override
                 protected boolean canEdit(EntityModel object) {
                     EntityModel<Boolean> bootModel = ((DiskModel) object.getEntity()).getIsBootable();
-                    return  bootModel.getIsChangable() || bootModel.getEntity();
+                    return bootModel.getIsChangable() || bootModel.getEntity();
                 }
 
                 @Override
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
index 526f3219886..c5b86c72fe1 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java
@@ -412,7 +412,7 @@ public VmInitWidget(BasicStyle style) {
         driver.initialize(this);
     }
 
-    private void showIgnitionFields(){
+    private void showIgnitionFields() {
         timeZoneEnabledEditor.setVisible(false);
         timeZoneEditor.setVisible(false);
         networkExpander.setVisible(false);
@@ -425,7 +425,7 @@ private void showIgnitionFields(){
         customScriptExpander.setTitleWhenCollapsed(constants.ignitionScriptLabel());
     }
 
-    private void showCloudInitFields(){
+    private void showCloudInitFields() {
         timeZoneEnabledEditor.setVisible(true);
         timeZoneEditor.setVisible(true);
         networkExpander.setVisible(true);
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
index 1c4d81bd45c..efed3330b60 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmNextRunConfigurationWidget.java
@@ -133,7 +133,7 @@ private SafeHtml bulletedItem(String msg) {
     public void edit(VmNextRunConfigurationModel object) {
         driver.edit(object);
 
-        if (object.isVmUnpinned()){
+        if (object.isVmUnpinned()) {
             setVisibilityToVmUnpinningWarrningPanel(true);
         }
 
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
index 9da4dce7f67..291a0650db0 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmRunOncePopupWidget.java
@@ -148,7 +148,7 @@ interface Style extends CssResource {
     @Ignore
     KeyValueWidget<KeyValueModel> customPropertiesSheetEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     @Path(value = "isoImage.selectedItem")
     @WithElementId("isoImage")
     ListModelListBoxEditor<RepoImage> isoImageEditor;
@@ -595,7 +595,7 @@ private void updateCloudInitVisibility(RunOnceModel model) {
         boolean possible = model.getIsCloudInitPossible().getEntity();
 
         runOnceModel.updateOSs();
-        if(runOnceModel.getIsIgnition()){
+        if (runOnceModel.getIsIgnition()) {
             cloudInitEnabledEditor.setLabel(constants.ignition() + " " + runOnceModel.getIgnitionVersion()); //$NON-NLS-1$
             vmInitWidget.setIgnitionContentVisible(selected && possible);
         } else {
@@ -720,7 +720,7 @@ private String getDefaultEmulatedMachineLabel() {
         String emulatedMachine = runOnceModel.getClusterEmulatedMachine().getEntity();
         String newClusterEmulatedMachine = constants.clusterDefaultOption();
         if (emulatedMachine != null) {
-            newClusterEmulatedMachine +=  "(" + emulatedMachine + ")"; //$NON-NLS-1$ //$NON-NLS-2$
+            newClusterEmulatedMachine += "(" + emulatedMachine + ")"; //$NON-NLS-1$ //$NON-NLS-2$
         }
         return newClusterEmulatedMachine;
     }
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/ImageInfoForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/ImageInfoForm.java
index f10384e95fe..2322f12a1a0 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/ImageInfoForm.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/ImageInfoForm.java
@@ -44,13 +44,13 @@ public void initialize(ImageInfoModel model) {
         setModel(model);
         driver.initialize(this);
 
-        formBuilder.addFormItem(new FormItem(constants.imageFormat(), format, 0, 0){
+        formBuilder.addFormItem(new FormItem(constants.imageFormat(), format, 0, 0) {
             @Override
             public boolean getIsAvailable() {
                 return getModel().getFileLoaded();
             }
         });
-        formBuilder.addFormItem(new FormItem(constants.imageActualSize(), actualSize, 1, 0){
+        formBuilder.addFormItem(new FormItem(constants.imageActualSize(), actualSize, 1, 0) {
             @Override
             public boolean getIsAvailable() {
                 return getModel().getFileLoaded();
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/tasks/ToastNotification.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/tasks/ToastNotification.java
index 9418de16d8d..322409a3d2d 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/tasks/ToastNotification.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/tasks/ToastNotification.java
@@ -32,7 +32,7 @@ public enum NotificationStatus {
         }
 
         public static NotificationStatus from(org.ovirt.engine.ui.frontend.NotificationStatus status) {
-            switch (status){
+            switch (status) {
             case DANGER:
                 return DANGER;
             case SUCCESS:
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListGroupItem.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListGroupItem.java
index 3507d5ca009..165e5de1759 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListGroupItem.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmInterfaceListGroupItem.java
@@ -428,7 +428,7 @@ private IsWidget createCardPluggedStatusPanel(VmNetworkInterface vmNetworkInterf
         );
         icon.add(plugItalic);
         SafeHtmlBuilder tooltipText = new SafeHtmlBuilder();
-        if(isCardPlugged(vmNetworkInterface)) {
+        if (isCardPlugged(vmNetworkInterface)) {
             tooltipText.appendHtmlConstant(constants.pluggedNetworkInterface());
         } else {
             Italic unplugged = italicWithStyles(
diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListViewItem.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListViewItem.java
index f82317efe9f..92f3c6f8ee7 100644
--- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListViewItem.java
+++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmSnapshotListViewItem.java
@@ -152,7 +152,7 @@ private Container createDisksItemContainerPanel(List<DiskImage> diskImages) {
         Container container = createItemContainerPanel(content);
 
         CellTable<DiskImage> disksTable = new CellTable<>(1000,
-                (CellTable.Resources)GWT.create(CellTablePopupTableResources.class));
+                (CellTable.Resources) GWT.create(CellTablePopupTableResources.class));
 
         disksTable.setWidth("98%"); // $NON-NLS-1$
 
diff --git a/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/widget/parser/generic/TrimmingParserTest.java b/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/widget/parser/generic/TrimmingParserTest.java
index a27079ca63d..665dd671301 100644
--- a/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/widget/parser/generic/TrimmingParserTest.java
+++ b/frontend/webadmin/modules/gwt-common/src/test/java/org/ovirt/engine/ui/common/widget/parser/generic/TrimmingParserTest.java
@@ -30,7 +30,7 @@ void emptyString() throws ParseException {
 
     @Test
     void whiteCharsOnlyString() throws ParseException {
-        assertThat(underTest.parse("  \t \t   \n\r ")).isEmpty();//$NON-NLS-1$
+        assertThat(underTest.parse("  \t \t   \n\r ")).isEmpty(); //$NON-NLS-1$
     }
 
     @Test
diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
index 4b64513156e..290df3df25d 100644
--- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
+++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/java/util/UUID.java
@@ -129,10 +129,10 @@ private UUID(byte[] data) {
         long msb = 0;
         long lsb = 0;
         assert data.length == 16;
-        for (int i=0; i<8; i++) {
+        for (int i = 0; i < 8; i++) {
             msb = (msb << 8) | (data[i] & 0xff);
         }
-        for (int i=8; i<16; i++) {
+        for (int i = 8; i < 16; i++) {
             lsb = (lsb << 8) | (data[i] & 0xff);
         }
         this.mostSigBits = msb;
@@ -176,7 +176,7 @@ public static UUID randomUUID() {
         // per rfc4122, sec. 4.1.5
         for (int i = 0; i < 36; i++) {
             if (uuid[i] == 0) {
-                r = (int) (Math.random()*16);
+                r = (int) (Math.random() * 16);
                 uuid[i] = CHARS[(i == 19) ? (r & 0x3) | 0x8 : r & 0xf];
             }
         }
@@ -215,7 +215,7 @@ public static UUID fromString(String name) {
         if (components.length != 5) {
             throw new IllegalArgumentException("Invalid UUID string: " + name);
         }
-        for (int i=0; i<5; i++) {
+        for (int i = 0; i < 5; i++) {
             components[i] = "0x" + components[i];
         }
 
@@ -270,7 +270,7 @@ public long getMostSignificantBits() {
     public int version() {
         if (version < 0) {
             // Version is bits masked by 0x000000000000F000 in MS long
-            version = (int)((mostSigBits >> 12) & 0x0f);
+            version = (int) ((mostSigBits >> 12) & 0x0f);
         }
         return version;
     }
@@ -297,7 +297,7 @@ public int variant() {
             } else if ((leastSigBits >>> 62) == 2) {
                 variant = 2;
             } else {
-                variant = (int)(leastSigBits >>> 61);
+                variant = (int) (leastSigBits >>> 61);
             }
         }
         return variant;
@@ -354,7 +354,7 @@ public int clockSequence() {
             throw new UnsupportedOperationException("Not a time-based UUID");
         }
         if (sequence < 0) {
-            sequence = (int)((leastSigBits & 0x3FFF000000000000L) >>> 48);
+            sequence = (int) ((leastSigBits & 0x3FFF000000000000L) >>> 48);
         }
         return sequence;
     }
@@ -434,7 +434,7 @@ private static String digits(long val, int digits) {
      */
     public int hashCode() {
         if (hashCode == -1) {
-            hashCode = (int)((mostSigBits >> 32) ^
+            hashCode = (int) ((mostSigBits >> 32) ^
                              mostSigBits ^
                              (leastSigBits >> 32) ^
                              leastSigBits);
@@ -458,10 +458,10 @@ public boolean equals(Object obj) {
         if (!(obj instanceof UUID)) {
             return false;
         }
-        if (((UUID)obj).variant() != this.variant()) {
+        if (((UUID) obj).variant() != this.variant()) {
             return false;
         }
-        UUID id = (UUID)obj;
+        UUID id = (UUID) obj;
         return mostSigBits == id.mostSigBits &&
                 leastSigBits == id.leastSigBits;
     }
diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
index dba3ebe38f1..ed70b2cdf68 100644
--- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
+++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/TimeSpan.java
@@ -108,7 +108,7 @@ public static TimeSpan parse(String argvalue) {
             int[] data = new int[5];
 
             for (int x = 0; x < items.length; x++) {
-                data[x+1] = Integer.parseInt(items[x]) * multiplier;
+                data[x + 1] = Integer.parseInt(items[x]) * multiplier;
             }
 
             return new TimeSpan(data);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
index 0efa8de79f9..e4cc741fcf8 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Cloner.java
@@ -379,7 +379,7 @@ private static Network cloneNetwork(Network instance) {
         obj.setDataCenterId(instance.getDataCenterId());
         obj.setMtu(instance.getMtu());
         obj.setVmNetwork(instance.isVmNetwork());
-        if (instance.getCluster() !=null){
+        if (instance.getCluster() != null) {
             obj.setCluster(cloneNetworkCluster(instance.getCluster()));
         }
         if (instance.getProvidedBy() != null) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
index b64b9746480..1ccea13ab94 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
@@ -108,7 +108,7 @@ public static List<DiskModel> filterDisksByType(List<DiskModel> diskModels, Disk
     }
 
     public static <I, T extends I> T findByType(Collection<I> models, Class<T> specific) {
-        return models.stream().filter(m -> m.getClass().equals(specific)).findFirst().map(m -> (T)m).orElse(null);
+        return models.stream().filter(m -> m.getClass().equals(specific)).findFirst().map(m -> (T) m).orElse(null);
     }
 
     public static Collection<EntityModel<?>> findSelectedItems(Collection<EntityModel<?>> items) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Uri.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Uri.java
index e076213137d..6a61730bb31 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Uri.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Uri.java
@@ -32,7 +32,7 @@ public Uri(String uri) {
 
     public Uri(String scheme, String authority, String path) {
         StringBuilder stringBuilder = new StringBuilder();
-        if (scheme != null  && !scheme.isEmpty()) {
+        if (scheme != null && !scheme.isEmpty()) {
             stringBuilder.append(scheme);
             stringBuilder.append("://"); //$NON-NLS-1$
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/template/UnitToAddVmTemplateParametersBuilder.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/template/UnitToAddVmTemplateParametersBuilder.java
index 6649a609881..0f86fc802c1 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/template/UnitToAddVmTemplateParametersBuilder.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/template/UnitToAddVmTemplateParametersBuilder.java
@@ -23,7 +23,7 @@ protected void build(UnitVmModel source, T destination) {
         }
 
         destination.setVirtioScsiEnabled(source.getIsVirtioScsiEnabled().getEntity());
-        if(source.getIsHeadlessModeEnabled().getEntity()) {
+        if (source.getIsHeadlessModeEnabled().getEntity()) {
             destination.getMasterVm().setDefaultDisplayType(DisplayType.none);
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/HwOnlyCoreUnitToVmBaseBuilder.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/HwOnlyCoreUnitToVmBaseBuilder.java
index effb9a92a64..610241b7008 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/HwOnlyCoreUnitToVmBaseBuilder.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/builders/vm/HwOnlyCoreUnitToVmBaseBuilder.java
@@ -32,7 +32,7 @@ protected void postBuild(UnitVmModel model, T vm) {
         vm.setCustomEmulatedMachine(model.getEmulatedMachine().getSelectedItem());
         vm.setCustomCpuName(model.getCustomCpu().getSelectedItem());
         // Console
-        if(model.getIsHeadlessModeEnabled().getEntity()) {
+        if (model.getIsHeadlessModeEnabled().getEntity()) {
             vm.setDefaultDisplayType(DisplayType.none);
         } else {
             vm.setDefaultDisplayType(model.getDisplayType().getSelectedItem());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
index 9360c463ffe..6de6e7a5777 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/dataprovider/AsyncDataProvider.java
@@ -1886,7 +1886,7 @@ public void getAllMetadataAndMemoryDisksOfSnapshotsOnDifferentStorageDomains(
                 aQuery);
     }
 
-    public void getAllEntitiesWithLeaseOnStorageDomain(AsyncQuery<List<VmBase>> aQuery, Guid sdId){
+    public void getAllEntitiesWithLeaseOnStorageDomain(AsyncQuery<List<VmBase>> aQuery, Guid sdId) {
         aQuery.converterCallback = new ListConverter<>();
 
         Frontend.getInstance().runQuery(QueryType.GetEntitiesWithLeaseByStorageId,
@@ -2368,10 +2368,10 @@ public boolean isIgnition(Integer osId) {
 
     public String getIgnitionVersion(Integer osId) {
         if (isIgnition(osId)) {
-            return vmInitMap.get(osId).replace("ignition_", "");//$NON-NLS-1$
+            return vmInitMap.get(osId).replace("ignition_", ""); //$NON-NLS-1$
         }
 
-        return "";//$NON-NLS-1$
+        return ""; //$NON-NLS-1$
     }
 
     public void initWindowsOsTypes() {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/AbstractErrataCountModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/AbstractErrataCountModel.java
index 549ca83a42a..dca480c6eb3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/AbstractErrataCountModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/AbstractErrataCountModel.java
@@ -109,7 +109,7 @@ public void runQuery(Guid guid) {
                 setErrataCounts(resultEntity);
             } else {
                 setMessage(
-                        constants.katelloProblemRetrievingErrata()  + " " + returnValue.getExceptionMessage()); //$NON-NLS-1$
+                        constants.katelloProblemRetrievingErrata() + " " + returnValue.getExceptionMessage()); //$NON-NLS-1$
             }
         });
         asyncQuery.setHandleFailure(true);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplySearchStringEvent.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplySearchStringEvent.java
index 7f84554e117..3641d9ba9dd 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplySearchStringEvent.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplySearchStringEvent.java
@@ -52,7 +52,7 @@ protected void dispatch(ApplySearchStringHandler handler) {
     handler.onApplySearchString(this);
   }
 
-  public String getSearchString(){
+  public String getSearchString() {
     return searchString;
   }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsolesBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsolesBase.java
index f4aa8fb1729..83158dfcca3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsolesBase.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ConsolesBase.java
@@ -94,7 +94,7 @@ public boolean canSelectProtocol(ConsoleProtocol protocol) {
 
     public void selectProtocol(ConsoleProtocol protocol) throws IllegalArgumentException {
         if (!canSelectProtocol(protocol)) {
-            throw new IllegalArgumentException("Cannot select " +protocol.toString() + " protocol for vm " + getVm().getName()); // $NON-NLS-1$ $NON-NLS-2$
+            throw new IllegalArgumentException("Cannot select " + protocol.toString() + " protocol for vm " + getVm().getName()); // $NON-NLS-1$ $NON-NLS-2$
         }
         this.selectedProtocol = protocol;
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java
index d9d6f96ad7b..63d52e06baa 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/GuideModel.java
@@ -79,9 +79,9 @@ public GuideModel() {
         setConsoleHelpers();
     }
 
-    protected void cancel() {}
+    protected void cancel() { }
 
-    protected void postAction() {}
+    protected void postAction() { }
 
     protected String getVdsSearchString(final MoveHost moveHost) {
         StringBuilder buf = new StringBuilder("Host: "); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java
index 3ddcb2aed14..c5e11c73ab5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java
@@ -643,7 +643,7 @@ public void updateChangeability(ConfigValues feature, Version version) {
     }
 
     public class AsyncQuery<T> extends org.ovirt.engine.ui.frontend.AsyncQuery<T> {
-        public AsyncQuery(){
+        public AsyncQuery() {
         }
 
         public AsyncQuery(AsyncCallback<T> callback) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OrderedMultiSelectionModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OrderedMultiSelectionModel.java
index cbec18b5a68..c4bcc55fca1 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OrderedMultiSelectionModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OrderedMultiSelectionModel.java
@@ -213,7 +213,7 @@ private void selectRow(int shift) {
 
         int shiftSelectedRow = lastSelectedRow + shift;
         int nextRow =
-                shiftSelectedRow >= 0  && dataDisplay.getRowCount() != 0 ?
+                shiftSelectedRow >= 0 && dataDisplay.getRowCount() != 0 ?
                         shiftSelectedRow % dataDisplay.getRowCount() : shiftSelectedRow + dataDisplay.getRowCount();
 
         if (disabledRows.contains(nextRow)) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OvirtSelectionModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OvirtSelectionModel.java
index ae54971dd2d..b561fafd6e0 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OvirtSelectionModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/OvirtSelectionModel.java
@@ -125,7 +125,7 @@ public T getFirstSelectedObject() {
      * Call this if {@link #isSingleSelectionOnly()} is {@code true}.
      */
     public SingleSelectionModel<T> asSingleSelectionModel() {
-        assert isSingleSelectionOnly(): "singleSelectionOnly value mismatch"; //$NON-NLS-1$
+        assert isSingleSelectionOnly() : "singleSelectionOnly value mismatch"; //$NON-NLS-1$
         return (SingleSelectionModel<T>) delegate;
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ValidationCompleteEvent.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ValidationCompleteEvent.java
index 7d7e5519be0..6f8342b47e0 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ValidationCompleteEvent.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ValidationCompleteEvent.java
@@ -5,7 +5,7 @@
 import com.google.gwt.event.shared.HasHandlers;
 import com.google.web.bindery.event.shared.HandlerRegistration;
 
-public class ValidationCompleteEvent extends GwtEvent<ValidationCompleteEvent.ValidationCompleteEventHandler>{
+public class ValidationCompleteEvent extends GwtEvent<ValidationCompleteEvent.ValidationCompleteEventHandler> {
 
     Model model;
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
index 06d70877118..de058c11410 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
@@ -42,11 +42,11 @@
 
 public class ClusterGeneralModel extends EntityModel<Cluster> {
 
-    public static final String CPU_VERB_PROPERTY_CHANGE = "cpuVerb";//$NON-NLS-1$
+    public static final String CPU_VERB_PROPERTY_CHANGE = "cpuVerb"; //$NON-NLS-1$
 
-    public static final String CONFIGURED_CPU_VERB_PROPERTY_CHANGE = "configuredCpuVerb";//$NON-NLS-1$
+    public static final String CONFIGURED_CPU_VERB_PROPERTY_CHANGE = "configuredCpuVerb"; //$NON-NLS-1$
 
-    public static final String ARCHITECTURE_PROPERTY_CHANGE = "architecture";//$NON-NLS-1$
+    public static final String ARCHITECTURE_PROPERTY_CHANGE = "architecture"; //$NON-NLS-1$
 
     private Integer noOfVolumesTotal;
     private Integer noOfVolumesUp;
@@ -431,7 +431,7 @@ public void fetchAndImportNewGlusterHosts() {
 
                     HostDetailModel hostModel = new HostDetailModel(host.getKey(), sshPublicKey);
                     hostModel.setName(host.getKey());
-                    hostModel.setPassword("");//$NON-NLS-1$
+                    hostModel.setPassword(""); //$NON-NLS-1$
                     EntityModel<HostDetailModel> entityModel = new EntityModel<>(hostModel);
                     list.add(entityModel);
                 }
@@ -573,7 +573,7 @@ private void updateGlusterDetails() {
         getManageGlusterSwiftCommand().setIsExecutionAllowed(getGlusterSwiftStatus() != GlusterServiceStatus.NOT_AVAILABLE);
 
         AsyncDataProvider.getInstance().getClusterGlusterSwiftService(new AsyncQuery<>(swiftService -> {
-            if(swiftService != null) {
+            if (swiftService != null) {
                 setGlusterSwiftStatus(swiftService.getStatus());
             } else {
                 setGlusterSwiftStatus(GlusterServiceStatus.UNKNOWN);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
index 3732a9bcb33..9ce2134235f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java
@@ -356,7 +356,7 @@ public void onSelectHost() {
                         int i = 0;
 
                         for (MoveHostData selectedHostData : hosts) {
-                            VDS selectedHost= selectedHostData.getEntity();
+                            VDS selectedHost = selectedHostData.getEntity();
                             if (selectedHost.getStatus() == VDSStatus.PendingApproval && retVals.get(i) != null
                                     && retVals.get(i).getSucceeded()) {
                                 Frontend.getInstance().runAction(ActionType.ApproveVds,
@@ -504,7 +504,7 @@ public void onConfirmPMHost() {
     public void onAddDataCenter() {
 
         @SuppressWarnings("unchecked")
-        ListModel<EntityModel<StoragePool>> dataCentersModel = (ListModel<EntityModel<StoragePool>>)getWindow();
+        ListModel<EntityModel<StoragePool>> dataCentersModel = (ListModel<EntityModel<StoragePool>>) getWindow();
         EntityModel<StoragePool> dataCenter = dataCentersModel.getSelectedItem();
 
         if (dataCenter != null) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
index d9fac2d675e..187490c3b93 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java
@@ -791,7 +791,7 @@ private void fetchAndImportClusterHosts(final ClusterModel clusterModel) {
                 onEmptyGlusterHosts(clusterModel);
                 return;
             }
-            if (hostMap.containsValue(null) || hostMap.containsValue("")){ //$NON-NLS-1$
+            if (hostMap.containsValue(null) || hostMap.containsValue("")) { //$NON-NLS-1$
                 onGlusterHostsWithoutPublicKey(hostMap, clusterModel);
                 return;
             }
@@ -800,7 +800,7 @@ private void fetchAndImportClusterHosts(final ClusterModel clusterModel) {
                 String sshPublicKey = host.getValue();
                 HostDetailModel hostModel = new HostDetailModel(host.getKey(), sshPublicKey);
                 hostModel.setName(host.getKey());
-                hostModel.setPassword("");//$NON-NLS-1$
+                hostModel.setPassword(""); //$NON-NLS-1$
                 EntityModel<HostDetailModel> entityModel = new EntityModel<>(hostModel);
                 list.add(entityModel);
             }
@@ -850,7 +850,7 @@ private void importClusterHosts(ClusterModel clusterModel, ArrayList<EntityModel
 
     private void onSaveHosts() {
         MultipleHostsModel hostsModel = (MultipleHostsModel) getWindow();
-        if(hostsModel == null) {
+        if (hostsModel == null) {
             return;
         }
         if (!hostsModel.validate()) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
index ec2558ea739..a9e16540ca4 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
@@ -380,10 +380,10 @@ public void setGlusterHostAddress(EntityModel<String> glusterHostAddress) {
     }
     private EntityModel<String> glusterHostSshPublicKey;
 
-    public EntityModel<String> getGlusterHostSshPublicKey(){
+    public EntityModel<String> getGlusterHostSshPublicKey() {
         return glusterHostSshPublicKey;
     }
-    public void setGlusterHostSshPublicKey(EntityModel<String> glusterHostSshPublicKey){
+    public void setGlusterHostSshPublicKey(EntityModel<String> glusterHostSshPublicKey) {
         this.glusterHostSshPublicKey = glusterHostSshPublicKey;
     }
 
@@ -1253,7 +1253,7 @@ && getEnableTrustedService().getEntity()) {
         getEnableKsm().setEntity(true);
         getKsmPolicyForNumaSelection().setIsChangeable(true);
         getEnableKsm().getEntityChangedEvent().addListener((ev, sender, args) -> {
-            if (getEnableKsm().getEntity() == null){
+            if (getEnableKsm().getEntity() == null) {
                 return;
             }
             if (getEnableKsm().getEntity()) {
@@ -1921,9 +1921,9 @@ private void handleEntityChangedEventDefinition(EntityModel<Boolean> senderEntit
                 getOptimizeForSpeed().setEntity(false);
             } else if (senderEntityModel == getOptimizeForSpeed()) {
                 getOptimizeForUtilization().setEntity(false);
-            } else if(senderEntityModel == getGuarantyResources()) {
+            } else if (senderEntityModel == getGuarantyResources()) {
                 getAllowOverbooking().setEntity(false);
-            } else if(senderEntityModel == getAllowOverbooking()) {
+            } else if (senderEntityModel == getAllowOverbooking()) {
                 getGuarantyResources().setEntity(false);
             }
         }
@@ -2204,8 +2204,8 @@ private void populateCPUList(List<ServerCpu> cpus, boolean canChangeArchitecture
         if (shouldFindEquivalentCpu) {
             String flags;
             if (oldSelectedCpu != null) {
-                flags = String.join(",", oldSelectedCpu.getFlags());//$NON-NLS-1$
-            } else if (getEntity() != null && getEntity().getCpuFlags() != null){
+                flags = String.join(",", oldSelectedCpu.getFlags()); //$NON-NLS-1$
+            } else if (getEntity() != null && getEntity().getCpuFlags() != null) {
                 flags = getEntity().getCpuFlags();
             } else {
                 return;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
index ad2e05fcdda..a9d2738f06a 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkListModel.java
@@ -234,7 +234,7 @@ private void syncAllNetworks() {
         model.getCommands().add(tempVar2);
     }
 
-    private void onSyncAllClusterNetworksConfirm(){
+    private void onSyncAllClusterNetworksConfirm() {
         ConfirmationModel model = (ConfirmationModel) getWindow();
         if (model.getProgress() != null) {
             return;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkManageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkManageModel.java
index 6a56de60e10..c0176eff0a3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkManageModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkManageModel.java
@@ -50,7 +50,7 @@ public boolean isMultiCluster() {
     }
 
     private ClusterNetworkModel getDisplayNetwork() {
-        if (!isMultiCluster()){
+        if (!isMultiCluster()) {
             for (ClusterNetworkModel clusterNetworkManageModel : getItems()) {
                 if (clusterNetworkManageModel.isDisplayNetwork()) {
                    return clusterNetworkManageModel;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java
index a026c0b2326..b64bdc73d71 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterNetworkModel.java
@@ -25,7 +25,7 @@ public ClusterNetworkModel(Network network) {
         }
     }
 
-    public String getDisplayedName(){
+    public String getDisplayedName() {
         return getNetworkName();
     }
 
@@ -37,7 +37,7 @@ public Cluster getCluster() {
         return cluster;
     }
 
-    public void setCluster(Cluster cluster){
+    public void setCluster(Cluster cluster) {
         this.cluster = cluster;
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterServiceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterServiceModel.java
index 04ad1151114..bd72513247d 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterServiceModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterServiceModel.java
@@ -105,7 +105,7 @@ private void updateHostList() {
         boolean refreshNeeded = false;
         List<VDS> hostList = (List<VDS>) getHostList().getItems();
         if (hostList != null && hostList.size() > 1) {
-            for(VDS vds : hostList) {
+            for (VDS vds : hostList) {
                 if (vds != null && !vds.getClusterName().equals(getEntity().getName())) {
                     refreshNeeded = true;
                     break;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
index e9c0c066a74..0c3095e4cb4 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/PermissionListModel.java
@@ -319,7 +319,7 @@ protected VdcObjectType getObjectType() {
         if (getEntity() instanceof Network) {
             return VdcObjectType.Network;
         }
-        if (getEntity() instanceof VnicProfile){
+        if (getEntity() instanceof VnicProfile) {
             return VdcObjectType.VnicProfile;
         }
         if (getEntity() instanceof DiskProfile) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
index 60f9a14c384..c637f0e8fd5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/SystemPermissionListModel.java
@@ -105,7 +105,7 @@ private void onAttach() {
             return;
         }
 
-        if (model.getSelectedItems() == null){
+        if (model.getSelectedItems() == null) {
             model.setIsValid(false);
             model.setMessage(ConstantsManager.getInstance().getConstants().selectUserOrGroup());
             return;
@@ -144,7 +144,7 @@ private void onAttach() {
             }
         }
 
-        if(!list.isEmpty()){
+        if (!list.isEmpty()) {
             model.startProgress();
             Frontend.getInstance().runMultipleAction(ActionType.AddSystemPermission, list,
                     result -> {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java
index 7d70305a4a7..5ad96be0fed 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java
@@ -249,7 +249,7 @@ private void onEditInstanceType() {
         updateInstanceTypeParameters.setTpmEnabled(model.getTpmEnabled().getEntity());
         updateInstanceTypeParameters.setConsoleEnabled(model.getIsConsoleDeviceEnabled().getEntity());
         updateInstanceTypeParameters.setVirtioScsiEnabled(model.getIsVirtioScsiEnabled().getEntity());
-        if(model.getIsHeadlessModeEnabled().getEntity()) {
+        if (model.getIsHeadlessModeEnabled().getEntity()) {
             updateInstanceTypeParameters.getVmTemplateData().setDefaultDisplayType(DisplayType.none);
         }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
index 3d921245ef6..cd79d602a3e 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
@@ -106,7 +106,7 @@ private void refreshCustomProperties(PolicyUnit toRemove, boolean reset) {
             }
         }
         Map<String, String> defaultMap = new HashMap<>(getCustomProperties());
-        if(!reset) {
+        if (!reset) {
             defaultMap.putAll(KeyValueModel.convertProperties(getCustomPropertySheet().serialize()));
         }
         getCustomPropertySheet().setKeyValueMap(policyProperties);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/ClusterNewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/ClusterNewNetworkModel.java
index f1f985727ff..651199faa3b 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/ClusterNewNetworkModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/ClusterNewNetworkModel.java
@@ -4,12 +4,12 @@
 import org.ovirt.engine.core.common.businessentities.network.Network;
 import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel;
 
-public class ClusterNewNetworkModel extends NewNetworkModel{
+public class ClusterNewNetworkModel extends NewNetworkModel {
 
     private final Cluster cluster;
     public ClusterNewNetworkModel(SearchableListModel<?, ? extends Network> sourceListModel, Cluster cluster) {
         super(sourceListModel);
-        this.cluster= cluster;
+        this.cluster = cluster;
     }
 
     @Override
@@ -21,7 +21,7 @@ protected NetworkClusterModel createNetworkClusterModel(Cluster cluster) {
             networkClusterModel.setIsChangeable(false);
 
             return networkClusterModel;
-         }else{
+         } else {
              return super.createNetworkClusterModel(cluster);
          }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 4c896268f70..40f18c45919 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -364,9 +364,9 @@ private void updateAddAndAttachDataDomainAvailability(List<VDS> upHosts, List<St
         }
     }
 
-    private boolean doesHostSupportAnyCluster(List<Cluster> clusterList, VDS host){
-        for (Cluster cluster : clusterList){
-            if (host.getSupportedClusterVersionsSet().contains(cluster.getCompatibilityVersion())){
+    private boolean doesHostSupportAnyCluster(List<Cluster> clusterList, VDS host) {
+        for (Cluster cluster : clusterList) {
+            if (host.getSupportedClusterVersionsSet().contains(cluster.getCompatibilityVersion())) {
                 return true;
             }
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterIscsiBondListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterIscsiBondListModel.java
index 13092cf9fda..ed41860c975 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterIscsiBondListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterIscsiBondListModel.java
@@ -63,7 +63,7 @@ public void setEntity(StoragePool value) {
     }
 
     private void updateActionAvailability() {
-        boolean atLeastOneItemSelected =  getSelectedItems() != null && !getSelectedItems().isEmpty();
+        boolean atLeastOneItemSelected = getSelectedItems() != null && !getSelectedItems().isEmpty();
 
         getEditCommand().setIsExecutionAllowed(atLeastOneItemSelected);
         getRemoveCommand().setIsExecutionAllowed(atLeastOneItemSelected);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
index 43a71ed4552..7a62426ca39 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java
@@ -426,7 +426,7 @@ private void cleanupFinishedTasks() {
                 .map(storagePool -> new StoragePoolParametersBase(storagePool.getId()))
                 .collect(Collectors.toList());
 
-        Frontend.getInstance().runMultipleAction(ActionType.CleanFinishedTasks, parameters, result -> {}, null);
+        Frontend.getInstance().runMultipleAction(ActionType.CleanFinishedTasks, parameters, result -> { }, null);
     }
 
     public void onRecover() {
@@ -595,7 +595,7 @@ private void validateDataCenterName(final DataCenterModel dataCenter) {
         Frontend.getInstance().runQuery(QueryType.GetStoragePoolByDatacenterName,
                 new NameQueryParameters(dataCenter.getName().getEntity()),
                 new AsyncQuery<QueryReturnValue>(returnValue -> {
-                    if (!((Collection<?>)returnValue.getReturnValue()).isEmpty()) {
+                    if (!((Collection<?>) returnValue.getReturnValue()).isEmpty()) {
                         dataCenter.getName().getInvalidityReasons().add(
                                 ConstantsManager.getInstance().getConstants().nameMustBeUniqueInvalidReason());
                         dataCenter.getName().setIsValid(false);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
index 2d413583e88..6f3620a56b5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java
@@ -270,8 +270,8 @@ private void initExternalProviderList() {
 
     private List<Provider<?>> getNonReadOnlyExternalNetworkProviders(List<Provider<?>> result) {
         List<Provider<?>> providers = new LinkedList<>();
-        for (Provider<?> provider : result){
-            if (isExternalNetworkProviderReadOnly(provider)){
+        for (Provider<?> provider : result) {
+            if (isExternalNetworkProviderReadOnly(provider)) {
                 continue;
             }
             providers.add(provider);
@@ -282,7 +282,7 @@ private List<Provider<?>> getNonReadOnlyExternalNetworkProviders(List<Provider<?
     private boolean isExternalNetworkProviderReadOnly(Provider<?> provider) {
         OpenstackNetworkProviderProperties properties =
                 (OpenstackNetworkProviderProperties) provider.getAdditionalProperties();
-        if (properties.getReadOnly()){
+        if (properties.getReadOnly()) {
             return true;
         }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/StorageQosMetricParametersModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/StorageQosMetricParametersModel.java
index b317f331012..050dc66641f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/StorageQosMetricParametersModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/StorageQosMetricParametersModel.java
@@ -161,7 +161,7 @@ public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs
 
     private void updateChangeability() {
         //Suppress update of changeability when entities weren't constructed yet.
-        if(getChoiceGroupNone() == null || getChoiceGroupNone().getEntity() == null ||
+        if (getChoiceGroupNone() == null || getChoiceGroupNone().getEntity() == null ||
            getChoiceGroupTotal() == null || getChoiceGroupTotal().getEntity() == null ||
            getChoiceGroupReadWrite() == null || getChoiceGroupReadWrite().getEntity() == null) {
             return;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
index 388c835f20f..dce71a37f8c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/disks/DiskListModel.java
@@ -140,7 +140,7 @@ public UICommand getUploadCommand() {
     }
 
     private void setUploadCommand(UICommand value) {
-        privateUploadCommand= value;
+        privateUploadCommand = value;
     }
 
     private UICommand privateCancelUploadCommand;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
index d91bf69f8c3..b96d09e2be1 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/CreateBrickModel.java
@@ -114,7 +114,7 @@ private void setBrickSize(Pair<SizeUnit, Double> size) {
     }
 
     private String getSizeString(Pair<SizeUnit, Double> size) {
-        return formatSize(size.getSecond()) + " " + size.getFirst().toString();//$NON-NLS-1$
+        return formatSize(size.getSecond()) + " " + size.getFirst().toString(); //$NON-NLS-1$
     }
 
     public ListModel<StorageDevice> getStorageDevices() {
@@ -196,7 +196,7 @@ public boolean validate() {
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 
     public EntityModel<Integer> getStripeSize() {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterClusterSnapshotConfigModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterClusterSnapshotConfigModel.java
index c35bcc1237b..287dfb00a1a 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterClusterSnapshotConfigModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterClusterSnapshotConfigModel.java
@@ -66,7 +66,7 @@ private void init() {
     public boolean validate() {
         boolean isValid = true;
         setMessage(null);
-        if(getClusterConfigOptions().getItems() == null || getClusterConfigOptions().getItems().isEmpty()) {
+        if (getClusterConfigOptions().getItems() == null || getClusterConfigOptions().getItems().isEmpty()) {
             setMessage(ConstantsManager.getInstance().getMessages().clusterSnapshotOptionNotExist());
             return false;
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepActionConfirmationModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepActionConfirmationModel.java
index 6b2b92aee26..b63ed536bc9 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepActionConfirmationModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepActionConfirmationModel.java
@@ -76,7 +76,7 @@ public String getForceHelp() {
 
     public void setForceHelp(String forceHelp) {
         this.forceHelp = forceHelp;
-        onPropertyChanged(new PropertyChangedEventArgs("forceHelp"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("forceHelp")); //$NON-NLS-1$
     }
 
     @Override
@@ -86,12 +86,12 @@ public String getMessage() {
 
     public void setActionConfirmationMessage(String message) {
         this.message = message;
-        onPropertyChanged(new PropertyChangedEventArgs("ActionConfirmationMessage"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("ActionConfirmationMessage")); //$NON-NLS-1$
     }
 
     public void setForceLabel(String forceLabel) {
         this.forceLabel = forceLabel;
-        onPropertyChanged(new PropertyChangedEventArgs("forceLabel"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("forceLabel")); //$NON-NLS-1$
     }
 
     public static void callInitWindow(GlusterVolumeGeoRepActionConfirmationModel cmodel,
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
index 2196e7ef2f8..5ac9c7244b8 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeGeoRepCreateModel.java
@@ -33,7 +33,7 @@
 import org.ovirt.engine.ui.uicompat.UIConstants;
 import org.ovirt.engine.ui.uicompat.UIMessages;
 
-public class GlusterVolumeGeoRepCreateModel extends Model{
+public class GlusterVolumeGeoRepCreateModel extends Model {
 
     private EntityModel<Boolean> showEligibleVolumes;
     private EntityModel<String> slaveUserName;
@@ -103,7 +103,7 @@ private void initValueChangeListeners() {
 
     public void getVolumesForForceSessionCreate() {
         GlusterVolumeGeoRepCreateModel.this.startProgress(constants.fetchingDataMessage());
-        SearchParameters volumesSearchParameters = new SearchParameters("Volumes:", SearchType.GlusterVolume, false);//$NON-NLS-1$
+        SearchParameters volumesSearchParameters = new SearchParameters("Volumes:", SearchType.GlusterVolume, false); //$NON-NLS-1$
         volumesSearchParameters.setRefresh(true);
 
         Frontend.getInstance().runQuery(QueryType.Search, volumesSearchParameters, new AsyncQuery<QueryReturnValue>(returnValue -> showAvailableVolumes(returnValue)));
@@ -111,7 +111,7 @@ public void getVolumesForForceSessionCreate() {
 
     private void showAvailableVolumes(QueryReturnValue returnValue) {
         stopProgress();
-        if(!returnValue.getSucceeded()) {
+        if (!returnValue.getSucceeded()) {
             setQueryFailureMessage(returnValue.getExceptionString());
         } else {
             setVolumeList((Collection) returnValue.getReturnValue());
@@ -130,16 +130,16 @@ public void getEligibleVolumes() {
 
     protected Set<String> getClusterForVolumes(Collection<GlusterVolumeEntity> eligibleVolumes) {
         Set<String> clusters = new HashSet<>();
-        for(GlusterVolumeEntity currentVolume : eligibleVolumes) {
+        for (GlusterVolumeEntity currentVolume : eligibleVolumes) {
             clusters.add(currentVolume.getClusterName());
         }
         return clusters;
     }
 
     public List<GlusterVolumeEntity> getVolumesInCluster(String cluster, Collection<GlusterVolumeEntity> volumes) {
-        List<GlusterVolumeEntity> volumesInCurrentCluster= new ArrayList<>();
-        for(GlusterVolumeEntity currentVolume : volumes) {
-            if(currentVolume.getClusterName().equals(cluster)) {
+        List<GlusterVolumeEntity> volumesInCurrentCluster = new ArrayList<>();
+        for (GlusterVolumeEntity currentVolume : volumes) {
+            if (currentVolume.getClusterName().equals(cluster)) {
                 volumesInCurrentCluster.add(currentVolume);
             }
         }
@@ -148,7 +148,7 @@ public List<GlusterVolumeEntity> getVolumesInCluster(String cluster, Collection<
 
     public Set<Pair<String, Guid>> getHostNamesForVolume(GlusterVolumeEntity volume) {
         Set<Pair<String, Guid>> hosts = new HashSet<>();
-        for(GlusterBrickEntity currentBrick : volume.getBricks()) {
+        for (GlusterBrickEntity currentBrick : volume.getBricks()) {
             hosts.add(new Pair<>(currentBrick.getServerName(), currentBrick.getServerId()));
         }
         return hosts;
@@ -176,13 +176,13 @@ public Collection<GlusterVolumeEntity> getVolumeList() {
 
     public void setVolumeList(Collection<GlusterVolumeEntity> volumeList) {
         this.volumeList = volumeList;
-        onPropertyChanged(new PropertyChangedEventArgs("RecommendationViolations"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("RecommendationViolations")); //$NON-NLS-1$
     }
 
     private void init() {
         setTitle(constants.newGeoRepSessionTitle());
         setHelpTag(HelpTag.volume_geo_rep_create);
-        setHashName("volume_geo_rep_create");//$NON-NLS-1$
+        setHashName("volume_geo_rep_create"); //$NON-NLS-1$
 
         setShowEligibleVolumes(new EntityModel<Boolean>());
         setSlaveClusters(new ListModel<String>());
@@ -240,7 +240,7 @@ public String getRecommendationViolations() {
 
     public void setRecommendationViolations(String recommendationViolations) {
         this.recommendationViolations = recommendationViolations;
-        onPropertyChanged(new PropertyChangedEventArgs("RecommendationViolations"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("RecommendationViolations")); //$NON-NLS-1$
     }
 
     public void updateRecommendatonViolations() {
@@ -248,10 +248,10 @@ public void updateRecommendatonViolations() {
         AsyncDataProvider.getInstance().getGlusterVolumeGeoRepRecommendationViolations(new AsyncQuery<>(
                 eligibilityViolators -> {
                     stopProgress();
-                    if(eligibilityViolators.size() > 0) {
+                    if (eligibilityViolators.size() > 0) {
                         StringBuilder configViolations = new StringBuilder(constants.geoReplicationRecommendedConfigViolation());
-                        for(GlusterGeoRepNonEligibilityReason currentViolator : eligibilityViolators) {
-                            configViolations.append("\n* ");//$NON-NLS-1$
+                        for (GlusterGeoRepNonEligibilityReason currentViolator : eligibilityViolators) {
+                            configViolations.append("\n* "); //$NON-NLS-1$
                             configViolations.append(EnumTranslator.getInstance().translate(currentViolator));
                         }
                         setRecommendationViolations(configViolations.toString());
@@ -273,7 +273,7 @@ public String getQueryFailureMessage() {
 
     public void setQueryFailureMessage(String queryFailureMessage) {
         this.queryFailureMessage = queryFailureMessage;
-        onPropertyChanged(new PropertyChangedEventArgs("QueryFailed"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("QueryFailed")); //$NON-NLS-1$
     }
 
     public EntityModel<String> getSlaveUserGroupName() {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotListModel.java
index 756e70735dd..729dfd2756e 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotListModel.java
@@ -30,7 +30,7 @@ public String getListName() {
     public GlusterVolumeSnapshotListModel() {
         setTitle(ConstantsManager.getInstance().getConstants().snapshotsTitle());
         setHelpTag(HelpTag.volume_snapshots);
-        setHashName("volume_snapshots");//$NON-NLS-1$
+        setHashName("volume_snapshots"); //$NON-NLS-1$
 
         setRestoreSnapshotCommand(new UICommand("restore", this)); //$NON-NLS-1$
         setDeleteSnapshotCommand(new UICommand("delete", this)); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotModel.java
index 8b387e5f819..dec5938e4e7 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/GlusterVolumeSnapshotModel.java
@@ -119,11 +119,11 @@ && getEndDate().getEntity().compareTo(getStartAt().getEntity()) <= 0) {
 
     private void validateDaysOfMonth() {
         if (getRecurrence().getSelectedItem() == GlusterVolumeSnapshotScheduleRecurrence.MONTHLY) {
-            if (getDaysOfMonth().getSelectedItem() == null || getDaysOfMonth().getSelectedItem().equals("")) {//$NON-NLS-1$
+            if (getDaysOfMonth().getSelectedItem() == null || getDaysOfMonth().getSelectedItem().equals("")) { //$NON-NLS-1$
                 String message = ConstantsManager.getInstance().getConstants().noMonthDaysSelectedMessage();
                 getDaysOfMonth().setInvalidityReasons(Collections.singletonList(message));
                 getDaysOfMonth().setIsValid(false);
-            } else if (getDaysOfMonth().getSelectedItem().contains(",L") || getDaysOfMonth().getSelectedItem().contains("L,")) {//$NON-NLS-1$//$NON-NLS-2$
+            } else if (getDaysOfMonth().getSelectedItem().contains(",L") || getDaysOfMonth().getSelectedItem().contains("L,")) { //$NON-NLS-1$//$NON-NLS-2$
                 String message = ConstantsManager.getInstance().getConstants().lastDayMonthCanBeSelectedAlone();
                 getDaysOfMonth().setInvalidityReasons(Collections.singletonList(message));
                 getDaysOfMonth().setIsValid(false);
@@ -316,10 +316,10 @@ public boolean validate(boolean inplaceValidate) {
             listenersRegistered = true;
         }
 
-        if(inplaceValidate) {
-            propName = "modelPropertiesChanged";//$NON-NLS-1$
+        if (inplaceValidate) {
+            propName = "modelPropertiesChanged"; //$NON-NLS-1$
         } else {
-            propName = "validateAndSwitchAppropriateTab";//$NON-NLS-1$
+            propName = "validateAndSwitchAppropriateTab"; //$NON-NLS-1$
         }
         onPropertyChanged(new PropertyChangedEventArgs(propName));
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java
index 69bcf4fb6d6..fdf344f625d 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/HostGlusterStorageDevicesListModel.java
@@ -185,7 +185,7 @@ private void updateActionAvailability() {
         }
     }
 
-    private boolean canCreateBrick(){
+    private boolean canCreateBrick() {
         boolean canCreateBrick = false;
         List<StorageDevice> selectedDevices = getSelectedItems();
         if (selectedDevices != null) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/ResetBrickModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/ResetBrickModel.java
index 6812dc4381d..79a6c2a51ae 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/ResetBrickModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/ResetBrickModel.java
@@ -2,7 +2,7 @@
 
 import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel;
 
-public class ResetBrickModel extends ConfirmationModel{
+public class ResetBrickModel extends ConfirmationModel {
 
     private String validationMessage;
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
index d6be870901b..879536a2e58 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickListModel.java
@@ -910,7 +910,7 @@ private void showRemoveBricksStatus() {
         cModel.setHelpTag(HelpTag.volume_remove_bricks_status);
         cModel.setHashName("volume_remove_bricks_status"); ////$NON-NLS-1$
 
-        UICommand removeBrickStatusOk = new UICommand("CancelConfirmation", VolumeBrickListModel.this);//$NON-NLS-1$
+        UICommand removeBrickStatusOk = new UICommand("CancelConfirmation", VolumeBrickListModel.this); //$NON-NLS-1$
         removeBrickStatusOk.setTitle(ConstantsManager.getInstance().getConstants().ok());
         removeBrickStatusOk.setIsCancel(true);
         cModel.startProgress(ConstantsManager.getInstance().getConstants().fetchingDataMessage());
@@ -918,19 +918,19 @@ private void showRemoveBricksStatus() {
         cModel.setTitle(ConstantsManager.getInstance().getConstants().removeBricksStatusTitle());
         setConfirmWindow(cModel);
 
-        final UICommand stopRemoveBrickFromStatus = new UICommand("StopRemoveBricksOnStatus", this);//$NON-NLS-1$
+        final UICommand stopRemoveBrickFromStatus = new UICommand("StopRemoveBricksOnStatus", this); //$NON-NLS-1$
         stopRemoveBrickFromStatus.setTitle(ConstantsManager.getInstance().getConstants().stopRemoveBricksButton());
         stopRemoveBrickFromStatus.setIsExecutionAllowed(false);
 
-        final UICommand commitRemoveBrickFromStatus = new UICommand("CommitRemoveBricksOnStatus", this);//$NON-NLS-1$
+        final UICommand commitRemoveBrickFromStatus = new UICommand("CommitRemoveBricksOnStatus", this); //$NON-NLS-1$
         commitRemoveBrickFromStatus.setTitle(ConstantsManager.getInstance().getConstants().commitRemoveBricksButton());
         commitRemoveBrickFromStatus.setIsExecutionAllowed(false);
 
-        final UICommand retainBricksFromStatus = new UICommand("RetainBricksOnStatus", this);//$NON-NLS-1$
+        final UICommand retainBricksFromStatus = new UICommand("RetainBricksOnStatus", this); //$NON-NLS-1$
         retainBricksFromStatus.setTitle(ConstantsManager.getInstance().getConstants().retainBricksButton());
         retainBricksFromStatus.setIsExecutionAllowed(false);
 
-        final UICommand cancelCommand = new UICommand("CancelRemoveBricksStatus", this);//$NON-NLS-1$
+        final UICommand cancelCommand = new UICommand("CancelRemoveBricksStatus", this); //$NON-NLS-1$
         cancelCommand.setTitle(ConstantsManager.getInstance().getConstants().close());
         cancelCommand.setIsCancel(true);
 
@@ -1305,7 +1305,7 @@ public void executeCommand(UICommand command) {
             replaceBrick();
         } else if (command.getName().equals("OnReplace")) { //$NON-NLS-1$
             onReplaceBrick();
-        }  else if (command.equals(getBrickAdvancedDetailsCommand())) {
+        } else if (command.equals(getBrickAdvancedDetailsCommand())) {
             showBrickAdvancedDetails();
         } else if (command.equals(getResetBrickCommand())) {
             resetBrick();
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
index 0ed5b3cd510..1046ee28322 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeBrickModel.java
@@ -335,7 +335,7 @@ private boolean validateBrickDirectory(String brickDir) {
             return false;
         }
 
-        if(!brickDir.startsWith("/")) { //$NON-NLS-1$
+        if (!brickDir.startsWith("/")) { //$NON-NLS-1$
             setMessage(ConstantsManager.getInstance().getConstants().invalidBrickDirectoryStartWithSlashMsg());
             return false;
         }
@@ -578,7 +578,7 @@ public boolean validateReplicateBricks(int oldReplicaCount, List<GlusterBrickEnt
         int replicaCount = getReplicaCountValue();
         Set<String> servers = new HashSet<>();
 
-        if(replicaCount > oldReplicaCount) {
+        if (replicaCount > oldReplicaCount) {
             int count = 0;
             for (GlusterBrickEntity brick : existingBricks) {
                 servers.add(brick.getServerName());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
index 4d80673c849..a9476d157fa 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeneralModel.java
@@ -155,7 +155,7 @@ private void updatePropeties() {
         setNumOfBricks(entity.getBricks() != null ? Integer.toString(entity.getBricks().size()) : null);
         setTransportTypes(entity.getTransportTypes());
         setSnapMaxLimit(entity.getSnapMaxLimit() != null ? entity.getSnapMaxLimit().toString() : null);
-        if(entity.getAdvancedDetails() != null && entity.getAdvancedDetails().getCapacityInfo() != null) {
+        if (entity.getAdvancedDetails() != null && entity.getAdvancedDetails().getCapacityInfo() != null) {
             setVolumeFreeCapacity(entity.getAdvancedDetails().getCapacityInfo().getFreeSize());
             setVolumeTotalCapacity(entity.getAdvancedDetails().getCapacityInfo().getTotalSize());
             setVolumeUsedCapacity(entity.getAdvancedDetails().getCapacityInfo().getUsedSize());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
index 91749032fa1..353f5d1510f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepListModel.java
@@ -52,22 +52,22 @@ public class VolumeGeoRepListModel extends SearchableListModel<GlusterVolumeEnti
 
     @Override
     protected String getListName() {
-        return "VolumeGeoReplicationModel";//$NON-NLS-1$
+        return "VolumeGeoReplicationModel"; //$NON-NLS-1$
     }
 
     public VolumeGeoRepListModel() {
         setTitle(constants.geoReplicationTitle());
         setHelpTag(HelpTag.geo_replication);
-        setHashName("geo_replication");//$NON-NLS-1$
-        setNewSessionCommand(new UICommand("createNewSession", this));//$NON-NLS-1$
-        setRemoveSessionCommand(new UICommand("removeSession", this));//$NON-NLS-1$
-        setStartSessionCommand(new UICommand("startSession", this));//$NON-NLS-1$
-        setStopSessionCommand(new UICommand("stopSession", this));//$NON-NLS-1$
-        setSessionOptionsCommand(new UICommand("sessionOptions", this));//$NON-NLS-1$
-        setViewSessionDetailsCommand(new UICommand("viewSessionDetails", this));//$NON-NLS-1$
-        setRefreshSessionsCommand(new UICommand("refreshSessions", this));//$NON-NLS-1$
-        setPauseSessionCommand(new UICommand("pauseSession", this));//$NON-NLS-1$
-        setResumeSessionCommand(new UICommand("resumeSession", this));//$NON-NLS-1$
+        setHashName("geo_replication"); //$NON-NLS-1$
+        setNewSessionCommand(new UICommand("createNewSession", this)); //$NON-NLS-1$
+        setRemoveSessionCommand(new UICommand("removeSession", this)); //$NON-NLS-1$
+        setStartSessionCommand(new UICommand("startSession", this)); //$NON-NLS-1$
+        setStopSessionCommand(new UICommand("stopSession", this)); //$NON-NLS-1$
+        setSessionOptionsCommand(new UICommand("sessionOptions", this)); //$NON-NLS-1$
+        setViewSessionDetailsCommand(new UICommand("viewSessionDetails", this)); //$NON-NLS-1$
+        setRefreshSessionsCommand(new UICommand("refreshSessions", this)); //$NON-NLS-1$
+        setPauseSessionCommand(new UICommand("pauseSession", this)); //$NON-NLS-1$
+        setResumeSessionCommand(new UICommand("resumeSession", this)); //$NON-NLS-1$
     }
 
     public UICommand getViewSessionDetailsCommand() {
@@ -187,7 +187,7 @@ private void updateActionAvailability(GlusterVolumeEntity volumeEntity) {
         boolean allowSessionOptionsCommand = false;
         boolean allowRemoveSessionCommand = false;
         boolean allowSessionDetailsCommand = false;
-        if(volumeEntity == null) {
+        if (volumeEntity == null) {
             return;
         }
         if (getSelectedItems() != null && getSelectedItems().size() == 1) {
@@ -223,44 +223,44 @@ public void executeCommand(UICommand command) {
         if (command.equals(getNewSessionCommand())) {
             createGeoRepSession();
         } else if (command.equals(getRemoveSessionCommand())) {
-            confirmGeoRepAction(constants.geoReplicationRemoveTitle(), HelpTag.volume_geo_rep_remove_confirmation, "volume_geo_rep_remove_confirmation", "removeGeoRepSession", constants.removeGeoRep());//$NON-NLS-1$//$NON-NLS-2$
-        } else if(command.equals(getStartSessionCommand())) {
+            confirmGeoRepAction(constants.geoReplicationRemoveTitle(), HelpTag.volume_geo_rep_remove_confirmation, "volume_geo_rep_remove_confirmation", "removeGeoRepSession", constants.removeGeoRep()); //$NON-NLS-1$//$NON-NLS-2$
+        } else if (command.equals(getStartSessionCommand())) {
             startGeoRepSession();
-        } else if(command.equals(getStopSessionCommand())) {
-            confirmGeoRepAction(constants.geoReplicationStopTitle(), HelpTag.volume_geo_rep_stop_confirmation, "volume_geo_rep_stop_confirmation", "stopGeoRepSesssion", constants.stopGeoRep());//$NON-NLS-1$//$NON-NLS-2$
-        }  else if(command.equals(getPauseSessionCommand())) {
-            confirmGeoRepAction(constants.geoReplicationPauseTitle(), HelpTag.volume_geo_rep_pause_confirmation, "volume_geo_rep_pause_confirmation", "pauseGeoRepSession", constants.pauseGeoRep());//$NON-NLS-1$//$NON-NLS-2$
-        } else if(command.equals(getResumeSessionCommand())) {
+        } else if (command.equals(getStopSessionCommand())) {
+            confirmGeoRepAction(constants.geoReplicationStopTitle(), HelpTag.volume_geo_rep_stop_confirmation, "volume_geo_rep_stop_confirmation", "stopGeoRepSesssion", constants.stopGeoRep()); //$NON-NLS-1$//$NON-NLS-2$
+        } else if (command.equals(getPauseSessionCommand())) {
+            confirmGeoRepAction(constants.geoReplicationPauseTitle(), HelpTag.volume_geo_rep_pause_confirmation, "volume_geo_rep_pause_confirmation", "pauseGeoRepSession", constants.pauseGeoRep()); //$NON-NLS-1$//$NON-NLS-2$
+        } else if (command.equals(getResumeSessionCommand())) {
             resumeGeoRepSession();
-        } else if(command.equals(getSessionOptionsCommand())) {
+        } else if (command.equals(getSessionOptionsCommand())) {
             showSessionOptions();
-        } else if(command.equals(getViewSessionDetailsCommand())) {
+        } else if (command.equals(getViewSessionDetailsCommand())) {
             showGeoRepSessionDetails(getSelectedItem());
         } else if (command.equals(getRefreshSessionsCommand())) {
             refreshSessions();
-        } else if (command.getName().equalsIgnoreCase("onCreateSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onCreateSession")) { //$NON-NLS-1$
             onCreateSession();
-        } else if (command.getName().equalsIgnoreCase("onStartGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onStartGeoRepSession")) { //$NON-NLS-1$
             onGeoRepSessionAction(ActionType.StartGlusterVolumeGeoRep);
-        } else if (command.getName().equalsIgnoreCase("onStopGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onStopGeoRepSession")) { //$NON-NLS-1$
             onGeoRepSessionAction(ActionType.StopGeoRepSession);
-        } else if (command.getName().equalsIgnoreCase("onPauseGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onPauseGeoRepSession")) { //$NON-NLS-1$
             onGeoRepSessionAction(ActionType.PauseGlusterVolumeGeoRepSession);
-        } else if (command.getName().equalsIgnoreCase("onResumeGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onResumeGeoRepSession")) { //$NON-NLS-1$
             onGeoRepSessionAction(ActionType.ResumeGeoRepSession);
-        } else if (command.getName().equalsIgnoreCase("onRemoveGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onRemoveGeoRepSession")) { //$NON-NLS-1$
             onGeoRepSessionAction(ActionType.DeleteGeoRepSession);
-        } else if (command.getName().equalsIgnoreCase("ok")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("ok")) { //$NON-NLS-1$
             updateConfig();
-        } else if (command.getName().equalsIgnoreCase("closeWindow")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("closeWindow")) { //$NON-NLS-1$
             closeWindow();
-        } else if(command.getName().equalsIgnoreCase("stopGeoRepSesssion")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("stopGeoRepSesssion")) { //$NON-NLS-1$
             stopGeoRepSession();
-        } else if(command.getName().equalsIgnoreCase("removeGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("removeGeoRepSession")) { //$NON-NLS-1$
             removeGeoRepSession();
-        } else if(command.getName().equalsIgnoreCase("pauseGeoRepSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("pauseGeoRepSession")) { //$NON-NLS-1$
             pauseGeoRepSession();
-        } else if (command.getName().equalsIgnoreCase("closeConfirmWindow")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("closeConfirmWindow")) { //$NON-NLS-1$
             closeConfirmWindow();
         }
     }
@@ -272,12 +272,12 @@ private void closeConfirmWindow() {
     private void populateStatus(final List<GlusterGeoRepSessionDetails> details) {
         final VolumeGeoRepSessionDetailsModel windowModel = new VolumeGeoRepSessionDetailsModel();
         windowModel.setHelpTag(HelpTag.geo_replication_status_detail);
-        windowModel.setHashName("geo_replication_status_detail");//$NON-NLS-1$
+        windowModel.setHashName("geo_replication_status_detail"); //$NON-NLS-1$
 
         final UIConstants constants = ConstantsManager.getInstance().getConstants();
         windowModel.setTitle(constants.geoReplicationSessionDetailsTitle());
 
-        UICommand okCommand = new UICommand("closeWindow", this);//$NON-NLS-1$
+        UICommand okCommand = new UICommand("closeWindow", this); //$NON-NLS-1$
         okCommand.setIsCancel(true);
         okCommand.setTitle(constants.ok());
         windowModel.getCommands().add(okCommand);
@@ -293,14 +293,14 @@ private void populateStatus(final List<GlusterGeoRepSessionDetails> details) {
 
     public void showGeoRepSessionDetails(GlusterGeoRepSession session) {
         ArrayList<GlusterGeoRepSessionDetails> details = session.getSessionDetails();
-        if(getWindow() != null) {
+        if (getWindow() != null) {
             return;
         }
-        if(details == null || details.size() == 0) {
+        if (details == null || details.size() == 0) {
             final UIConstants constants = ConstantsManager.getInstance().getConstants();
             final ConfirmationModel cModel = new ConfirmationModel();
             cModel.setTitle(constants.geoReplicationSessionDetailsTitle());
-            UICommand okCommand = new UICommand("closeConfirmWindow", this);//$NON-NLS-1$
+            UICommand okCommand = new UICommand("closeConfirmWindow", this); //$NON-NLS-1$
             okCommand.setTitle(constants.ok());
             okCommand.setIsCancel(true);
             cModel.getCommands().add(okCommand);
@@ -318,7 +318,7 @@ private void showSessionOptions() {
         GlusterGeoRepSession selectedGeoRepSession = getSelectedItem();
         GlusterVolumeGeoReplicationSessionConfigModel configModel = new GlusterVolumeGeoReplicationSessionConfigModel(selectedGeoRepSession);
         configModel.setTitle(constants.geoReplicationOptions());
-        configModel.setHashName("volume_geo_rep_configuration_display");//$NON-NLS-1$
+        configModel.setHashName("volume_geo_rep_configuration_display"); //$NON-NLS-1$
         configModel.setHelpTag(HelpTag.volume_geo_rep_configuration_display);
         configModel.startProgress();
 
@@ -401,10 +401,10 @@ private void updateConfig() {
     }
 
     private void addUICommandsToConfigWindow(GlusterVolumeGeoReplicationSessionConfigModel geoRepConfigModel) {
-        UICommand okCommand = UICommand.createDefaultOkUiCommand("ok", this);//$NON-NLS-1$
+        UICommand okCommand = UICommand.createDefaultOkUiCommand("ok", this); //$NON-NLS-1$
         geoRepConfigModel.addUpdateConfigsCommand(okCommand);
 
-        UICommand cancelCommand = UICommand.createCancelUiCommand("closeWindow", this);//$NON-NLS-1$
+        UICommand cancelCommand = UICommand.createCancelUiCommand("closeWindow", this); //$NON-NLS-1$
         geoRepConfigModel.addCancelCommand(cancelCommand);
     }
 
@@ -432,7 +432,7 @@ private void onCreateSession() {
                     if (result.getReturnValue().getSucceeded()) {
                         closeWindow();
                         if (createModel.getStartSession().getEntity()) {
-                            initializeGeoRepActionConfirmation(constants.geoReplicationStartTitle(), HelpTag.volume_geo_rep_start_confirmation, "volume_geo_rep_start_confirmation", constants.geoRepForceHelp(), messages.geoRepForceTitle(constants.startGeoRep()), "onStartGeoRepSession", getEntity().getName(), remoteVolumeName, remoteHostName, null);//$NON-NLS-1$//$NON-NLS-2$
+                            initializeGeoRepActionConfirmation(constants.geoReplicationStartTitle(), HelpTag.volume_geo_rep_start_confirmation, "volume_geo_rep_start_confirmation", constants.geoRepForceHelp(), messages.geoRepForceTitle(constants.startGeoRep()), "onStartGeoRepSession", getEntity().getName(), remoteVolumeName, remoteHostName, null); //$NON-NLS-1$//$NON-NLS-2$
                             final GlusterVolumeGeoRepActionConfirmationModel cModel = (GlusterVolumeGeoRepActionConfirmationModel) getWindow();
                             cModel.startProgress();
                             Frontend.getInstance().runAction(ActionType.StartGlusterVolumeGeoRep,
@@ -472,12 +472,12 @@ private void createGeoRepSession() {
         geoRepCreateModel.getSlaveUserName().setEntity(constants.rootUser());
         geoRepCreateModel.getShowEligibleVolumes().setEntity(true);
 
-        UICommand ok = new UICommand("onCreateSession", this);//$NON-NLS-1$
+        UICommand ok = new UICommand("onCreateSession", this); //$NON-NLS-1$
         ok.setTitle(constants.ok());
         ok.setIsDefault(true);
         geoRepCreateModel.getCommands().add(ok);
 
-        UICommand close = new UICommand("closeWindow", this);//$NON-NLS-1$
+        UICommand close = new UICommand("closeWindow", this); //$NON-NLS-1$
         close.setTitle(constants.cancel());
         close.setIsCancel(true);
         geoRepCreateModel.getCommands().add(close);
@@ -488,11 +488,11 @@ private void closeWindow() {
     }
 
     private void startGeoRepSession() {
-        performGeoRepAction("onStartGeoRepSession", constants.geoReplicationStartTitle(), HelpTag.volume_geo_rep_start_confirmation, "volume_geo_rep_start_confirmation", constants.startGeoRep(), ActionType.StartGlusterVolumeGeoRep);//$NON-NLS-1$//$NON-NLS-2$
+        performGeoRepAction("onStartGeoRepSession", constants.geoReplicationStartTitle(), HelpTag.volume_geo_rep_start_confirmation, "volume_geo_rep_start_confirmation", constants.startGeoRep(), ActionType.StartGlusterVolumeGeoRep); //$NON-NLS-1$//$NON-NLS-2$
     }
 
     private void stopGeoRepSession() {
-        performGeoRepAction("onStopGeoRepSession", constants.geoReplicationStopTitle(), HelpTag.volume_geo_rep_stop_confirmation, "volume_geo_rep_stop_confirmation", constants.stopGeoRep(), ActionType.StopGeoRepSession);//$NON-NLS-1$//$NON-NLS-2$
+        performGeoRepAction("onStopGeoRepSession", constants.geoReplicationStopTitle(), HelpTag.volume_geo_rep_stop_confirmation, "volume_geo_rep_stop_confirmation", constants.stopGeoRep(), ActionType.StopGeoRepSession); //$NON-NLS-1$//$NON-NLS-2$
     }
 
     private void confirmGeoRepAction(String title, HelpTag helpTag, String hashName, String commandName, String action) {
@@ -505,15 +505,15 @@ private void confirmGeoRepAction(String title, HelpTag helpTag, String hashName,
     }
 
     private void pauseGeoRepSession() {
-        performGeoRepAction("onPauseGeoRepSession", constants.geoReplicationPauseTitle(), HelpTag.volume_geo_rep_pause_confirmation, "volume_geo_rep_pause_confirmation", constants.pauseGeoRep(), ActionType.PauseGlusterVolumeGeoRepSession);//$NON-NLS-1$//$NON-NLS-2$
+        performGeoRepAction("onPauseGeoRepSession", constants.geoReplicationPauseTitle(), HelpTag.volume_geo_rep_pause_confirmation, "volume_geo_rep_pause_confirmation", constants.pauseGeoRep(), ActionType.PauseGlusterVolumeGeoRepSession); //$NON-NLS-1$//$NON-NLS-2$
     }
 
     private void resumeGeoRepSession() {
-        performGeoRepAction("onResumeGeoRepSession", constants.geoReplicationResumeTitle(), HelpTag.volume_geo_rep_resume_confirmation, "volume_geo_rep_resume_confirmation", constants.resumeGeoRep(), ActionType.ResumeGeoRepSession);//$NON-NLS-1$//$NON-NLS-2$
+        performGeoRepAction("onResumeGeoRepSession", constants.geoReplicationResumeTitle(), HelpTag.volume_geo_rep_resume_confirmation, "volume_geo_rep_resume_confirmation", constants.resumeGeoRep(), ActionType.ResumeGeoRepSession); //$NON-NLS-1$//$NON-NLS-2$
     }
 
     private void removeGeoRepSession() {
-        performGeoRepAction("onRemoveGeoRepSession", constants.geoReplicationRemoveTitle(), HelpTag.volume_geo_rep_remove_confirmation, "volume_geo_rep_remove_confirmation", constants.removeGeoRep(), ActionType.DeleteGeoRepSession);//$NON-NLS-1$//$NON-NLS-2$
+        performGeoRepAction("onRemoveGeoRepSession", constants.geoReplicationRemoveTitle(), HelpTag.volume_geo_rep_remove_confirmation, "volume_geo_rep_remove_confirmation", constants.removeGeoRep(), ActionType.DeleteGeoRepSession); //$NON-NLS-1$//$NON-NLS-2$
     }
 
     private void performGeoRepAction(String commandName,
@@ -533,8 +533,8 @@ private void performGeoRepAction(String commandName,
 
     private void initializeGeoRepActionConfirmation(String title, HelpTag helpTag, String hashName, String forceHelp, String forceLabelText, String commandName, String masterVolumeName, String slaveVolumeName, String slaveHostName, String message) {
         GlusterVolumeGeoRepActionConfirmationModel cModel;
-        if(getWindow() != null) {
-            if(getWindow() instanceof GlusterVolumeGeoRepActionConfirmationModel) {
+        if (getWindow() != null) {
+            if (getWindow() instanceof GlusterVolumeGeoRepActionConfirmationModel) {
                 cModel = (GlusterVolumeGeoRepActionConfirmationModel) getWindow();
             } else {
                 return;
@@ -554,9 +554,9 @@ private void initializeGeoRepActionConfirmation(String title, HelpTag helpTag, S
         cModel.setForceHelp(forceHelp);
         cModel.setForceLabel(forceLabelText);
 
-        List<UICommand> geoRepActionCommands = Arrays.asList(UICommand.createDefaultOkUiCommand(commandName, this), UICommand.createCancelUiCommand("closeWindow", this));//$NON-NLS-1$
+        List<UICommand> geoRepActionCommands = Arrays.asList(UICommand.createDefaultOkUiCommand(commandName, this), UICommand.createCancelUiCommand("closeWindow", this)); //$NON-NLS-1$
 
-        if(cModel.getCommands().size() > 0) {
+        if (cModel.getCommands().size() > 0) {
             cModel.setCommands(geoRepActionCommands);
         } else {
             cModel.getCommands().addAll(geoRepActionCommands);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepSessionDetailsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepSessionDetailsModel.java
index f706549b78f..0241cdcdae6 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepSessionDetailsModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeGeoRepSessionDetailsModel.java
@@ -6,7 +6,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.Model;
 import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs;
 
-public class VolumeGeoRepSessionDetailsModel extends Model{
+public class VolumeGeoRepSessionDetailsModel extends Model {
     private ListModel<EntityModel<GlusterGeoRepSessionDetails>> geoRepSessionSummary;
     public ListModel<EntityModel<GlusterGeoRepSessionDetails>> getGeoRepSessionSummary() {
         return geoRepSessionSummary;
@@ -19,8 +19,8 @@ public void setGeoRepSessionSummary(ListModel<EntityModel<GlusterGeoRepSessionDe
     public VolumeGeoRepSessionDetailsModel() {
         setGeoRepSessionSummary(new ListModel<EntityModel<GlusterGeoRepSessionDetails>>());
         getGeoRepSessionSummary().getSelectedItemChangedEvent().addListener((ev, sender, args) -> {
-            if(geoRepSessionSummary != null && geoRepSessionSummary.getSelectedItem() != null) {
-                onPropertyChanged(new PropertyChangedEventArgs("selectedSessionSummaryRow"));//$NON-NLS-1$
+            if (geoRepSessionSummary != null && geoRepSessionSummary.getSelectedItem() != null) {
+                onPropertyChanged(new PropertyChangedEventArgs("selectedSessionSummaryRow")); //$NON-NLS-1$
             }
         });
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
index e873f60929e..db17064cb80 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeModel.java
@@ -292,7 +292,7 @@ private void updateDefaults() {
         getOptimizeForVirtStore().setEntity(isHCMode());
     }
 
-    public void addBricks(){
+    public void addBricks() {
         if (getWindow() != null || getCluster().getSelectedItem() == null) {
             return;
         }
@@ -503,7 +503,7 @@ private void dataCenter_SelectedItemChanged() {
                 StoragePool selectedDataCenter = getDataCenter().getSelectedItem();
 
                 Iterator<Cluster> iterator = clusters.iterator();
-                while(iterator.hasNext()) {
+                while (iterator.hasNext()) {
                     if (!iterator.next().supportsGlusterService()) {
                         iterator.remove();
                     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeProfileStatisticsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeProfileStatisticsModel.java
index 51f94048b77..1d27903b551 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeProfileStatisticsModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeProfileStatisticsModel.java
@@ -122,7 +122,7 @@ public boolean isSuccessfulProfileStatsFetch() {
 
     public void setSuccessfulProfileStatsFetch(boolean successfulProfileStatsFetch) {
         this.successfulProfileStatsFetch = successfulProfileStatsFetch;
-        onPropertyChanged(new PropertyChangedEventArgs("statusOfFetchingProfileStats"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("statusOfFetchingProfileStats")); //$NON-NLS-1$
     }
 
     public VolumeProfileStatisticsModel(Guid clusterId, Guid volumeId, String volumeName) {
@@ -137,20 +137,20 @@ public VolumeProfileStatisticsModel(Guid clusterId, Guid volumeId, String volume
         final UIMessages messages = ConstantsManager.getInstance().getMessages();
         getBricks().getSelectedItemChangedEvent().addListener((ev, sender, args) -> onBrickSelectionChange(messages));
         getNfsServers().getSelectedItemChangedEvent().addListener((ev, sender, args) -> onNfsServerSelectionChange(messages));
-        setProfileRunTime("");//$NON-NLS-1$
-        setNfsProfileRunTime("");//$NON-NLS-1$
-        setBytesRead("");//$NON-NLS-1$
-        setNfsBytesRead("");//$NON-NLS-1$
-        setBytesWritten("");//$NON-NLS-1$
-        setNfsBytesWritten("");//$NON-NLS-1$
+        setProfileRunTime(""); //$NON-NLS-1$
+        setNfsProfileRunTime(""); //$NON-NLS-1$
+        setBytesRead(""); //$NON-NLS-1$
+        setNfsBytesRead(""); //$NON-NLS-1$
+        setBytesWritten(""); //$NON-NLS-1$
+        setNfsBytesWritten(""); //$NON-NLS-1$
     }
 
     private void onNfsServerSelectionChange(UIMessages messages) {
-        if(getNfsServers().getSelectedItem() == null) {
+        if (getNfsServers().getSelectedItem() == null) {
             return;
         }
         int index = getProfileInfo().getNfsProfileDetails().indexOf(getNfsServers().getSelectedItem());
-        if(index < 0) {
+        if (index < 0) {
             return;
         }
         List<GlusterVolumeProfileStats> nfsProfileStats = getProfileInfo().getNfsProfileDetails();
@@ -159,21 +159,21 @@ private void onNfsServerSelectionChange(UIMessages messages) {
         populateCummulativeStatistics(selectedNfsServerCummulativeProfile.getFopStats(), getNfsServerProfileStats());
 
         nfsProfileRunTime = formatRunTime(messages, selectedNfsServerCummulativeProfile.getDurationFormatted(), selectedNfsServerIntervalProfile.getDurationFormatted());
-        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileRunTimeChanged"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileRunTimeChanged")); //$NON-NLS-1$
 
         nfsBytesRead = formatDataRead(messages, selectedNfsServerCummulativeProfile.getTotalRead(), selectedNfsServerIntervalProfile.getTotalRead());
-        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileDataRead"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileDataRead")); //$NON-NLS-1$
 
         nfsBytesWritten = formatDataWritten(messages, selectedNfsServerCummulativeProfile.getTotalWrite(), selectedNfsServerIntervalProfile.getTotalWrite());
-        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileDataWritten"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("nfsProfileDataWritten")); //$NON-NLS-1$
     }
 
     private void onBrickSelectionChange(UIMessages messages) {
-        if(getBricks().getSelectedItem() == null) {
+        if (getBricks().getSelectedItem() == null) {
             return;
         }
         int index = getProfileInfo().getBrickProfileDetails().indexOf(getBricks().getSelectedItem());
-        if(index < 0) {
+        if (index < 0) {
             return;
         }
         List<BrickProfileDetails> profileStats = getProfileInfo().getBrickProfileDetails();
@@ -183,13 +183,13 @@ private void onBrickSelectionChange(UIMessages messages) {
         populateCummulativeStatistics(selectedBrickProfileCummulativeStats.getFopStats(), getCumulativeStatistics());
 
         profileRunTime = formatRunTime(messages, selectedBrickProfileCummulativeStats.getDurationFormatted(), selectedBrickProfileIntervalStats.getDurationFormatted());
-        onPropertyChanged(new PropertyChangedEventArgs("brickProfileRunTimeChanged"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("brickProfileRunTimeChanged")); //$NON-NLS-1$
 
         bytesRead = formatDataRead(messages, selectedBrickProfileCummulativeStats.getTotalRead(), selectedBrickProfileIntervalStats.getTotalRead());
-        onPropertyChanged(new PropertyChangedEventArgs("brickProfileDataRead"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("brickProfileDataRead")); //$NON-NLS-1$
 
         bytesWritten = formatDataWritten(messages, selectedBrickProfileCummulativeStats.getTotalWrite(), selectedBrickProfileIntervalStats.getTotalWrite());
-        onPropertyChanged(new PropertyChangedEventArgs("brickProfileDataWritten"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("brickProfileDataWritten")); //$NON-NLS-1$
     }
 
     public void queryBackend(final boolean isNfs) {
@@ -197,8 +197,8 @@ public void queryBackend(final boolean isNfs) {
 
         AsyncDataProvider.getInstance().getGlusterVolumeProfilingStatistics(new AsyncQuery<>(returnValue -> {
             stopProgress();
-            GlusterVolumeProfileInfo profileInfoEntity =returnValue.getReturnValue();
-            if(profileInfoEntity == null || !returnValue.getSucceeded()) {
+            GlusterVolumeProfileInfo profileInfoEntity = returnValue.getReturnValue();
+            if (profileInfoEntity == null || !returnValue.getSucceeded()) {
                 setSuccessfulProfileStatsFetch(false);
                 if (isNfs) {
                     showNfsProfileStats(profileInfoEntity);
@@ -226,7 +226,7 @@ public void showProfileStats(GlusterVolumeProfileInfo entity) {
         if (entity != null) {
             final List<BrickProfileDetails> brickProfileDetails = entity.getBrickProfileDetails();
             getBricks().setItems(brickProfileDetails);
-            if(brickProfileDetails.size() > 0) {
+            if (brickProfileDetails.size() > 0) {
                 getBricks().setSelectedItem(brickProfileDetails.get(0));
             }
         }
@@ -234,7 +234,7 @@ public void showProfileStats(GlusterVolumeProfileInfo entity) {
 
     private void populateCummulativeStatistics(List<FopStats> fopStats, ListModel profileStats) {
         List<EntityModel<FopStats>> fopStatsEntities = new ArrayList<>();
-        for(int i = 0;i < fopStats.size();i++) {
+        for (int i = 0; i < fopStats.size(); i++) {
             EntityModel<FopStats> fopStatEntity = new EntityModel<>(fopStats.get(i));
             fopStatsEntities.add(fopStatEntity);
         }
@@ -242,10 +242,10 @@ private void populateCummulativeStatistics(List<FopStats> fopStats, ListModel pr
     }
 
     public void showNfsProfileStats(GlusterVolumeProfileInfo entity) {
-        if(entity != null) {
+        if (entity != null) {
             List<GlusterVolumeProfileStats> nfsProfileDetails = entity.getNfsProfileDetails();
             getNfsServers().setItems(nfsProfileDetails);
-            if(nfsProfileDetails.size() > 0) {
+            if (nfsProfileDetails.size() > 0) {
                 getNfsServers().setSelectedItem(nfsProfileDetails.get(0));
             }
         }
@@ -268,8 +268,8 @@ private String formatDataWritten(UIMessages messages, long totalBytesWritten, lo
     }
 
     private String formProfileUrl(String clusterId, String volumeId, boolean isBrickProfileSelected) {
-        String apiMatrixParam = !isBrickProfileSelected ? ";nfsStatistics=true" : "";//$NON-NLS-1$//$NON-NLS-2$
-        return StringFormat.format("/ovirt-engine/api/clusters/%s/glustervolumes/%s/profilestatistics%s?accept=application/json", clusterId, volumeId, apiMatrixParam);//$NON-NLS-1$
+        String apiMatrixParam = !isBrickProfileSelected ? ";nfsStatistics=true" : ""; //$NON-NLS-1$//$NON-NLS-2$
+        return StringFormat.format("/ovirt-engine/api/clusters/%s/glustervolumes/%s/profilestatistics%s?accept=application/json", clusterId, volumeId, apiMatrixParam); //$NON-NLS-1$
     }
 
     public String getProfileExportUrl() {
@@ -281,6 +281,6 @@ public void setProfileExportUrl(String profileExportUrl) {
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
index e4b5b2178d8..bcb4facf3f0 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
@@ -119,12 +119,12 @@ public void showStatus(GlusterVolumeTaskStatusEntity rebalanceStatusEntity) {
         getStatusTime().setEntity(rebalanceStatusEntity.getStatusTime());
         getRebalanceSessions().setItems(sessionList);
         setStatusAvailable(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.FINISHED);
-        if(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.FINISHED) {
+        if (rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.FINISHED) {
             refresh.cancel();
-        }else {
+        } else {
             if (rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.ABORTED || rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.FAILED) {
                 refresh.cancel();
-                if(rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.ABORTED) {
+                if (rebalanceStatusEntity.getStatusSummary().getStatus() == JobExecutionStatus.ABORTED) {
                     getStopTime().setEntity(rebalanceStatusEntity.getStopTime());
                 }
             }
@@ -164,7 +164,7 @@ public boolean isStatusAvailable() {
 
     public void setStatusAvailable(boolean isStatusAvailable) {
         this.isStatusAvailable = isStatusAvailable;
-        onPropertyChanged(new PropertyChangedEventArgs("STATUS_UPDATED"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("STATUS_UPDATED")); //$NON-NLS-1$
     }
 
     private boolean stopTimeVisible;
@@ -183,6 +183,6 @@ public boolean isStopTimeVisible() {
 
     public void setStopTimeVisible(boolean stopTimeVisible) {
         this.stopTimeVisible = stopTimeVisible;
-        onPropertyChanged(new PropertyChangedEventArgs("STOP_TIME_UPDATED"));//$NON-NLS-1$
+        onPropertyChanged(new PropertyChangedEventArgs("STOP_TIME_UPDATED")); //$NON-NLS-1$
     }
 }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/FenceProxyModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/FenceProxyModel.java
index 77948df73b4..677f71dbe82 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/FenceProxyModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/FenceProxyModel.java
@@ -75,7 +75,7 @@ private void setCurrentProxies(ListModel<FenceProxyModel> currentProxies) {
 
         // Determine the available proxy types.
         List<FenceProxyModel> availableProxiesList = new ArrayList<>();
-        for(FenceProxySourceType type : FenceProxySourceType.values()) {
+        for (FenceProxySourceType type : FenceProxySourceType.values()) {
             if (!currentSourceTypes.contains(type)) {
                 FenceProxyModel newModel = new FenceProxyModel();
                 newModel.setEntity(type);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
index 094ff2199cd..63f87e8725d 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostInterfaceListModel.java
@@ -427,7 +427,7 @@ public void syncAllHostNetworks() {
         model.getCommands().add(tempVar2);
     }
 
-    private void onSyncAllHostNetworkConfirm(){
+    private void onSyncAllHostNetworkConfirm() {
         ConfirmationModel model = (ConfirmationModel) getWindow();
         if (model.getProgress() != null) {
             return;
@@ -442,7 +442,7 @@ private void onSyncAllHostNetworkConfirm(){
                 null);
     }
 
-    private void onSyncAllHostNetworkCancelConfirm(){
+    private void onSyncAllHostNetworkCancelConfirm() {
         cancelConfirm();
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
index 2f7a54d8eb3..eefc40e3a6e 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java
@@ -1055,21 +1055,21 @@ public void onHostConsole() {
     }
 
     private String getSsoToken() {
-        return JsSingleValueStringObject.getProperty("userInfo", "ssoToken");//$NON-NLS-1$ //$NON-NLS-2$
+        return JsSingleValueStringObject.getProperty("userInfo", "ssoToken"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     private String getEngineSSORootUrl() {
         String protocolSeparator = "://"; //$NON-NLS-1$
         String engineSSOUrl = FrontendUrlUtils.getRootURL(); // like: https://engine.fqdn:8080/
 
-        if (engineSSOUrl.endsWith("/")) {//$NON-NLS-1$
-            engineSSOUrl = engineSSOUrl.substring(0, engineSSOUrl.lastIndexOf("/"));//$NON-NLS-1$
+        if (engineSSOUrl.endsWith("/")) { //$NON-NLS-1$
+            engineSSOUrl = engineSSOUrl.substring(0, engineSSOUrl.lastIndexOf("/")); //$NON-NLS-1$
         }
 
         int index = engineSSOUrl.indexOf(protocolSeparator);
         index = (index >= 0) ? index + protocolSeparator.length() : 0; // start of hostname
         index = engineSSOUrl.indexOf(':', index); // start of port
-        if (index >= 0) {// port found
+        if (index >= 0) { // port found
             engineSSOUrl = engineSSOUrl.substring(0, index); // remove port number since SSO is served from different one
         }
 
@@ -1091,13 +1091,13 @@ private void openCockpitWithSSO() {
                 cockpitUrl.append(':');
                 cockpitUrl.append(cockpitSSOPort);
             }
-            cockpitUrl.append("/=");//$NON-NLS-1$
+            cockpitUrl.append("/="); //$NON-NLS-1$
             cockpitUrl.append(item.getId());
-            cockpitUrl.append("/machines#access_token=");//$NON-NLS-1$
+            cockpitUrl.append("/machines#access_token="); //$NON-NLS-1$
             cockpitUrl.append(ssoToken);
 
-            getLogger().info("About to open: " + cockpitUrl.toString());//$NON-NLS-1$
-            Window.open(cockpitUrl.toString(), "_blank", "");//$NON-NLS-1$
+            getLogger().info("About to open: " + cockpitUrl.toString()); //$NON-NLS-1$
+            Window.open(cockpitUrl.toString(), "_blank", ""); //$NON-NLS-1$
         }
     }
 
@@ -1115,8 +1115,8 @@ private void openCockpitWithoutSSO() {
                 cockpitUrl.append(cockpitPort);
             }
 
-            getLogger().info("About to open: " + cockpitUrl.toString());//$NON-NLS-1$
-            Window.open(cockpitUrl.toString(), "_blank", "");//$NON-NLS-1$
+            getLogger().info("About to open: " + cockpitUrl.toString()); //$NON-NLS-1$
+            Window.open(cockpitUrl.toString(), "_blank", ""); //$NON-NLS-1$
         }
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index fd7a3dd7b4f..3a9fce70d4c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -146,11 +146,11 @@ private void setPkSection(EntityModel<Void> value) {
 
     private EntityModel<String> privateFetchSshPublicKey;
 
-    public EntityModel<String> getFetchSshPublicKey(){
+    public EntityModel<String> getFetchSshPublicKey() {
         return privateFetchSshPublicKey;
     }
 
-    public void setFetchSshPublicKey(EntityModel<String> value){
+    public void setFetchSshPublicKey(EntityModel<String> value) {
         this.privateFetchSshPublicKey = value;
     }
 
@@ -553,12 +553,12 @@ public FenceAgentListModel getFenceAgentListModel() {
 
     private UICommand proxySSHPublicKeyCommand;
 
-    public UICommand getSSHPublicKey(){
+    public UICommand getSSHPublicKey() {
         return proxySSHPublicKeyCommand;
     }
 
-    public void setSSHPublicKey(UICommand value){
-        this.proxySSHPublicKeyCommand =value;
+    public void setSSHPublicKey(UICommand value) {
+        this.proxySSHPublicKeyCommand = value;
     }
 
     private Integer postponedSpmPriority;
@@ -887,7 +887,7 @@ private void updateSpmPriority(Integer value) {
                 selectedItem = items.get(i);
                 break;
             } else if (prevValue != null && value > prevValue && value < currentValue) {
-                EntityModel<Integer> customItem = new EntityModel<>("Custom (" + value + ")", value);//$NON-NLS-1$ //$NON-NLS-2$
+                EntityModel<Integer> customItem = new EntityModel<>("Custom (" + value + ")", value); //$NON-NLS-1$ //$NON-NLS-2$
 
                 items.add(i, customItem);
                 selectedItem = customItem;
@@ -1324,7 +1324,7 @@ private CpuVendor getCurrentCpuVendor() {
             // in case CPU of cluster was not yet set
             return null;
         }
-        return  clustersCpu.getVendor();
+        return clustersCpu.getVendor();
     }
 
     private void addKernelCmdlineCheckboxesListeners() {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
index 57d89fbe492..4995319ee91 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java
@@ -214,7 +214,7 @@ public NetworkLabelModel getNewNetworkLabelModel() {
 
     private NetworkItemModel<?> getItemModel(String key, String type) {
         if (type != null) {
-            switch(type) {
+            switch (type) {
             case NIC:
                 return nicModelByName.get(key);
             case NETWORK:
@@ -317,7 +317,7 @@ public void onEdit(NetworkItemModel<?> item) {
              * Bond Dialog
              *****************/
             boolean doesBondHaveVmNetworkAttached = doesBondHaveVmNetworkAttached((NetworkInterfaceModel) item);
-            BondNetworkInterfaceModel bondModel = (BondNetworkInterfaceModel)item;
+            BondNetworkInterfaceModel bondModel = (BondNetworkInterfaceModel) item;
             final CreateOrUpdateBond createOrUpdateBondParameter = bondModel.getCreateOrUpdateBond();
             editPopup = new SetupNetworksEditBondModel(createOrUpdateBondParameter, doesBondHaveVmNetworkAttached);
             final SetupNetworksBondModel bondDialogModel = (SetupNetworksBondModel) editPopup;
@@ -1303,8 +1303,8 @@ private void cancel() {
 
     }
 
-    private boolean doesBondHaveVmNetworkAttached(NetworkInterfaceModel... networkInterfaceModels){
-        for (NetworkInterfaceModel networkInterfaceModel : networkInterfaceModels){
+    private boolean doesBondHaveVmNetworkAttached(NetworkInterfaceModel... networkInterfaceModels) {
+        for (NetworkInterfaceModel networkInterfaceModel : networkInterfaceModels) {
             for (LogicalNetworkModel logicalNetwork : networkInterfaceModel.getItems()) {
                 if (logicalNetwork.getNetwork().isVmNetwork()) {
                     return true;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
index 02c922e19de..40a66cdd66a 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
@@ -67,13 +67,13 @@ private void setRebootHostAfterInstall(EntityModel<Boolean> value) {
         rebootHostAfterInstall = value;
     }
 
-    private  EntityModel<Boolean> reconfigureGluster;
+    private EntityModel<Boolean> reconfigureGluster;
 
     private void setReconfigureGluster(EntityModel<Boolean> value) {
         reconfigureGluster = value;
     }
 
-    public EntityModel<Boolean> getReconfigureGluster(){
+    public EntityModel<Boolean> getReconfigureGluster() {
         return reconfigureGluster;
     }
 
@@ -87,9 +87,9 @@ public void setHostVersion(EntityModel<String> value) {
         hostVersion = value;
     }
 
-    private  EntityModel<String> fqdnBox;
+    private EntityModel<String> fqdnBox;
 
-    public  EntityModel<String> getFqdnBox() {
+    public EntityModel<String> getFqdnBox() {
         return fqdnBox;
     }
 
@@ -201,7 +201,7 @@ public void updateVisibilities() {
         ReplaceHostConfiguration.Action replaceHostOption =
                 getReplaceHostModel().getSelectedItem();
         getFqdnBox().setIsChangeable(replaceHostOption == ReplaceHostConfiguration.Action.DIFFERENTFQDN);
-        if(replaceHostOption != ReplaceHostConfiguration.Action.DIFFERENTFQDN) {
+        if (replaceHostOption != ReplaceHostConfiguration.Action.DIFFERENTFQDN) {
             getFqdnBox().setEntity(null);
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksAddBondModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksAddBondModel.java
index 23f3fac1f7d..377f6091b34 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksAddBondModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksAddBondModel.java
@@ -6,7 +6,7 @@
 
 public class SetupNetworksAddBondModel extends SetupNetworksBondModel {
 
-    public SetupNetworksAddBondModel(List<String> freeBonds, String defaultBondName, boolean doesBondHaveVmNetworkAttached){
+    public SetupNetworksAddBondModel(List<String> freeBonds, String defaultBondName, boolean doesBondHaveVmNetworkAttached) {
         super(doesBondHaveVmNetworkAttached);
         setTitle(ConstantsManager.getInstance().getConstants().createNewBondTitle());
         getBond().setItems(freeBonds);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksJoinBondsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksJoinBondsModel.java
index 721ed626ab8..4c58fb21705 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksJoinBondsModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/SetupNetworksJoinBondsModel.java
@@ -46,7 +46,7 @@ public SetupNetworksJoinBondsModel(List<String> freeBonds,
     }
 
     private void addBondOptionIfMissing(String candidateOption, boolean doesBondHaveVmNetworkAttached) {
-        if (doesBondHaveVmNetworkAttached && !BondMode.isBondModeValidForVmNetwork(candidateOption)){
+        if (doesBondHaveVmNetworkAttached && !BondMode.isBondModeValidForVmNetwork(candidateOption)) {
             return;
         }
         if (!pairForBondOption.containsKey(candidateOption)) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java
index 3408fe3fb37..2b3c75687af 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperation.java
@@ -785,7 +785,7 @@ public boolean isUnary() {
     /**
      * Implement to provide a Command Target for this Operation
      */
-    protected NetworkOperationCommandTarget getTarget(){
+    protected NetworkOperationCommandTarget getTarget() {
         return new NetworkOperationCommandTarget() {
 
             @Override
@@ -799,7 +799,7 @@ protected void executeNetworkCommand(NetworkItemModel<?> op1,
         };
     }
 
-    public boolean isNullOperation(){
+    public boolean isNullOperation() {
         return false;
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java
index 264d98c7698..d3983d6cbe7 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/network/NetworkOperationFactory.java
@@ -116,7 +116,7 @@ private static NetworkOperation binaryOperationWithNetworkInterfaceModelAsSecond
             if (!networks.add((LogicalNetworkModel) op1)) {
                 return NetworkOperation.NULL_OPERATION;
             }
-        } else if(op1 instanceof NetworkLabelModel) {
+        } else if (op1 instanceof NetworkLabelModel) {
             // op1 is a label, verify that it's not applied to the interface already labelled by it
             NetworkLabelModel src = (NetworkLabelModel) op1;
             if (dst.equals(src.getInterface())) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/numa/VNodeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/numa/VNodeModel.java
index fce2fe8073d..376a51746e2 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/numa/VNodeModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/numa/VNodeModel.java
@@ -36,7 +36,7 @@ public VNodeModel(VM vm, VmNumaNode vmNumaNode, boolean editEnabled) {
         this.vmNumaNode = vmNumaNode;
         this.editEnabled = editEnabled;
 
-        if (vmNumaNode.getVdsNumaNodeList() != null && !vmNumaNode.getVdsNumaNodeList().isEmpty()){
+        if (vmNumaNode.getVdsNumaNodeList() != null && !vmNumaNode.getVdsNumaNodeList().isEmpty()) {
             hostNodeIndex = vmNumaNode.getVdsNumaNodeList().get(0);
             pinned = true;
         }
@@ -97,7 +97,7 @@ public void pinTo(Integer hostNodeIndex) {
         updateNumaTunes();
     }
 
-    public void unpin(){
+    public void unpin() {
         pinned = false;
         hostNodeIndex = null;
         updateNumaTunes();
@@ -111,7 +111,7 @@ public boolean isSplitted() {
      * Convert the model representation of a virtual numa node to a real virtual numa node
      * @return the numa node
      */
-    public VmNumaNode toVmNumaNode(){
+    public VmNumaNode toVmNumaNode() {
         final VmNumaNode newNode = new VmNumaNode();
         newNode.setIndex(vmNumaNode.getIndex());
         newNode.setId(vmNumaNode.getId());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkExternalSubnetListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkExternalSubnetListModel.java
index e515f55dc93..a9ab8121f3f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkExternalSubnetListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkExternalSubnetListModel.java
@@ -87,7 +87,7 @@ protected void syncSearch() {
         super.syncSearch(QueryType.GetExternalSubnetsOnProviderByNetwork, new IdQueryParameters(getEntity().getId()));
     }
 
-    private void adjustActionButtonsForNetworkReadOnlyProperty(){
+    private void adjustActionButtonsForNetworkReadOnlyProperty() {
         NetworkView networkView = getEntity();
 
         if (!networkView.isExternal()) {
@@ -99,20 +99,20 @@ private void adjustActionButtonsForNetworkReadOnlyProperty(){
                 createProviderReadOnlyCallback());
     }
 
-    private AsyncQuery<QueryReturnValue> createProviderReadOnlyCallback(){
+    private AsyncQuery<QueryReturnValue> createProviderReadOnlyCallback() {
         return new AsyncQuery<>(returnValue -> setCommandExecutionAllowedForProvider((Provider) (returnValue.getReturnValue())));
     }
 
-    private void setCommandExecutionAllowedForProvider(Provider provider){
+    private void setCommandExecutionAllowedForProvider(Provider provider) {
         OpenstackNetworkProviderProperties properties = (OpenstackNetworkProviderProperties) provider.getAdditionalProperties();
-        if (properties != null && properties.getReadOnly()){
+        if (properties != null && properties.getReadOnly()) {
             setCommandExecutionAllowed(false);
             return;
         }
         setCommandExecutionAllowed(true);
     }
 
-    private void setCommandExecutionAllowed(boolean isAllowed){
+    private void setCommandExecutionAllowed(boolean isAllowed) {
         isExecutionAllowed = isAllowed;
         updateActionAvailability();
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java
index 68e05773b87..0bee99c751f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkHostFilter.java
@@ -3,18 +3,18 @@
 import org.ovirt.engine.ui.uicommonweb.ViewFilter;
 import org.ovirt.engine.ui.uicompat.ConstantsManager;
 
-public enum NetworkHostFilter implements ViewFilter<NetworkHostFilter>{
+public enum NetworkHostFilter implements ViewFilter<NetworkHostFilter> {
     attached(ConstantsManager.getInstance().getConstants().attachedHost()),
     unattached(ConstantsManager.getInstance().getConstants().unattachedHost());
 
     private String text;
 
-    NetworkHostFilter(String text){
+    NetworkHostFilter(String text) {
         this.text = text;
     }
 
     @Override
-    public String getText(){
+    public String getText() {
         return text;
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/CustomHomePageField.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/CustomHomePageField.java
index 27f9e0f267f..2421f64bc6f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/CustomHomePageField.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/CustomHomePageField.java
@@ -10,7 +10,7 @@
 import com.google.gwt.json.client.JSONString;
 
 public class CustomHomePageField implements Field<String> {
-    private static final String CUSTOM_HOME_PAGE = "webAdmin.customHomePage";//$NON-NLS-1$
+    private static final String CUSTOM_HOME_PAGE = "webAdmin.customHomePage"; //$NON-NLS-1$
     private final EntityModel<String> customHomePage;
     private final boolean resettable;
     private String originalCustomHomePage;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/OptionsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/OptionsModel.java
index 198df964c61..e4c51f42c1b 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/OptionsModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/OptionsModel.java
@@ -25,10 +25,10 @@
 public class OptionsModel extends EntityModel<EditOptionsModel> {
 
     private static final UIConstants constants = ConstantsManager.getInstance().getConstants();
-    private static final String EDIT_SETTINGS = "EditSettings";//$NON-NLS-1$
-    public static String RESET_SETTINGS = "ResetSettings";//$NON-NLS-1$
-    public static String SAVE_SETTINGS = "SaveSettings";//$NON-NLS-1$
-    public static String CANCEL_SETTINGS = "CancelSettings";//$NON-NLS-1$
+    private static final String EDIT_SETTINGS = "EditSettings"; //$NON-NLS-1$
+    public static String RESET_SETTINGS = "ResetSettings"; //$NON-NLS-1$
+    public static String SAVE_SETTINGS = "SaveSettings"; //$NON-NLS-1$
+    public static String CANCEL_SETTINGS = "CancelSettings"; //$NON-NLS-1$
     private final UserProfileManager userProfileManager;
 
     private final UICommand editCommand;
@@ -153,16 +153,16 @@ private void resetSettings() {
                 .collect(Collectors.toList()));
 
         List<Boolean> results = new ArrayList<>();
-        Consumer<Boolean> markAsDone = result ->{
+        Consumer<Boolean> markAsDone = result -> {
             results.add(result);
-            if(results.size() >= removals.size()) {
+            if (results.size() >= removals.size()) {
                 setConfirmWindow(null);
                 cancel();
                 onEdit();
             }
         };
 
-        UICommand ok = UICommand.createDefaultOkUiCommand("ConfirmReset", new BaseCommandTarget() {//$NON-NLS-1$
+        UICommand ok = UICommand.createDefaultOkUiCommand("ConfirmReset", new BaseCommandTarget() { //$NON-NLS-1$
             @Override
             public void executeCommand(UICommand uiCommand) {
                 removals.stream()
@@ -177,7 +177,7 @@ public void executeCommand(UICommand uiCommand) {
                                 false));
             }
         });
-        UICommand cancel = UICommand.createCancelUiCommand("AbortReset", new BaseCommandTarget() {//$NON-NLS-1$
+        UICommand cancel = UICommand.createCancelUiCommand("AbortReset", new BaseCommandTarget() { //$NON-NLS-1$
             @Override
             public void executeCommand(UICommand uiCommand) {
                 setConfirmWindow(null);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/UseCustomHomePageField.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/UseCustomHomePageField.java
index 7039b00dca8..ea8a452164a 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/UseCustomHomePageField.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/options/UseCustomHomePageField.java
@@ -6,7 +6,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.EntityModel;
 
 public class UseCustomHomePageField implements Field<Boolean> {
-    private static final String USE_CUSTOM_HOME_PAGE = "webAdmin.useCustomHomePage";//$NON-NLS-1$
+    private static final String USE_CUSTOM_HOME_PAGE = "webAdmin.useCustomHomePage"; //$NON-NLS-1$
     private final EntityModel<Boolean> isCustom;
     private final boolean resettable;
     private boolean originalIsCustom;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
index d7496d95854..d3cf35a05bf 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolGeneralModel.java
@@ -29,9 +29,9 @@
 
 public class PoolGeneralModel extends AbstractGeneralModel<VmPool> {
 
-    public static final String ARCHITECTURE = "VmPoolArchitecture";//$NON-NLS-1$
+    public static final String ARCHITECTURE = "VmPoolArchitecture"; //$NON-NLS-1$
 
-    public static final String BIOS_TYPE = "VmPoolBiosType";//$NON-NLS-1$
+    public static final String BIOS_TYPE = "VmPoolBiosType"; //$NON-NLS-1$
 
     public static final EventDefinition updateCompleteEventDefinition;
     private Event<EventArgs> privateUpdateCompleteEvent;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
index e8467f08376..2f1570dfd26 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
@@ -437,7 +437,7 @@ public void savePoolPostValidation() {
         param.setTpmEnabled(model.getTpmEnabled().getEntity());
         param.setRngDevice(model.getIsRngEnabled().getEntity() ? model.generateRngDevice() : null);
 
-        if(model.getIsHeadlessModeEnabled().getEntity()) {
+        if (model.getIsHeadlessModeEnabled().getEntity()) {
             param.getVmStaticData().setDefaultDisplayType(DisplayType.none);
        }
         BuilderExecutor.build(model, param, new UnitToGraphicsDeviceParamsBuilder());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileBaseModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileBaseModel.java
index e0e32bdc8eb..bed4cbee56c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileBaseModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/ProfileBaseModel.java
@@ -144,7 +144,7 @@ public void executeCommand(UICommand command) {
 
         if ("OnSave".equals(command.getName())) { //$NON-NLS-1$
             onSave();
-        } else if ("Cancel".equals(command.getName())) {//$NON-NLS-1$
+        } else if ("Cancel".equals(command.getName())) { //$NON-NLS-1$
             cancel();
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveProfileModel.java
index cdd11fa66a3..b055551c32c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveProfileModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/RemoveProfileModel.java
@@ -69,9 +69,9 @@ private void cancel() {
     public void executeCommand(UICommand command) {
         super.executeCommand(command);
 
-        if ("Cancel".equals(command.getName())) {//$NON-NLS-1$
+        if ("Cancel".equals(command.getName())) { //$NON-NLS-1$
             cancel();
-        } else if ("OnRemove".equals(command.getName())) {//$NON-NLS-1$
+        } else if ("OnRemove".equals(command.getName())) { //$NON-NLS-1$
             onRemove();
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java
index 7755f96159b..2cfa9c6e8c3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/profiles/VnicProfileModel.java
@@ -200,7 +200,7 @@ public VnicProfileModel(SearchableListModel<?, ?> sourceModel,
             getPassthrough().setIsChangeable(passthroughAndPortMirroringAllowed,
                     constants.passthroughNotSupportedExternalNetworks());
 
-            if(passthroughAndPortMirroringAllowed) {
+            if (passthroughAndPortMirroringAllowed) {
                 updateChangeabilityIfVmsUsingTheProfile();
             }
         });
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NetworkProviderPluginTranslator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NetworkProviderPluginTranslator.java
index 6d061b7794b..bc080617989 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NetworkProviderPluginTranslator.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/NetworkProviderPluginTranslator.java
@@ -25,8 +25,8 @@ public enum NetworkProviderPluginTranslator {
     private Enum defaultPlugin;
 
     private static final String EMPTY_NAME = "";
-    private static final Map<String, Enum> pluginForDisplay  = new HashMap<>();
-    private static final Map<String, Enum> pluginForName  = new HashMap<>();
+    private static final Map<String, Enum> pluginForDisplay = new HashMap<>();
+    private static final Map<String, Enum> pluginForName = new HashMap<>();
 
     static {
         for (NetworkProviderPluginTranslator translator: NetworkProviderPluginTranslator.values()) {
@@ -47,7 +47,7 @@ public enum NetworkProviderPluginTranslator {
     }
 
     NetworkProviderPluginTranslator(Enum[] plugins, Enum defaultPlugin) {
-        for(Enum plugin: plugins) {
+        for (Enum plugin: plugins) {
             members.add(plugin);
         }
         this.defaultPlugin = defaultPlugin;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
index 75fc2060dfa..9564d3b4677 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/providers/ProviderModel.java
@@ -292,7 +292,7 @@ public void setDataCenter(ListModel<StoragePool> dataCenter) {
     private String getAuthUrl() {
         String scheme = getAuthProtocol().getSelectedItem() == OpenStackProtocolType.https ?
                 Uri.SCHEME_HTTPS : Uri.SCHEME_HTTP;
-        String authority = getAuthHostname().getEntity() + ":" +  getAuthPort().getEntity(); //$NON-NLS-1$
+        String authority = getAuthHostname().getEntity() + ":" + getAuthPort().getEntity(); //$NON-NLS-1$
         Uri uri = new Uri(scheme, authority, getAuthApiVersion().getSelectedItem().getPath());
         return uri.getStringRepresentation();
     }
@@ -330,7 +330,7 @@ public ProviderModel(SearchableListModel sourceListModel, ActionType action, fin
         this.action = action;
         this.provider = provider;
 
-        setAuthApiVersion(new ListModel<OpenStackApiVersionType>(){
+        setAuthApiVersion(new ListModel<OpenStackApiVersionType>() {
             @Override
             protected void onSelectedItemChanging(OpenStackApiVersionType newValue, OpenStackApiVersionType oldValue) {
                 super.onSelectedItemChanging(newValue, oldValue);
@@ -536,7 +536,7 @@ public ProxyHostPropertiesModel getProxyHostPropertiesModel() {
             return getVmwarePropertiesModel();
         } else {
             // null object, to avoid null checks everywhere
-            return new ProxyHostPropertiesModel() {};
+            return new ProxyHostPropertiesModel() { };
         }
     }
 
@@ -648,7 +648,7 @@ private void flush() {
         provider.setRequiringAuthentication(authenticationRequired);
         if (authenticationRequired) {
             provider.setUsername(getUsername().getEntity());
-            if(!getPassword().getEntity().equals("********")) { //$NON-NLS-1$
+            if (!getPassword().getEntity().equals("********")) { //$NON-NLS-1$
             provider.setPassword(getPassword().getEntity());
             }
             if (getTenantName().getIsAvailable()) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/ChangeQuotaModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/ChangeQuotaModel.java
index bc9903b3d79..306f2a24594 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/ChangeQuotaModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/ChangeQuotaModel.java
@@ -49,7 +49,7 @@ public void init(final ArrayList<DiskImage> disks) {
                     ChangeQuotaItemModel itemModel = new ChangeQuotaItemModel();
                     itemModel.setEntity(diskImage);
                     itemModel.getObject().setEntity(diskImage.getDiskAlias());
-                    itemModel.getCurrentQuota().setEntity(diskImage.getQuotaNames() != null && diskImage.getQuotaNames().size() >= i+1 ? diskImage.getQuotaNames().get(i) : null);
+                    itemModel.getCurrentQuota().setEntity(diskImage.getQuotaNames() != null && diskImage.getQuotaNames().size() >= i + 1 ? diskImage.getQuotaNames().get(i) : null);
                     itemModel.setStorageDomainId(storageDomainId);
                     itemModel.setStorageDomainName(diskImage.getStoragesNames().get(i));
                     itemModel.getQuota().setItems(storageDomainIdMap.get(storageDomainId));
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
index 63036327467..54cedad85f3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaUserListModel.java
@@ -201,7 +201,7 @@ public void onAdd() {
             }
         }
 
-        if(items.isEmpty()){
+        if (items.isEmpty()) {
             model.setIsValid(false);
             model.setMessage(ConstantsManager.getInstance().getConstants().selectUserOrGroup());
             return;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FileStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FileStorageModel.java
index 141e7cf6898..6c3a5da5a78 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FileStorageModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/FileStorageModel.java
@@ -9,7 +9,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.Model;
 
 @SuppressWarnings("unused")
-public abstract class FileStorageModel extends Model implements IStorageModel{
+public abstract class FileStorageModel extends Model implements IStorageModel {
     private EntityModel<String> path;
 
     protected void setPath(EntityModel<String> value) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/LocalStorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/LocalStorageModel.java
index 42c8056b090..368681d3ba4 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/LocalStorageModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/LocalStorageModel.java
@@ -49,7 +49,7 @@ public void setRole(StorageDomainType value) {
     }
 
     @Override
-    protected void prepareConnectionForEditing(StorageServerConnections connection) {}
+    protected void prepareConnectionForEditing(StorageServerConnections connection) { }
 
     public LocalStorageModel() {
         setUpdateCommand(new UICommand("Update", this)); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDRListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDRListModel.java
index 2646ef2ff4d..f14d46f1d35 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDRListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDRListModel.java
@@ -249,7 +249,7 @@ public void executeCommand(UICommand command) {
             newDR();
         } else if (command == getEditCommand()) {
             editDR();
-        } else if (command.getName().equalsIgnoreCase("OnSave")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("OnSave")) { //$NON-NLS-1$
             onSave();
         } else if ("Cancel".equals(command.getName())) { //$NON-NLS-1$
             cancel();
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java
index 8400fbd3cdd..6d8355e0f30 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDataCenterListModel.java
@@ -660,7 +660,7 @@ private void activate() {
             list.add(parameters);
         }
 
-        Frontend.getInstance().runMultipleAction(ActionType.ActivateStorageDomain, list, result -> {}, null);
+        Frontend.getInstance().runMultipleAction(ActionType.ActivateStorageDomain, list, result -> { }, null);
     }
 
     private void cancel() {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
index d78ea225527..ad43924e162 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageDiskListModel.java
@@ -40,7 +40,7 @@ public UICommand getUploadCommand() {
     }
 
     private void setUploadCommand(UICommand value) {
-        privateUploadCommand= value;
+        privateUploadCommand = value;
     }
 
     private UICommand privateCancelUploadCommand;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
index 2d172b8d6fc..4e6d595c8d4 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
@@ -325,7 +325,7 @@ private void newDomain() {
 
         model.initialize();
 
-        UICommand  command = UICommand.createDefaultOkUiCommand("OnSave", this); //$NON-NLS-1$
+        UICommand command = UICommand.createDefaultOkUiCommand("OnSave", this); //$NON-NLS-1$
         model.getCommands().add(command);
 
         command = createCancelCommand("Cancel"); //$NON-NLS-1$
@@ -1069,7 +1069,7 @@ public void executeCommand(UICommand command) {
         } else if ("SaveNewPosixStorage".equals(command.getName())) { //$NON-NLS-1$
             saveNewPosixStorage();
             cancelConfirm();
-        } else if ("HandleISOForNFS".equals(command.getName())){ //$NON-NLS-1$
+        } else if ("HandleISOForNFS".equals(command.getName())) { //$NON-NLS-1$
             handleIsoDomain("SaveNewNfsStorage"); //$NON-NLS-1$
         } else if ("HandleISOForPosix".equals(command.getName())) { //$NON-NLS-1$
             handleIsoDomain("SaveNewPosixStorage"); //$NON-NLS-1$
@@ -1314,7 +1314,7 @@ private void saveNfsStorage(TaskContext context) {
                 if (storages != null && storages.size() > 0) {
                     nfsModel.getPath().setIsValid(false);
                     handleDomainAlreadyExists(storages.get(0).getStorageName());
-                } else if (storageDomain.getStorageDomainType() == StorageDomainType.ISO){
+                } else if (storageDomain.getStorageDomainType() == StorageDomainType.ISO) {
                     UICommand handleISOType = UICommand.createDefaultOkUiCommand("HandleISOForNFS", this); //$NON-NLS-1$
                     handleISOType.execute();
                 } else {
@@ -2032,7 +2032,7 @@ public void run(TaskContext context) {
             saveSanStorage(context);
         } else if ("SaveManagedBlock".equals(key)) { //$NON-NLS-1$
             saveManagedBlockStorage(context);
-        }else if ("ImportFile".equals(key)) { //$NON-NLS-1$
+        } else if ("ImportFile".equals(key)) { //$NON-NLS-1$
             importFileStorage(context);
         } else if ("ImportSan".equals(key)) { //$NON-NLS-1$
             importSanStorage(context);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
index 27e27f10f90..9664ca88bcc 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageModel.java
@@ -713,7 +713,7 @@ public StorageModelBehavior getBehavior() {
         return behavior;
     }
 
-    private Integer  getWarningLowSpaceIndicatorValue() {
+    private Integer getWarningLowSpaceIndicatorValue() {
         if (isNewStorage()) {
             return (Integer) AsyncDataProvider.getInstance().getConfigValuePreConverted(ConfigValues.WarningLowSpaceIndicator);
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageRegisterDiskImageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageRegisterDiskImageListModel.java
index 162c19821c2..442bf67a207 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageRegisterDiskImageListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageRegisterDiskImageListModel.java
@@ -201,7 +201,7 @@ public void executeCommand(UICommand command) {
             remove();
         } else if ("OnRemove".equals(command.getName())) { //$NON-NLS-1$
             onRemove();
-        }else if ("Cancel".equals(command.getName())) { //$NON-NLS-1$
+        } else if ("Cancel".equals(command.getName())) { //$NON-NLS-1$
             cancel();
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
index 0c7b0ada54c..f3168151bbf 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java
@@ -166,7 +166,7 @@ private Map<String, List<String>> getDependentVMsForTemplates(List<VM> vmsInExpo
     }
 
     private void removeTemplateBackup() {
-        List<ActionParametersBase> prms =  getSelectedItems()
+        List<ActionParametersBase> prms = getSelectedItems()
                 .stream()
                 .map(item -> new VmTemplateImportExportParameters(item.getId(), getEntity().getId(), pool.getId()))
                 .collect(Collectors.toList());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/UploadImageHandler.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/UploadImageHandler.java
index b1441c089fa..f0882e446cc 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/UploadImageHandler.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/UploadImageHandler.java
@@ -115,7 +115,7 @@ public void setBytesSent(long bytesSent) {
     }
 
     public void setBytesSent(double bytesSent) {
-        this.bytesSent = (long)bytesSent;
+        this.bytesSent = (long) bytesSent;
         setProgressStr("Sent " + bytesSent / SizeConverter.BYTES_IN_MB + "MB"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
index 99a97941d45..4a5d8a475aa 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/CopyDiskModel.java
@@ -123,7 +123,7 @@ protected boolean allowedStorageDomain(List<StorageDomain> sourceActiveStorageDo
         return super.allowedStorageDomain(sourceActiveStorageDomains, diskImage, templateDisk, sd);
     }
 
-    private boolean isTemplateDisk(DiskImage  diskImage) {
+    private boolean isTemplateDisk(DiskImage diskImage) {
         return diskImage.getVmEntityType() != null && diskImage.getVmEntityType().isTemplateType();
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplatesModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplatesModel.java
index a03f8703987..cda7e672385 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplatesModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/ImportTemplatesModel.java
@@ -418,7 +418,7 @@ public ImportVmModel getSpecificImportModel() {
 
         selectedImportVmModel = null;
 
-        switch(importSources.getSelectedItem()) {
+        switch (importSources.getSelectedItem()) {
         case EXPORT_DOMAIN:
             importFromExportDomainModel.setEntity(null);
             importFromExportDomainModel.init(templates, exportDomain.getEntity().getId());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
index 6d481ee618e..c0aa3fd40f5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java
@@ -16,9 +16,9 @@
 
 public class TemplateGeneralModel extends AbstractGeneralModel<VmTemplate> {
 
-    public static final String ARCHITECTURE = "VmTemplateArchitecture";//$NON-NLS-1$
+    public static final String ARCHITECTURE = "VmTemplateArchitecture"; //$NON-NLS-1$
 
-    public static final String BIOS_TYPE = "VmTemplateBiosType";//$NON-NLS-1$
+    public static final String BIOS_TYPE = "VmTemplateBiosType"; //$NON-NLS-1$
 
     private String name;
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
index 9e79f5c557d..ed2a49ef9a4 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java
@@ -711,7 +711,7 @@ private void onSave() {
                         }
 
                         String selectedCpu = model.getCustomCpu().getSelectedItem();
-                        if (selectedCpu != null && !selectedCpu.isEmpty()  && !model.getCustomCpu().getItems().contains(selectedCpu)) {
+                        if (selectedCpu != null && !selectedCpu.isEmpty() && !model.getCustomCpu().getItems().contains(selectedCpu)) {
                             ConfirmationModel confirmModel = new ConfirmationModel();
                             confirmModel.setTitle(ConstantsManager.getInstance().getConstants().vmUnsupportedCpuTitle());
                             confirmModel.setMessage(ConstantsManager.getInstance().getConstants().vmUnsupportedCpuMessage());
@@ -817,7 +817,7 @@ protected static void buildTemplateOnSave(UnitVmModel model, VmTemplate template
     private void setVmWatchdogToParams(final UnitVmModel model, UpdateVmTemplateParameters updateVmParams) {
         VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem();
         updateVmParams.setUpdateWatchdog(true);
-        if(wdModel != null) {
+        if (wdModel != null) {
             VmWatchdog vmWatchdog = new VmWatchdog();
             vmWatchdog.setAction(model.getWatchdogAction().getSelectedItem());
             vmWatchdog.setModel(wdModel);
@@ -978,7 +978,7 @@ public void executeCommand(UICommand command) {
             cancelConfirmation();
         } else if (CMD_CONFIGURE_TEMPLATES_TO_IMPORT.equals(command.getName())) { // $NON-NLS-1$
             onConfigureTemplatesToImport();
-        } else if ("onClone".equals(command.getName())){ //$NON-NLS-1$
+        } else if ("onClone".equals(command.getName())) { //$NON-NLS-1$
             onClone();
         } else if ("closeClone".equals(command.getName())) { //$NON-NLS-1$
             closeClone();
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
index 89a63074664..86e248d2891 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateVmListModel.java
@@ -47,7 +47,7 @@ public TemplateVmListModel(final VmGeneralModel vmGeneralModel,
         super(vmGeneralModel, vmInterfaceListModel, vmDiskListModel,
                 vmSnapshotListModel, vmEventListModel, vmAppListModel,
                 permissionListModel, vmAffinityGroupListModel, vmGuestInfoModel,
-                importVmsModelProvider, vmHostDeviceListModel,  vmDevicesListModel,
+                importVmsModelProvider, vmHostDeviceListModel, vmDevicesListModel,
                 vmAffinityLabelListModel, vmErrataCountModel, vmGuestContainerListModel,
                 confirmationModelSettingsManager);
         setTitle(ConstantsManager.getInstance().getConstants().virtualMachinesTitle());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java
index a0ecbab6c09..431ba660b6e 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/VmBaseListModel.java
@@ -497,11 +497,11 @@ private void addVmToKubevirt(UnitVmModel model, AddVmParameters parameters, VM v
                         this);
     }
 
-    protected void updateVM(UnitVmModel model){
+    protected void updateVM(UnitVmModel model) {
         // no-op by default. Override if needed.
     }
 
-    protected void cloneVM(UnitVmModel model){
+    protected void cloneVM(UnitVmModel model) {
         // no-op by default. Override if needed.
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java
index 7d8ba296385..e981578cecc 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/UserListModel.java
@@ -398,7 +398,7 @@ public void onAdd(final boolean closeWindow) {
             }
         }
 
-        if(selectedItems.isEmpty()){
+        if (selectedItems.isEmpty()) {
             model.setIsValid(false);
             model.setMessage(ConstantsManager.getInstance().getConstants().selectUserOrGroup());
             return;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java
index 59ba24670d7..9cb7c146e6c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/AbstractDiskModel.java
@@ -1151,7 +1151,7 @@ public void setStorageModel(StorageModel storageModel) {
     protected Guid getStorageDomainId() {
         switch (getDisk().getDiskStorageType()) {
             case IMAGE:
-                return  getDiskImage().getStorageIds().get(0);
+                return getDiskImage().getStorageIds().get(0);
             case MANAGED_BLOCK_STORAGE:
                 return getManagedBlockDisk().getStorageIds().get(0);
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
index 6c448dfa563..4576df1e9ef 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java
@@ -204,13 +204,13 @@ public void executeCommand(UICommand uiCommand) {
 
     public static void makeConsoleConfigRequest(String fileName, String contentType, String configFileContent) {
         final FlowPanel innerPanel = new FlowPanel();
-        innerPanel.add(buildTextArea("contenttype", contentType));//$NON-NLS-1$
-        innerPanel.add(buildTextArea("content", URL.encodeQueryString(configFileContent)));//$NON-NLS-1$
-        innerPanel.add(buildTextArea("encodingtype", "plain"));//$NON-NLS-1$ $NON-NLS-2$
+        innerPanel.add(buildTextArea("contenttype", contentType)); //$NON-NLS-1$
+        innerPanel.add(buildTextArea("content", URL.encodeQueryString(configFileContent))); //$NON-NLS-1$
+        innerPanel.add(buildTextArea("encodingtype", "plain")); //$NON-NLS-1$ $NON-NLS-2$
 
         final FormPanel formPanel = new FormPanel(); //$NON-NLS-1$
         formPanel.setMethod(FormPanel.METHOD_POST);
-        formPanel.getElement().setId("conform" + Double.valueOf(Math.random()).toString());//$NON-NLS-1$
+        formPanel.getElement().setId("conform" + Double.valueOf(Math.random()).toString()); //$NON-NLS-1$
         formPanel.setWidget(innerPanel);
         formPanel.setAction(GET_ATTACHMENT_SERVLET_URL + fileName);
         formPanel.setEncoding(FormPanel.ENCODING_URLENCODED);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CpuPinningListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CpuPinningListModel.java
index 5d111233842..95956440ef5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CpuPinningListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/CpuPinningListModel.java
@@ -14,7 +14,7 @@
 
 public class CpuPinningListModel extends ListModel<CpuPinningListModelItem> {
 
-    public static final String ITEMS_ENABLED_PROPERTY_CHANGE = "ItemsEnabledPropertyChange";//$NON-NLS-1$
+    public static final String ITEMS_ENABLED_PROPERTY_CHANGE = "ItemsEnabledPropertyChange"; //$NON-NLS-1$
 
     static final UIConstants constants = ConstantsManager.getInstance().getConstants();
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
index 19b9e5b9470..80ead073063 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java
@@ -261,7 +261,7 @@ private boolean isRestoreMemoryVolumeSupported() {
     }
 
     private int calculateHostCpus() {
-        return  getModel().getSelectedCluster().getCountThreadsAsCores() ? runningOnHost.getCpuThreads() : runningOnHost.getCpuCores();
+        return getModel().getSelectedCluster().getCountThreadsAsCores() ? runningOnHost.getCpuThreads() : runningOnHost.getCpuCores();
     }
 
     @Override
@@ -392,7 +392,7 @@ private void addCpuListeners() {
         getModel().getNumOfSockets().getSelectedItemChangedEvent().addListener(getModel());
     }
 
-    private void removeCpuListeners() {// remove if exists
+    private void removeCpuListeners() { // remove if exists
         getModel().getTotalCPUCores().getEntityChangedEvent().removeListener(getModel());
         getModel().getNumOfSockets().getSelectedItemChangedEvent().removeListener(getModel());
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
index c4fe8435ed5..47a8b533250 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmFromExternalProviderModel.java
@@ -86,7 +86,7 @@ private void updateWindowsWarningMessage() {
         boolean someDriverSelected = getIso().getSelectedItem() != null;
         boolean isWindows = AsyncDataProvider.getInstance().isWindowsOsType(selectedOS);
 
-        if (isWindows && sourceIsNotKvm &&  (!attachDrivers || !someDriverSelected)) {
+        if (isWindows && sourceIsNotKvm && (!attachDrivers || !someDriverSelected)) {
                 setWinWithoutVirtioMessage(ConstantsManager.getInstance()
                     .getConstants().missingVirtioDriversForWindows());
         }
@@ -280,7 +280,7 @@ private void initQuotaForStorageDomains() {
                     Iterator<QueryReturnValue> returnValuesIter = result.getReturnValues().iterator();
                     Iterator<StorageDomain> domainsIter = getStorage().getItems().iterator();
                     boolean noQuota = true;
-                    while(domainsIter.hasNext()) {
+                    while (domainsIter.hasNext()) {
                         ArrayList<Quota> quotaList = returnValuesIter.next().getReturnValue();
                         noQuota = noQuota && quotaList.isEmpty();
                         storageQuotaMap.put(
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
index 0b5ce898e81..3540754b053 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmModel.java
@@ -133,7 +133,7 @@ public void setStoragePool(StoragePool storagePool) {
         this.storagePool = storagePool;
     }
 
-    public void setItems(final AsyncCallback<QueryReturnValue> callback, final List<VM>  externalVms) {
+    public void setItems(final AsyncCallback<QueryReturnValue> callback, final List<VM> externalVms) {
         Frontend.getInstance().runQuery(QueryType.Search,
                 new SearchParameters(createSearchPattern(externalVms), SearchType.VM),
                 new AsyncQuery<QueryReturnValue>(returnValue -> {
@@ -221,7 +221,7 @@ private boolean validateName(final ImportVmData data) {
     }
 
     private IValidation uniqueNameValidation(ImportVmData data, EntityModel<String> vmName) {
-        return value -> (isNameExistsInTheSystem(vmName.getEntity()) || !isVmNameUnique(data))?
+        return value -> (isNameExistsInTheSystem(vmName.getEntity()) || !isVmNameUnique(data)) ?
                ValidationResult.fail(ConstantsManager.getInstance().getConstants().nameMustBeUniqueInvalidReason())
                : ValidationResult.ok();
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
index 7f0cc607b6e..ed03f418c75 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ImportVmsModel.java
@@ -211,7 +211,7 @@ private void initImportModel(ImportVmModel importVmModel, UICommand ... commands
     public ImportVmModel getSpecificImportModel(boolean vmsToImportHaveFullInfo) {
         selectedImportVmModel = null;
 
-        switch(importSources.getSelectedItem()) {
+        switch (importSources.getSelectedItem()) {
         case EXPORT_DOMAIN:
             importFromExportDomainModel.setEntity(null);
             importFromExportDomainModel.init(getVmsToImport(), exportDomain.getEntity().getId());
@@ -336,7 +336,7 @@ public EntityModel<StorageDomain> getExportDomain() {
 
     private void providerChanged() {
         clearValidations();
-        switch(importSources.getSelectedItem()) {
+        switch (importSources.getSelectedItem()) {
         case VMWARE:
             vmwareProviderChanged();
             break;
@@ -560,7 +560,7 @@ private void loadXenProviders() {
     }
 
     private void loadProviders() {
-        switch(importSources.getSelectedItem()) {
+        switch (importSources.getSelectedItem()) {
         case VMWARE:
             loadVmwareProviders();
             break;
@@ -855,7 +855,7 @@ public boolean validateArchitectures(List<VM> vmsToImport) {
     }
 
     public boolean vmsToImportHaveFullInfo() {
-        switch(importSources.getSelectedItem()) {
+        switch (importSources.getSelectedItem()) {
             case VMWARE:
             case KVM:
             case XEN:
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java
index ac071e6777d..2df27228fa5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/InstanceImageLineModel.java
@@ -334,7 +334,7 @@ protected void updateBootableDiskAvailable() {
 
         if (getVm() != null) {
             model.setVm(getVm());
-            ((NewDiskModel)model).updateSuggestedDiskAliasFromServer();
+            ((NewDiskModel) model).updateSuggestedDiskAliasFromServer();
         } else {
             String currentVmName = parentModel.getUnitVmModel().getName().getEntity();
             if (StringHelper.isNotNullOrEmpty(currentVmName)) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmTemplateInterfaceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmTemplateInterfaceModel.java
index b78359472c7..a34bb8483eb 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmTemplateInterfaceModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVmTemplateInterfaceModel.java
@@ -10,7 +10,7 @@
 import org.ovirt.engine.ui.uicommonweb.models.ListModel;
 import org.ovirt.engine.ui.uicompat.ConstantsManager;
 
-public class RemoveVmTemplateInterfaceModel extends RemoveVmInterfaceModel{
+public class RemoveVmTemplateInterfaceModel extends RemoveVmInterfaceModel {
 
     public RemoveVmTemplateInterfaceModel(ListModel sourceListModel, List<VmNetworkInterface> vnics, boolean isFullMsg) {
         super(sourceListModel, vnics, isFullMsg);
@@ -19,7 +19,7 @@ public RemoveVmTemplateInterfaceModel(ListModel sourceListModel, List<VmNetworkI
     }
 
     @Override
-    protected String getRemoveVnicFullMsg(VmNetworkInterface vnic){
+    protected String getRemoveVnicFullMsg(VmNetworkInterface vnic) {
         return ConstantsManager.getInstance().getMessages().vnicFromTemplate(vnic.getName(), vnic.getVmName());
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java
index 269f199c4e8..00e32a166de 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RemoveVnicProfileModel.java
@@ -18,7 +18,7 @@ public class RemoveVnicProfileModel extends ConfirmationModel {
 
     private final List<VnicProfileView> profiles;
     private final boolean fullMsg;
-    private final SearchableListModel<?, VnicProfileView>  sourceListModel;
+    private final SearchableListModel<?, VnicProfileView> sourceListModel;
 
     public RemoveVnicProfileModel(SearchableListModel<?, VnicProfileView> sourceListModel, List<VnicProfileView> profiles, boolean isFullMsg) {
         setTitle(ConstantsManager.getInstance().getConstants().removeVnicProfileTitle());
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
index abb3db03871..3415ae35300 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java
@@ -718,7 +718,7 @@ public RunOnceModel(VM vm, ICommandTarget commandTarget) {
         getCommands().addAll(Arrays.asList(runOnceCommand, cancelCommand));
     }
 
-    public void updateOSs(){
+    public void updateOSs() {
         setIsWindowsOS(AsyncDataProvider.getInstance().isWindowsOsType(vm.getVmOsId()));
         setIsIgnition(AsyncDataProvider.getInstance().isIgnition(vm.getVmOsId()));
     }
@@ -1325,7 +1325,7 @@ private void loadEmulatedMachineList(Guid clusterId) {
                     if (emulatedSet != null) {
                         String oldVal = getEmulatedMachine().getSelectedItem();
                         List<String> items = new ArrayList<>(new TreeSet<>(emulatedSet));
-                        items.add(0, "");//$NON-NLS-1$
+                        items.add(0, ""); //$NON-NLS-1$
                         getEmulatedMachine().setItems(items);
                         getEmulatedMachine().setSelectedItem(oldVal);
                     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
index 40ce1189534..1c128d729ef 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SnapshotModel.java
@@ -378,7 +378,7 @@ public void onSave() {
         ArrayList<ActionParametersBase> params = new ArrayList<>();
         Set<Guid> snapshotDisksIds = null;
         if (getSnapshotDisks().getSelectedItems() != null) {
-                snapshotDisksIds =  getSnapshotDisks()
+                snapshotDisksIds = getSnapshotDisks()
                         .getSelectedItems()
                         .stream()
                         .map(BaseDisk::getId)
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
index 0af88c03655..f5ecdee2162 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java
@@ -129,7 +129,7 @@ public void executeCommand(UICommand command) {
     public void invokeClient() {
         final GraphicsInfo spiceInfo = getEntity().getGraphicsInfos().get(GraphicsType.SPICE);
         if (spiceInfo == null) {
-            throw new IllegalStateException("Trying to invoke SPICE console but VM GraphicsInfo is null.");//$NON-NLS-1$
+            throw new IllegalStateException("Trying to invoke SPICE console but VM GraphicsInfo is null."); //$NON-NLS-1$
         }
 
         final ConsoleOptions options = getSpiceImpl().getOptions();
@@ -212,7 +212,7 @@ public void executeCommand(UICommand uiCommand) {
         }
     }
 
-    private void createConnectWithoutAgentConfirmationPopup(UICommand okCommand, UICommand cancelCommand){
+    private void createConnectWithoutAgentConfirmationPopup(UICommand okCommand, UICommand cancelCommand) {
         SpiceToGuestWithNonRespAgentModel spiceWithoutAgentModel = new SpiceToGuestWithNonRespAgentModel();
         spiceWithoutAgentModel.setTitle(ConstantsManager.getInstance()
                 .getConstants()
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
index 4d12055213d..e29cdfd5af5 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java
@@ -2171,7 +2171,7 @@ public void addAffinityLabel() {
     public boolean isHostedEngine() {
         boolean isExistingVmBehavior = getBehavior() instanceof ExistingVmModelBehavior;
         if (isExistingVmBehavior) {
-            ExistingVmModelBehavior behavior = (ExistingVmModelBehavior)getBehavior();
+            ExistingVmModelBehavior behavior = (ExistingVmModelBehavior) getBehavior();
             return behavior.getVm() != null && behavior.getVm().isHostedEngine();
         }
         return false;
@@ -2301,7 +2301,7 @@ public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs
             } else if (sender == getCpuPinningPolicy()) {
                 cpuPinningPolicyChanged();
                 behavior.updateNumaFields();
-            } else if (sender == getConsoleDisconnectAction()){
+            } else if (sender == getConsoleDisconnectAction()) {
                 consoleDisconnectActionSelectedItemChanged();
             }
         } else if (ev.matchesDefinition(ListModel.selectedItemsChangedEventDefinition)) {
@@ -2415,13 +2415,13 @@ private void virtioScsiMultiQueueSelectedItemChanged() {
     }
 
     private void vmInitEnabledChanged() {
-        if(!getVmInitEnabled().getEntity()) {
+        if (!getVmInitEnabled().getEntity()) {
             getSysprepEnabled().setEntity(false);
             getCloudInitEnabled().setEntity(false);
             getIgnitionEnabled().setEntity(false);
         } else {
             getSysprepEnabled().setEntity(getIsWindowsOS());
-            if(getIsIgnition()) {
+            if (getIsIgnition()) {
                 // because the usage of the same flow panel order matters
                 getCloudInitEnabled().setEntity(!getIsWindowsOS() && !getIsIgnition());
                 getIgnitionEnabled().setEntity(getIsIgnition());
@@ -2439,7 +2439,7 @@ private void vmInitEnabledChanged() {
     }
 
     private void autoSetHostname() {
-        if(getVmInitEnabled().getEntity()) {
+        if (getVmInitEnabled().getEntity()) {
             getVmInitModel().autoSetHostname(getName().getEntity());
         }
     }
@@ -3576,7 +3576,7 @@ public Model setIsChangeable(boolean value, String reason) {
 
     public class ListModelWithClusterDefault<T> extends NotChangableForVmInPoolListModel<T> {
 
-        public static final String CLUSTER_VALUE_EVENT = "ClusterValue";//$NON-NLS-1$
+        public static final String CLUSTER_VALUE_EVENT = "ClusterValue"; //$NON-NLS-1$
 
         // item that should be added to the items list to represent the cluster value,
         // it is usually null but e.g. for BiosType it is a special enum value
@@ -3868,7 +3868,7 @@ private void updateMigrationRelatedFields() {
                 // explicitly selected the empty
                 hasMigrationPolicy = false;
             }
-        } else if (NoMigrationPolicy.ID.equals(getMigrationPolicies().getSelectedItem().getId())){
+        } else if (NoMigrationPolicy.ID.equals(getMigrationPolicies().getSelectedItem().getId())) {
             hasMigrationPolicy = false;
         }
 
@@ -4031,12 +4031,12 @@ private void updateTpmEnabled() {
     }
 
     protected void updateCpuPinningPolicy() {
-        boolean defaultHostSelected =  Boolean.FALSE.equals(getIsAutoAssign().getEntity()) &&
+        boolean defaultHostSelected = Boolean.FALSE.equals(getIsAutoAssign().getEntity()) &&
                 getDefaultHost().getSelectedItems() != null &&
                 getDefaultHost().getSelectedItems().size() > 0;
 
         boolean isDedicatedCpusSupported = false;
-        if(getSelectedCluster() != null && getSelectedCluster().getCompatibilityVersion() != null) {
+        if (getSelectedCluster() != null && getSelectedCluster().getCompatibilityVersion() != null) {
             isDedicatedCpusSupported = AsyncDataProvider.getInstance()
                     .isDedicatedPolicySupportedByVersion(getCompatibilityVersion());
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDevicesListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDevicesListModel.java
index aa98153d37b..412a71702e0 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDevicesListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDevicesListModel.java
@@ -84,7 +84,7 @@ public void onSuccess(QueryReturnValue returnValue) {
                             }
                             setItems(frontendDevices);
                         }
-            }) {};
+            }) { };
             super.syncSearch(QueryType.GetVmDevicesForVm, new IdQueryParameters(vm.getId()), asyncQuery);
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
index 8bcecea7be0..f0e2371fe3e 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmDiskListModel.java
@@ -578,7 +578,7 @@ private boolean isRemoveCommandAvailable() {
     }
 
     private boolean isSparsifyCommandAvailable() {
-        List<Disk> disks = getSelectedItems() != null ?getSelectedItems() : new ArrayList<Disk>();
+        List<Disk> disks = getSelectedItems() != null ? getSelectedItems() : new ArrayList<Disk>();
 
         for (Disk disk : disks) {
             if (!isImageDiskOK(disk) || isImageDiskPreallocated(disk) || !isVmDown() && disk.getPlugged()) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
index dadd8b4e07c..59ffbf855eb 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java
@@ -35,21 +35,21 @@
 
 public class VmGeneralModel extends AbstractGeneralModel<VM> {
 
-    public static final String HAS_HOST_PASSTHROUGH_PROPERTY_CHANGE = "HasHostPassthrough";//$NON-NLS-1$
+    public static final String HAS_HOST_PASSTHROUGH_PROPERTY_CHANGE = "HasHostPassthrough"; //$NON-NLS-1$
 
-    public static final String HAS_CUSTOM_CPU_PROPERTY_CHANGE = "HasCustomCpuType";//$NON-NLS-1$
+    public static final String HAS_CUSTOM_CPU_PROPERTY_CHANGE = "HasCustomCpuType"; //$NON-NLS-1$
 
-    public static final String GUEST_CPU_TYPE_PROPERTY_CHANGE = "GuestCpuType";//$NON-NLS-1$
+    public static final String GUEST_CPU_TYPE_PROPERTY_CHANGE = "GuestCpuType"; //$NON-NLS-1$
 
-    public static final String CONFIGURED_CPU_TYPE_PROPERTY_CHANGE = "ConfiguredCpuType";//$NON-NLS-1$
+    public static final String CONFIGURED_CPU_TYPE_PROPERTY_CHANGE = "ConfiguredCpuType"; //$NON-NLS-1$
 
-    public static final String IS_HOSTED_ENGINE = "IsHostedEngine";//$NON-NLS-1$
+    public static final String IS_HOSTED_ENGINE = "IsHostedEngine"; //$NON-NLS-1$
 
-    public static final String STATUS = "Status";//$NON-NLS-1$
+    public static final String STATUS = "Status"; //$NON-NLS-1$
 
-    public static final String ARCHITECTURE = "VmArchitecture";//$NON-NLS-1$
+    public static final String ARCHITECTURE = "VmArchitecture"; //$NON-NLS-1$
 
-    public static final String BIOS_TYPE = "VmBiosType";//$NON-NLS-1$
+    public static final String BIOS_TYPE = "VmBiosType"; //$NON-NLS-1$
 
     private static final VmTemplateNameRenderer vmTemplateNameRenderer = new VmTemplateNameRenderer();
 
@@ -692,12 +692,12 @@ private void updateProperties() {
         setDefinedMemory(vm.getVmMemSizeMb() + " MB"); //$NON-NLS-1$
         setMinAllocatedMemory(vm.getMinAllocatedMem() + " MB"); //$NON-NLS-1$
 
-        if(vm.isRunningOrPaused() && vm.getGuestMemoryFree() != null) {
+        if (vm.isRunningOrPaused() && vm.getGuestMemoryFree() != null) {
             // If old OGA guest memory reported. Zero checks is for windows OGA.
             if (vm.getGuestMemoryBuffered() != null && vm.getGuestMemoryCached() != null && vm.getGuestMemoryBuffered() != 0 && vm.getGuestMemoryCached() != 0) {
                 setGuestMemInfoUsingUnusedMem(false);
                 setGuestFreeCachedBufferedMemInfo((vm.getGuestMemoryFree() / 1024L) + " / " // $NON-NLS-1$
-                                                + (vm.getGuestMemoryBuffered() / 1024L)  + " / " // $NON-NLS-1$
+                                                + (vm.getGuestMemoryBuffered() / 1024L) + " / " // $NON-NLS-1$
                                                 + (vm.getGuestMemoryCached() / 1024L) + " MB"); //$NON-NLS-1$
             } else if (vm.getGuestMemoryUnused() != null && vm.getGuestMemoryUnused() != 0) {
                 setGuestMemInfoUsingUnusedMem(true);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportGeneralModel.java
index 57d5a165810..337322b3ec3 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportGeneralModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmImportGeneralModel.java
@@ -106,7 +106,7 @@ protected void onEntityChanged() {
     public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs args) {
         super.eventRaised(ev, sender, args);
         if (sender instanceof ClusterListModel) {
-            cluster = (Cluster)((ClusterListModel) sender).getSelectedItem();
+            cluster = (Cluster) ((ClusterListModel) sender).getSelectedItem();
             updateOsList();
         }
     }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
index a83120749a6..9e5bb097ce2 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java
@@ -342,7 +342,7 @@ private void initNetworks(VmInit vmInit) {
         }
 
         if (networkMap.size() != 0) {
-            lastSelectedNetworkName =  networkMap.keySet().iterator().next();
+            lastSelectedNetworkName = networkMap.keySet().iterator().next();
             getNetworkEnabled().setEntity(true);
         } else {
             getNetworkEnabled().setEntity(false);
@@ -388,10 +388,10 @@ public boolean validate() {
 
         if (getHostnameEnabled()) {
             if (this.isWindowsOS) {
-                getWindowsHostname().validateEntity(new IValidation[] { new HostnameValidation(), new  LengthValidation(AsyncDataProvider.getInstance().getMaxVmNameLengthSysprep())});
+                getWindowsHostname().validateEntity(new IValidation[] { new HostnameValidation(), new LengthValidation(AsyncDataProvider.getInstance().getMaxVmNameLengthSysprep())});
 
             } else {
-                getHostname().validateEntity(new IValidation[] { new HostnameValidation(), new  LengthValidation(AsyncDataProvider.getInstance().getMaxVmNameLength())});
+                getHostname().validateEntity(new IValidation[] { new HostnameValidation(), new LengthValidation(AsyncDataProvider.getInstance().getMaxVmNameLength())});
             }
         }
         getSysprepDomain().setIsValid(true);
@@ -966,11 +966,11 @@ private void setTimeZoneEnabled(EntityModel<Boolean> value) {
         timeZoneEnabled = value;
     }
 
-    public ListModel<Map.Entry<String, String>>  getTimeZoneList() {
+    public ListModel<Map.Entry<String, String>> getTimeZoneList() {
         return timeZoneList;
     }
 
-    private void setTimeZoneList(ListModel<Map.Entry<String, String>>  value) {
+    private void setTimeZoneList(ListModel<Map.Entry<String, String>> value) {
         timeZoneList = value;
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java
index 6f668f6e142..61df158b361 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceCreatingManager.java
@@ -53,7 +53,7 @@ protected void doNicManipulation(
                 addInterfaceResult ->
                         Frontend.getInstance().runMultipleActions(ActionType.UpdateVmInterface,
                         updateVnicParameters,
-                        updateInterfaceResult-> Frontend.getInstance().runMultipleActions(ActionType.RemoveVmInterface,
+                        updateInterfaceResult -> Frontend.getInstance().runMultipleActions(ActionType.RemoveVmInterface,
                                 removeVnicParameters,
                                 removeInterfaceResult -> {
                                     if (isAddingNewVm) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
index 4d1d103483f..ca66dd2050d 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInterfaceListModel.java
@@ -269,7 +269,7 @@ protected void onSelectedItemChanging(VmNetworkInterface newValue, VmNetworkInte
     }
 
     private void initSelectionGuestAgentData(VmNetworkInterface selectedItem) {
-        if (selectedItem == null || getGuestAgentData() == null){
+        if (selectedItem == null || getGuestAgentData() == null) {
             setSelectionGuestAgentData(null);
             return;
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
index d35f5f612ab..4df4367f7ca 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java
@@ -145,9 +145,9 @@ public void setCloneVmCommand(UICommand cloneVmCommand) {
 
     private static final String SUSPEND = "Suspend"; //$NON-NLS-1$
     private static final String SHUTDOWN = "Shutdown"; //$NON-NLS-1$
-    private static final String STOP     = "Stop"; //$NON-NLS-1$
-    private static final String REBOOT   = "Reboot"; //$NON-NLS-1$
-    private static final String RESET    = "Reset"; //$NON-NLS-1$
+    private static final String STOP = "Stop"; //$NON-NLS-1$
+    private static final String REBOOT = "Reboot"; //$NON-NLS-1$
+    private static final String RESET = "Reset"; //$NON-NLS-1$
 
     public UICommand getNewVmCommand() {
         return newVMCommand;
@@ -788,14 +788,14 @@ private void edit() {
 
     }
 
-    private void confirmBiosTypeUpdate(){
+    private void confirmBiosTypeUpdate() {
         VM vm = getSelectedItem();
         UnitVmModel model = (UnitVmModel) getWindow();
         if (vm == null || model.getIsNew()) {
             preSave();
         } else {
             BiosType newBiosType = model.getBiosType().getSelectedItem();
-            BiosType oldBiosType =  vm.getBiosType();
+            BiosType oldBiosType = vm.getBiosType();
             if (oldBiosType.equals(BiosType.Q35_SECURE_BOOT) && !newBiosType.equals(BiosType.Q35_SECURE_BOOT) ||
                 oldBiosType.isOvmf() && !newBiosType.isOvmf()) {
                 ConfirmationModel confirmModel = new ConfirmationModel();
@@ -1585,7 +1585,7 @@ private void suspend() {
                 VM a = (VM) item;
                 paramsList.add(new VmOperationParameterBase(a.getId()));
             }
-            Frontend.getInstance().runMultipleAction(ActionType.HibernateVm, paramsList, result -> {}, null);
+            Frontend.getInstance().runMultipleAction(ActionType.HibernateVm, paramsList, result -> { }, null);
         }
     }
 
@@ -1610,7 +1610,7 @@ private void run() {
             list.add(new RunVmParams(a.getId()));
         }
 
-        Frontend.getInstance().runMultipleAction(ActionType.RunVm, list, result -> {}, null);
+        Frontend.getInstance().runMultipleAction(ActionType.RunVm, list, result -> { }, null);
     }
 
     private void onRemove() {
@@ -1784,7 +1784,7 @@ private void preSaveUpdateAndValidateModel() {
     }
 
     @Override
-    protected void updateVM (final UnitVmModel model){
+    protected void updateVM (final UnitVmModel model) {
         final VM selectedItem = getSelectedItem();
         // explicitly pass non-editable field from the original VM
         getcurrentVm().setCreatedByUserId(selectedItem.getCreatedByUserId());
@@ -2401,7 +2401,7 @@ private void initImportModelForVmsToImportNamesOnly(final ImportVmsModel importV
 
     private OriginType convertImportSourceToOriginType(ImportSource importSource) {
         OriginType originType;
-        switch(importSource) {
+        switch (importSource) {
             case VMWARE:
                 originType = OriginType.VMWARE;
                 break;
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
index beed6c9a79b..068a6e4e420 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java
@@ -241,7 +241,7 @@ protected void updateMigrationForLocalSD() {
         boolean isLocalSD =
                 getModel().getSelectedDataCenter() != null
                         && getModel().getSelectedDataCenter().isLocal();
-        if(isLocalSD) {
+        if (isLocalSD) {
             getModel().getIsAutoAssign().setEntity(false);
             getModel().getMigrationMode().setSelectedItem(MigrationSupport.PINNED_TO_HOST);
         }
@@ -376,7 +376,7 @@ private static List<TemplateWithVersion> createTemplateWithVersionsAddLatest(Lis
         final Map<Guid, VmTemplate> baseIdToBaseTemplateMap = new HashMap<>();
         final Map<Guid, VmTemplate> baseIdToLastVersionMap = new HashMap<>();
         for (VmTemplate template : templates) {
-            if (template.isBaseTemplate())  {
+            if (template.isBaseTemplate()) {
                 baseIdToBaseTemplateMap.put(template.getId(), template);
                 baseIdToLastVersionMap.put(template.getId(), template);
             }
@@ -472,7 +472,7 @@ protected void updateCdImage(boolean forceRefresh) {
     }
 
     protected String getSelectedTimeZone() {
-        String timeZoneKey =  getModel().getTimeZone().getSelectedItem().getTimeZoneKey();
+        String timeZoneKey = getModel().getTimeZone().getSelectedItem().getTimeZoneKey();
         return timeZoneKey != null ? timeZoneKey : "";
     }
 
@@ -1028,7 +1028,7 @@ public void coresPerSocketChanged() {
             return;
         }
 
-        if (numOfSockets * coresPerSocket > totalCpuCores) {// decrease the number of sockets, threads can be 1
+        if (numOfSockets * coresPerSocket > totalCpuCores) { // decrease the number of sockets, threads can be 1
             numOfSockets = totalCpuCores / coresPerSocket;
             getModel().getNumOfSockets().setSelectedItem(numOfSockets);
         }
@@ -1819,7 +1819,7 @@ protected boolean isVmHpOrPinningConfigurationEnabled() {
     }
 
     protected void useHostCpuValueChanged() {
-        if(getModel().getHostCpu().getEntity() != null && getModel().getHostCpu().getEntity()) {
+        if (getModel().getHostCpu().getEntity() != null && getModel().getHostCpu().getEntity()) {
             getModel().getCustomCpu().setIsChangeable(false);
             getModel().getCustomCpu().setSelectedItem(""); //$NON-NLS-1$
         } else {
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
index 6c578a0eef2..cbbb285a100 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModel.java
@@ -651,7 +651,7 @@ private void onCloneTemplate() {
 
         if (!model.validate(false)) {
             model.setIsValid(false);
-        } else  if (model.getIsSubTemplate().getEntity()) {
+        } else if (model.getIsSubTemplate().getEntity()) {
             postNameUniqueCheck(vm);
         } else {
             String name = model.getName().getEntity();
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
index f47b646442d..e03317f085a 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/key_value/KeyValueModel.java
@@ -58,7 +58,7 @@ protected void initLineModel(KeyValueLineModel keyValueLineModel, String key) {
             if (constrainedValue) {
                 keyValueLineModel.getValues().setItems(allRegExKeys.get(key));
             }
-        } else if (showInvalidKeys){
+        } else if (showInvalidKeys) {
             keyValueLineModel.getValue().setIsAvailable(true);
             keyValueLineModel.getValue().setEntity("");
             keyValueLineModel.getEditableKey().setIsAvailable(false);
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
index f1093e2f40e..db5c57de565 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java
@@ -307,15 +307,15 @@ public VolumeListModel(final VolumeBrickListModel volumeBrickListModel,
         setStartRebalanceCommand(new UICommand("StartRebalance", this)); //$NON-NLS-1$
         setStopRebalanceCommand(new UICommand("StopRebalace", this)); //$NON-NLS-1$
         setStatusRebalanceCommand(new UICommand("StatusRebalance", this)); //$NON-NLS-1$
-        setStartVolumeProfilingCommand(new UICommand("startProfiling", this));//$NON-NLS-1$
-        setShowVolumeProfileDetailsCommand(new UICommand("showProfileDetails", this));//$NON-NLS-1$
-        setStopVolumeProfilingCommand(new UICommand("stopProfiling", this));//$NON-NLS-1$
+        setStartVolumeProfilingCommand(new UICommand("startProfiling", this)); //$NON-NLS-1$
+        setShowVolumeProfileDetailsCommand(new UICommand("showProfileDetails", this)); //$NON-NLS-1$
+        setStopVolumeProfilingCommand(new UICommand("stopProfiling", this)); //$NON-NLS-1$
         setOptimizeForVirtStoreCommand(new UICommand("OptimizeForVirtStore", this)); //$NON-NLS-1$
         setConfigureClusterSnapshotOptionsCommand(new UICommand("configureClusterSnapshotOptions", this)); //$NON-NLS-1$
         setConfigureVolumeSnapshotOptionsCommand(new UICommand("configureVolumeSnapshotOptions", this)); //$NON-NLS-1$
         setCreateSnapshotCommand(new UICommand("createSnapshot", this)); //$NON-NLS-1$
         setEditSnapshotScheduleCommand(new UICommand("editSnapshotSchedule", this)); //$NON-NLS-1$
-        setNewGeoRepSessionCommand(new UICommand("createGeoRepSession", this));//$NON-NLS-1$
+        setNewGeoRepSessionCommand(new UICommand("createGeoRepSession", this)); //$NON-NLS-1$
 
         getRemoveVolumeCommand().setIsExecutionAllowed(false);
         getStartCommand().setIsExecutionAllowed(false);
@@ -585,7 +585,7 @@ private boolean isStopProfileAvailable(List<GlusterVolumeEntity> list) {
                 if (volumeEntity.getStatus() == GlusterStatus.DOWN) {
                     return false;
                 }
-                if (volumeEntity.getOptionValue("diagnostics.latency-measurement") == null || !volumeEntity.getOptionValue("diagnostics.latency-measurement").equals("on")) {//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                if (volumeEntity.getOptionValue("diagnostics.latency-measurement") == null || !volumeEntity.getOptionValue("diagnostics.latency-measurement").equals("on")) { //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
                     return false;
                 }
             }
@@ -601,7 +601,7 @@ private boolean isStartProfileAvailable(List<GlusterVolumeEntity> list) {
                 if (volumeEntity.getStatus() == GlusterStatus.DOWN) {
                     return false;
                 }
-                if (volumeEntity.getOptionValue("diagnostics.latency-measurement") != null && volumeEntity.getOptionValue("diagnostics.latency-measurement").equals("on")) {//$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
+                if (volumeEntity.getOptionValue("diagnostics.latency-measurement") != null && volumeEntity.getOptionValue("diagnostics.latency-measurement").equals("on")) { //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
                     return false;
                 }
             }
@@ -621,9 +621,9 @@ private boolean getRebalanceStatusAvailability(List<GlusterVolumeEntity> selecte
     }
 
     private boolean getProfileStatisticsAvailability(List<GlusterVolumeEntity> selectedVolumes) {
-        if(selectedVolumes.size() == 1) {
+        if (selectedVolumes.size() == 1) {
             GlusterVolumeEntity selectedVolume = selectedVolumes.get(0);
-            if(selectedVolume.getStatus() == GlusterStatus.UP) {
+            if (selectedVolume.getStatus() == GlusterStatus.UP) {
                 return true;
             }
         }
@@ -641,7 +641,7 @@ public void executeCommand(UICommand command) {
             newVolume();
         } else if (command.equals(getRemoveVolumeCommand())) {
             removeVolume();
-        } else if(command.getName().equals("closeConfirmationWindow")) {//$NON-NLS-1$
+        } else if (command.getName().equals("closeConfirmationWindow")) { //$NON-NLS-1$
             closeConfirmationWindow();
         } else if (command.getName().equalsIgnoreCase("Cancel")) { //$NON-NLS-1$
             cancel();
@@ -663,60 +663,60 @@ public void executeCommand(UICommand command) {
             showRebalanceStatus();
         } else if (command.getName().equals("CancelConfirmation")) { //$NON-NLS-1$
             setConfirmWindow(null);
-        } else if (command.getName().equals("CancelRebalanceStatus")) {//$NON-NLS-1$
+        } else if (command.getName().equals("CancelRebalanceStatus")) { //$NON-NLS-1$
             cancelRebalanceStatus();
-        }else if (command.equals(getOptimizeForVirtStoreCommand())) {
+        } else if (command.equals(getOptimizeForVirtStoreCommand())) {
             optimizeForVirtStore();
-        } else if (command.getName().equals("onStop")) {//$NON-NLS-1$
+        } else if (command.getName().equals("onStop")) { //$NON-NLS-1$
             onStop();
         } else if (command.getName().equals("OnRemove")) { //$NON-NLS-1$
             onRemoveVolume();
-        } else if(command.getName().equals("stop_rebalance_from_status")) {//$NON-NLS-1$
+        } else if (command.getName().equals("stop_rebalance_from_status")) { //$NON-NLS-1$
             stopRebalance();
-        } else if(command.equals(getStartVolumeProfilingCommand()) || command.getName().equals("startProfiling")) {//$NON-NLS-1$
+        } else if (command.equals(getStartVolumeProfilingCommand()) || command.getName().equals("startProfiling")) { //$NON-NLS-1$
             startVolumeProfiling();
-        } else if(command.equals(getStopVolumeProfilingCommand()) || command.getName().equals("stopProfiling")) {//$NON-NLS-1$
+        } else if (command.equals(getStopVolumeProfilingCommand()) || command.getName().equals("stopProfiling")) { //$NON-NLS-1$
             stopVolumeProfiling();
-        } else if(command.equals(getShowVolumeProfileDetailsCommand()) || command.getName().equals("showProfileDetails")) {//$NON-NLS-1$
+        } else if (command.equals(getShowVolumeProfileDetailsCommand()) || command.getName().equals("showProfileDetails")) { //$NON-NLS-1$
             showVolumeProfiling();
-        }else if(command.getName().equalsIgnoreCase("closeProfileStats")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("closeProfileStats")) { //$NON-NLS-1$
             setWindow(null);
-        } else if(command.getName().equalsIgnoreCase("CancelOptimizeForVirtStore")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("CancelOptimizeForVirtStore")) { //$NON-NLS-1$
             setConfirmWindow(null);
-        } else if (command.getName().equalsIgnoreCase("ConfirmOptimiseForVirtStore")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("ConfirmOptimiseForVirtStore")) { //$NON-NLS-1$
             List<GlusterVolumeEntity> selectedVolumes = new ArrayList<>();
-            for(Object selectedVolume : getSelectedItems()) {
+            for (Object selectedVolume : getSelectedItems()) {
                 selectedVolumes.add((GlusterVolumeEntity) selectedVolume);
             }
             optimizeVolumesForVirtStore(selectedVolumes);
         } else if (command.equals(getConfigureClusterSnapshotOptionsCommand())) {
             configureClusterSnapshotOptions();
-        } else if (command.getName().equalsIgnoreCase("confirmConfigureClusterSnapshotOptions")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("confirmConfigureClusterSnapshotOptions")) { //$NON-NLS-1$
             confirmConfigureClusterSnapshotOptions();
-        } else if (command.getName().equalsIgnoreCase("onConfigureClusterSnapshotOptions")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onConfigureClusterSnapshotOptions")) { //$NON-NLS-1$
             onConfigureClusterSnapshotOptions();
         } else if (command.equals(getConfigureVolumeSnapshotOptionsCommand())) {
             configureVolumeSnapshotOptions();
-        } else if (command.getName().equalsIgnoreCase("confirmConfigureVolumeSnapshotOptions")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("confirmConfigureVolumeSnapshotOptions")) { //$NON-NLS-1$
             confirmConfigureVolumeSnapshotOptions();
-        } else if (command.getName().equalsIgnoreCase("onConfigureVolumeSnapshotOptions")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onConfigureVolumeSnapshotOptions")) { //$NON-NLS-1$
             onConfigureVolumeSnapshotOptions();
         } else if (command.equals(getCreateSnapshotCommand())) {
             setWindow(null);
             createVolumeSnapshot();
-        } else if (command.getName().equalsIgnoreCase("onCreateSnapshot")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onCreateSnapshot")) { //$NON-NLS-1$
             onCreateSnapshot();
         } else if (command.equals(getEditSnapshotScheduleCommand())) {
             editSnapshotSchedule();
-        } else if (command.getName().equalsIgnoreCase("onEditSnapshotSchedule")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onEditSnapshotSchedule")) { //$NON-NLS-1$
             onEditSnapshotSchedule();
-        } else if (command.getName().equalsIgnoreCase("onEditSnapshotScheduleInternal")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onEditSnapshotScheduleInternal")) { //$NON-NLS-1$
             onEditSnapshotScheduleInternal();
-        } else if (command.getName().equals("startVolumeWithForceOption")) {//$NON-NLS-1$
+        } else if (command.getName().equals("startVolumeWithForceOption")) { //$NON-NLS-1$
             prepareForStartVolume(false);
-        } else if (command.getName().equalsIgnoreCase("onCreateSession")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("onCreateSession")) { //$NON-NLS-1$
             onCreateSession();
-        } else if (command.getName().equalsIgnoreCase("closeWindow")) {//$NON-NLS-1$
+        } else if (command.getName().equalsIgnoreCase("closeWindow")) { //$NON-NLS-1$
             setWindow(null);
         }
     }
@@ -734,12 +734,12 @@ public void createNewGeoRepSession() {
         geoRepCreateModel.getSlaveUserName().setEntity(constants.rootUser());
         geoRepCreateModel.getShowEligibleVolumes().setEntity(true);
 
-        UICommand ok = new UICommand("onCreateSession", this);//$NON-NLS-1$
+        UICommand ok = new UICommand("onCreateSession", this); //$NON-NLS-1$
         ok.setTitle(constants.ok());
         ok.setIsDefault(true);
         geoRepCreateModel.getCommands().add(ok);
 
-        UICommand close = new UICommand("closeWindow", this);//$NON-NLS-1$
+        UICommand close = new UICommand("closeWindow", this); //$NON-NLS-1$
         close.setTitle(constants.cancel());
         close.setIsCancel(true);
         geoRepCreateModel.getCommands().add(close);
@@ -842,7 +842,7 @@ public void initializeGeoRepActionConfirmation(String title,
         cModel.setForceLabel(forceLabelText);
 
         List<UICommand> geoRepActionCommands = Arrays.asList(UICommand.createDefaultOkUiCommand(commandName, this),
-                UICommand.createCancelUiCommand("closeWindow", this));//$NON-NLS-1$
+                UICommand.createCancelUiCommand("closeWindow", this)); //$NON-NLS-1$
 
         if (cModel.getCommands().size() > 0) {
             cModel.setCommands(geoRepActionCommands);
@@ -924,7 +924,7 @@ private void scheduleSnapshot(final GlusterVolumeSnapshotModel snapshotModel, bo
             StringBuilder sb = new StringBuilder();
             for (DayOfWeek day : snapshotModel.getDaysOfTheWeek().getSelectedItem()) {
                 sb.append(day.name().substring(0, 3));
-                sb.append(',');//$NON-NLS-1$
+                sb.append(','); //$NON-NLS-1$
             }
             schedule.setDays(sb.toString());
             break;
@@ -1049,7 +1049,7 @@ public void onSuccess(final GlusterVolumeSnapshotSchedule schedule) {
                     break;
                 case WEEKLY:
                     List<DayOfWeek> daysList = new ArrayList<>();
-                    for (String day : schedule.getDays().split(",")) {//$NON-NLS-1$
+                    for (String day : schedule.getDays().split(",")) { //$NON-NLS-1$
                         daysList.add(getDayOfWeek(day));
                     }
                     snapshotModel.getDaysOfTheWeek().setSelectedItem(daysList);
@@ -1067,19 +1067,19 @@ public void onSuccess(final GlusterVolumeSnapshotSchedule schedule) {
 
             private DayOfWeek getDayOfWeek(String day) {
                 switch (day) {
-                case "Sun"://$NON-NLS-1$
+                case "Sun": //$NON-NLS-1$
                     return DayOfWeek.Sunday;
-                case "Mon"://$NON-NLS-1$
+                case "Mon": //$NON-NLS-1$
                     return DayOfWeek.Monday;
-                case "Tue"://$NON-NLS-1$
+                case "Tue": //$NON-NLS-1$
                     return DayOfWeek.Tuesday;
-                case "Wed"://$NON-NLS-1$
+                case "Wed": //$NON-NLS-1$
                     return DayOfWeek.Wednesday;
-                case "Thu"://$NON-NLS-1$
+                case "Thu": //$NON-NLS-1$
                     return DayOfWeek.Thursday;
-                case "Fri"://$NON-NLS-1$
+                case "Fri": //$NON-NLS-1$
                     return DayOfWeek.Friday;
-                case "Sat"://$NON-NLS-1$
+                case "Sat": //$NON-NLS-1$
                     return DayOfWeek.Saturday;
                 default:
                     return null;
@@ -1171,7 +1171,7 @@ private void stopVolumeProfiling() {
     }
 
     private void closeConfirmationWindow() {
-        if(getConfirmWindow() == null) {
+        if (getConfirmWindow() == null) {
             return;
         }
         getConfirmWindow().stopProgress();
@@ -1245,11 +1245,11 @@ private void showRebalanceStatus() {
         final GlusterVolumeEntity volumeEntity = getSelectedItem();
         setConfirmWindow(cModel);
         cModel.setTitle(ConstantsManager.getInstance().getConstants().rebalanceStatusTitle());
-        cModel.startProgress(ConstantsManager.getInstance().getConstants().fetchingDataMessage());//$NON-NLS-1$
+        cModel.startProgress(ConstantsManager.getInstance().getConstants().fetchingDataMessage()); //$NON-NLS-1$
         cModel.setHelpTag(HelpTag.volume_rebalance_status);
         cModel.setHashName("volume_rebalance_status"); //$NON-NLS-1$
 
-        final UICommand rebalanceStatusOk = new UICommand("closeConfirmationWindow", VolumeListModel.this);//$NON-NLS-1$
+        final UICommand rebalanceStatusOk = new UICommand("closeConfirmationWindow", VolumeListModel.this); //$NON-NLS-1$
         rebalanceStatusOk.setTitle(ConstantsManager.getInstance().getConstants().ok());
         rebalanceStatusOk.setIsCancel(true);
         cModel.getCommands().add(rebalanceStatusOk);
@@ -1273,18 +1273,18 @@ private void showRebalanceStatus() {
                     rebalanceStatusModel.getVolume().setEntity(volumeEntity.getName());
                     rebalanceStatusModel.getCluster().setEntity(volumeEntity.getClusterName());
 
-                    UICommand stopRebalanceFromStatus = new UICommand("stop_rebalance_from_status", VolumeListModel.this);//$NON-NLS-1$
+                    UICommand stopRebalanceFromStatus = new UICommand("stop_rebalance_from_status", VolumeListModel.this); //$NON-NLS-1$
                     stopRebalanceFromStatus.setTitle(ConstantsManager.getInstance().getConstants().stopRebalance());
                     rebalanceStatusModel.getCommands().add(stopRebalanceFromStatus);
                     rebalanceStatusModel.setStopReblanceFromStatus(stopRebalanceFromStatus);
 
-                    UICommand cancelRebalance = new UICommand("CancelRebalanceStatus", VolumeListModel.this);//$NON-NLS-1$
+                    UICommand cancelRebalance = new UICommand("CancelRebalanceStatus", VolumeListModel.this); //$NON-NLS-1$
                     cancelRebalance.setTitle(ConstantsManager.getInstance().getConstants().close());
                     cancelRebalance.setIsCancel(true);
                     rebalanceStatusModel.getCommands().add(cancelRebalance);
 
                     rebalanceStatusModel.showStatus(rebalanceStatusEntity);
-                }else {
+                } else {
                     VolumeRebalanceStatusModel statusModel = (VolumeRebalanceStatusModel) getWindow();
                     statusModel.getCommands().get(0).setIsExecutionAllowed(false);
                     statusModel.showStatus(rebalanceStatusEntity);
@@ -1297,7 +1297,7 @@ private void showRebalanceStatus() {
     }
 
     private void showVolumeProfiling() {
-        if(getSelectedItem() == null || getWindow()!= null) {
+        if (getSelectedItem() == null || getWindow() != null) {
             return;
         }
         GlusterVolumeEntity selectedVolume = getSelectedItem();
@@ -1307,9 +1307,9 @@ private void showVolumeProfiling() {
         setHelpTag(HelpTag.volume_profile_statistics);
         setHashName("volume_profile_statistics"); //$NON-NLS-1$
 
-        profileStatsModel.startProgress(ConstantsManager.getInstance().getConstants().fetchingDataMessage());//$NON-NLS-1$
+        profileStatsModel.startProgress(ConstantsManager.getInstance().getConstants().fetchingDataMessage()); //$NON-NLS-1$
 
-        UICommand closeProfilingStats = new UICommand("closeProfileStats", VolumeListModel.this);//$NON-NLS-1$
+        UICommand closeProfilingStats = new UICommand("closeProfileStats", VolumeListModel.this); //$NON-NLS-1$
         closeProfilingStats.setTitle(ConstantsManager.getInstance().getConstants().close());
         closeProfilingStats.setIsCancel(true);
         profileStatsModel.getCommands().add(closeProfilingStats);
@@ -1324,7 +1324,7 @@ private void cancelRebalanceStatus() {
         if (getWindow() == null) {
             return;
         }
-        ((VolumeRebalanceStatusModel)getWindow()).cancelRefresh();
+        ((VolumeRebalanceStatusModel) getWindow()).cancelRefresh();
         cancel();
     }
 
@@ -1340,24 +1340,24 @@ private void optimizeForVirtStore() {
         for (Object item : getSelectedItems()) {
             GlusterVolumeEntity volume = (GlusterVolumeEntity) item;
             volumesForOptimiseForVirtStore.add(volume);
-            if(volume.getReplicaCount() != 3) {
-                discouragedConfigVolumeNamesBuilder.append(volume.getName() + "\n");//$NON-NLS-1$
+            if (volume.getReplicaCount() != 3) {
+                discouragedConfigVolumeNamesBuilder.append(volume.getName() + "\n"); //$NON-NLS-1$
                 isDiscouragedVolumePresent = true;
             }
         }
         discouragedConfigVolumeNamesBuilder.append(constants.optimiseForVirtStoreContinueMessage());
 
-        if(isDiscouragedVolumePresent) {
+        if (isDiscouragedVolumePresent) {
             ConfirmationModel cModel = new ConfirmationModel();
 
             cModel.setMessage(discouragedConfigVolumeNamesBuilder.toString());
             cModel.setTitle(ConstantsManager.getInstance().getConstants().optimiseForVirtStoreTitle());
-            UICommand cancelOptimiseVirtStoreCommand = new UICommand("CancelOptimizeForVirtStore", this);//$NON-NLS-1$
+            UICommand cancelOptimiseVirtStoreCommand = new UICommand("CancelOptimizeForVirtStore", this); //$NON-NLS-1$
             cancelOptimiseVirtStoreCommand.setTitle(constants.doNotOptimiseForVirtStore());
             cancelOptimiseVirtStoreCommand.setIsCancel(true);
             cModel.getCommands().add(cancelOptimiseVirtStoreCommand);
 
-            UICommand confirmOptimiseForVirtStoreCommand = new UICommand("ConfirmOptimiseForVirtStore", this);//$NON-NLS-1$
+            UICommand confirmOptimiseForVirtStoreCommand = new UICommand("ConfirmOptimiseForVirtStore", this); //$NON-NLS-1$
             confirmOptimiseForVirtStoreCommand.setTitle(constants.continueOptimiseForVirtStore());
             confirmOptimiseForVirtStoreCommand.setIsDefault(true);
             cModel.getCommands().add(confirmOptimiseForVirtStoreCommand);
@@ -1368,7 +1368,7 @@ private void optimizeForVirtStore() {
     }
 
     private void optimizeVolumesForVirtStore(final List<GlusterVolumeEntity> volumeList) {
-        if(getConfirmWindow() != null) {
+        if (getConfirmWindow() != null) {
             setConfirmWindow(null);
         }
         AsyncDataProvider.getInstance().getConfigFromCache(
@@ -1383,25 +1383,25 @@ private void optimizeVolumesForVirtStore(final List<GlusterVolumeEntity> volumeL
                                     for (GlusterVolumeEntity volume : volumeList) {
                                         Guid volumeId = volume.getId();
                                         if (volume.getVolumeType().isReplicatedType()) {
-                                            list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "group", optionGroupVirt)));//$NON-NLS-1$
-                                        } else if (volume.getVolumeType().equals(GlusterVolumeType.DISTRIBUTE)){
-                                            list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "group", "distributed-virt")));//$NON-NLS-1$ $NON-NLS-2$
+                                            list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "group", optionGroupVirt))); //$NON-NLS-1$
+                                        } else if (volume.getVolumeType().equals(GlusterVolumeType.DISTRIBUTE)) {
+                                            list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "group", "distributed-virt"))); //$NON-NLS-1$ $NON-NLS-2$
                                         }
 
-                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "storage.owner-uid", optionOwnerUserVirt)));//$NON-NLS-1$
+                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "storage.owner-uid", optionOwnerUserVirt))); //$NON-NLS-1$
 
-                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "storage.owner-gid", optionOwnerGroupVirt)));//$NON-NLS-1$
+                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "storage.owner-gid", optionOwnerGroupVirt))); //$NON-NLS-1$
 
-                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "performance.strict-o-direct", "on")));//$NON-NLS-1$ $NON-NLS-2$
+                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "performance.strict-o-direct", "on"))); //$NON-NLS-1$ $NON-NLS-2$
 
-                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "network.remote-dio", "off")));//$NON-NLS-1$ $NON-NLS-2$
+                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "network.remote-dio", "off"))); //$NON-NLS-1$ $NON-NLS-2$
 
-                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "cluster.granular-entry-heal", "enable")));//$NON-NLS-1$ $NON-NLS-2$
+                                        list.add(new GlusterVolumeOptionParameters(getOption(volumeId, "cluster.granular-entry-heal", "enable"))); //$NON-NLS-1$ $NON-NLS-2$
 
-                                        final GlusterVolumeOptionEntity checkOption = getOption(volumeId, "network.ping-timeout", "30");//$NON-NLS-1$//$NON-NLS-2$
+                                        final GlusterVolumeOptionEntity checkOption = getOption(volumeId, "network.ping-timeout", "30"); //$NON-NLS-1$//$NON-NLS-2$
                                         if (volume.getOptions().stream().noneMatch
                                                 (obj -> obj.getKey().equalsIgnoreCase(checkOption.getKey()))) {
-                                            list.add(new GlusterVolumeOptionParameters(checkOption));//$NON-NLS-1$
+                                            list.add(new GlusterVolumeOptionParameters(checkOption)); //$NON-NLS-1$
                                         }
                                     }
                                     Frontend.getInstance().runMultipleAction(ActionType.SetGlusterVolumeOption, list);
@@ -1494,7 +1494,7 @@ private void start() {
         if (!volumesForForceStartWarning.isEmpty()) {
             final ConfirmationModel cModel = new ConfirmationModel();
             cModel.setHelpTag(HelpTag.volume_start);
-            cModel.setHashName("volume_start");//$NON-NLS-1$
+            cModel.setHashName("volume_start"); //$NON-NLS-1$
 
             setConfirmWindow(cModel);
 
@@ -1506,13 +1506,13 @@ private void start() {
             cModel.getForce().setEntity(true);
 
             cModel.getForce().getEntityChangedEvent().addListener((ev, sender, args) -> {
-                if(cModel.getCommands() != null && cModel.getCommands().get(0) !=null) {
+                if (cModel.getCommands() != null && cModel.getCommands().get(0) != null) {
                     cModel.getCommands().get(0).setIsExecutionAllowed(cModel.getForce().getEntity());
                 }
             });
 
-            cModel.getCommands().add(UICommand.createDefaultOkUiCommand("startVolumeWithForceOption", this));//$NON-NLS-1$
-            cModel.getCommands().add(UICommand.createCancelUiCommand("closeConfirmationWindow", this));//$NON-NLS-1$
+            cModel.getCommands().add(UICommand.createDefaultOkUiCommand("startVolumeWithForceOption", this)); //$NON-NLS-1$
+            cModel.getCommands().add(UICommand.createCancelUiCommand("closeConfirmationWindow", this)); //$NON-NLS-1$
         }
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java
index 148e9533ddb..f0170e6e73b 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/place/WebAdminApplicationPlaces.java
@@ -127,7 +127,7 @@ public final class WebAdminApplicationPlaces {
     // User
 
     public static final String userGeneralSubTabPlace = userMainPlace + SUB_TAB_PREFIX + "general"; //$NON-NLS-1$
-    public static final String userSettingsSubTabPlace= userMainPlace + SUB_TAB_PREFIX + "settings"; //$NON-NLS-1$
+    public static final String userSettingsSubTabPlace = userMainPlace + SUB_TAB_PREFIX + "settings"; //$NON-NLS-1$
     public static final String userQuotaSubTabPlace = userMainPlace + SUB_TAB_PREFIX + "quota"; //$NON-NLS-1$
     public static final String userGroupSubTabPlace = userMainPlace + SUB_TAB_PREFIX + "directory_groups"; //$NON-NLS-1$
     public static final String userEventNotifierSubTabPlace = userMainPlace + SUB_TAB_PREFIX + "event_notifier"; //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IconValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IconValidation.java
index 95235fbe0d5..579f9718a42 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IconValidation.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/IconValidation.java
@@ -86,7 +86,7 @@ private native boolean isComplete(ImageElement element) /*-{
      */
     private ValidationResult validateSize(String icon) {
         final int maxEncodedSize = 32 * 1024;
-        final int maxRawSize = (int) (maxEncodedSize * (3d/4d) / 1024); // just estimate for users, in kB
+        final int maxRawSize = (int) (maxEncodedSize * (3d / 4d) / 1024); // just estimate for users, in kB
         boolean valid = maxEncodedSize > icon.length();
         if (valid) {
             return ValidationResult.ok();
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NotEmptyQuotaValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NotEmptyQuotaValidation.java
index aa6d46c1707..67573066c0f 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NotEmptyQuotaValidation.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/NotEmptyQuotaValidation.java
@@ -12,7 +12,7 @@ public ValidationResult validate(Object value) {
 
         if (value == null
                 || value instanceof Quota
-                && (((Quota)value).getId() == null || Guid.Empty.equals(((Quota)value).getId()))) {
+                && (((Quota) value).getId() == null || Guid.Empty.equals(((Quota) value).getId()))) {
             result.setSuccess(false);
             result.getReasons().add(ConstantsManager.getInstance().getConstants().thisFieldCantBeEmptyInvalidReason());
         }
diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java
index bc24243ea1d..2b556ca273c 100644
--- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java
+++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java
@@ -39,7 +39,7 @@ protected String getInvalidMask() {
 
     @Override
     public ValidationResult validate(Object value) {
-        assert value == null || value instanceof String : "This validation must be run on a String!";//$NON-NLS-1$
+        assert value == null || value instanceof String : "This validation must be run on a String!"; //$NON-NLS-1$
         String mask = (String) value;
 
         if (getMaskValidator().isValidNetmaskFormat(mask)) {
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriTest.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriTest.java
index c4e55cae0a0..0d4059fa944 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriTest.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/UriTest.java
@@ -90,7 +90,7 @@ public static Stream<Arguments> createByComponents() {
                 Arguments.of(HTTPS, WWW_REDHAT_COM_80, SLASH, "https://www.redhat.com:80/"), //$NON-NLS-1$
                 Arguments.of(HTTP, WWW_REDHAT_COM_80, MAIN, HTTP_WWW_REDHAT_COM_80_MAIN),
                 Arguments.of(HTTP, WWW_REDHAT_COM_80, MAIN_S, HTTP_WWW_REDHAT_COM_80_MAIN_S),
-                Arguments.of(null,  WWW_REDHAT_COM, MAIN_INDEX_HTML, WWW_REDHAT_COM_MAIN_INDEX_HTML),
+                Arguments.of(null, WWW_REDHAT_COM, MAIN_INDEX_HTML, WWW_REDHAT_COM_MAIN_INDEX_HTML),
                 Arguments.of(HTTP, null, MAIN_INDEX_HTML, null),
                 Arguments.of(HTTP, "www.redhat:80.com", MAIN_INDEX_HTML, null), //$NON-NLS-1$
                 Arguments.of(HTTP, WWW_REDHAT_COM, null, HTTP_WWW_REDHAT_COM)
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModelTest.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModelTest.java
index 669cf5a0439..3d3ca9a14d7 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModelTest.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModelTest.java
@@ -21,7 +21,7 @@ public class PoolListModelTest extends BaseVmListModelTest {
     PoolModel model;
 
     @BeforeEach
-    public void setUp()  {
+    public void setUp() {
         setUpUnitVmModelExpectations(model);
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/IconCacheBaseVmModelMock.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/IconCacheBaseVmModelMock.java
index 3305835034b..0873cfd3a88 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/IconCacheBaseVmModelMock.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/IconCacheBaseVmModelMock.java
@@ -19,7 +19,7 @@ public IconCacheBaseVmModelMock put(Guid iconId, String iconData) {
     @Override
     public void getOrFetchIcons(List<Guid> iconIds, IconsCallback callback) {
         Map<Guid, String> result = new HashMap<>();
-        for(Guid id : iconIds) {
+        for (Guid id : iconIds) {
             final String icon = map.get(id);
             if (icon == null) {
                 throw new RuntimeException("Icon not found, id=" + id.toString()); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModelTest.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModelTest.java
index 8d0b1fe724f..16a5c4a3d41 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModelTest.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmSnapshotListModelTest.java
@@ -18,7 +18,7 @@ public class VmSnapshotListModelTest extends BaseVmListModelTest {
     UnitVmModel model;
 
     @BeforeEach
-    public void setUp()  {
+    public void setUp() {
         setUpUnitVmModelExpectations(model);
     }
 
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/KeyValueFormatValidationTest.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/KeyValueFormatValidationTest.java
index 5673ea53c43..ccc0f911688 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/KeyValueFormatValidationTest.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/KeyValueFormatValidationTest.java
@@ -27,9 +27,9 @@ public class KeyValueFormatValidationTest {
     private UIMessages mockUiMessages;
 
     private static final String NOT_VALID = "a"; //$NON-NLS-1$
-    private static final String ERROR_MESSAGE_EMPTY_NOT_ALLOWED = "ERROR_MESSAGE_EMPTY_NOT_ALLOWED";//$NON-NLS-1$
-    private static final String ERROR_MESSAGE_EMPTY_ALLOWED = "ERROR_MESSAGE_EMPTY_ALLOWED";//$NON-NLS-1$
-    private static final String FORMAT = "FORMAT";//$NON-NLS-1$
+    private static final String ERROR_MESSAGE_EMPTY_NOT_ALLOWED = "ERROR_MESSAGE_EMPTY_NOT_ALLOWED"; //$NON-NLS-1$
+    private static final String ERROR_MESSAGE_EMPTY_ALLOWED = "ERROR_MESSAGE_EMPTY_ALLOWED"; //$NON-NLS-1$
+    private static final String FORMAT = "FORMAT"; //$NON-NLS-1$
     private static final ValidationResult failureValidationResultEmptyNotAllowed = new ValidationResult(false,
             Collections.singletonList(ERROR_MESSAGE_EMPTY_NOT_ALLOWED));
     private static final ValidationResult failureValidationResultEmptyAllowed = new ValidationResult(false,
@@ -55,7 +55,7 @@ public void nullTest() {
 
     @Test
     public void checkEmptyString() {
-        ValidationResult validationResult = underTest.validate("");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate(""); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
@@ -67,64 +67,64 @@ public void checkKeyOnly() {
 
     @Test
     public void checkKeyValuePairBadSeparator() {
-        ValidationResult validationResult = underTest.validate("a-a");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a-a"); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
     @Test
     public void checkKeyValuePairExtraEqualSign() {
-        ValidationResult validationResult = underTest.validate("a=a=");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a="); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
     @Test
     public void checkKeyValueKey() {
-        ValidationResult validationResult = underTest.validate("a=a=a");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a=a"); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
     @Test
     public void checkValidKeyValuePair() {
-        ValidationResult validationResult = underTest.validate("a=a");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a"); //$NON-NLS-1$
         assertEquals(successfulValidationResult, validationResult);
     }
 
     @Test
     public void checkValidKeyValueTwoPairs() {
-        ValidationResult validationResult = underTest.validate("a=a a=a");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a a=a"); //$NON-NLS-1$
         assertEquals(successfulValidationResult, validationResult);
     }
 
     @Test
     public void checkKeyValueTwoPairsFollowingWithKey() {
-        ValidationResult validationResult = underTest.validate("a=a a=a a");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a a=a a"); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
     @Test
     public void checkKeyValueTwoPairsFollowingWithMissingValue() {
-        ValidationResult validationResult = underTest.validate("a=a a=a a=");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate("a=a a=a a="); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 
     @Test
     public void checkEmptyStringAllowed() {
         underTest = new KeyValueFormatValidation(mockConstantsManager, true);
-        ValidationResult validationResult = underTest.validate("");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate(""); //$NON-NLS-1$
         assertEquals(successfulValidationResult, validationResult);
     }
 
     @Test
     public void checkNotValidEmptyStringAllowed() {
         underTest = new KeyValueFormatValidation(mockConstantsManager, true);
-        ValidationResult validationResult = underTest.validate(NOT_VALID);//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate(NOT_VALID); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyAllowed, validationResult);
     }
 
     @Test
     public void checkEmptyStringNotAllowedFromConstructor() {
         underTest = new KeyValueFormatValidation(mockConstantsManager, false);
-        ValidationResult validationResult = underTest.validate("");//$NON-NLS-1$
+        ValidationResult validationResult = underTest.validate(""); //$NON-NLS-1$
         assertEquals(failureValidationResultEmptyNotAllowed, validationResult);
     }
 }
diff --git a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidationTest.java b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidationTest.java
index c19b745c889..1477afef8e9 100644
--- a/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidationTest.java
+++ b/frontend/webadmin/modules/uicommonweb/src/test/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidationTest.java
@@ -28,7 +28,7 @@ private SubnetMaskValidation createUnderTest(boolean isPrefixAllowed) {
     @MethodSource
     public void checkValidMask(String mask, boolean isMaskValid, boolean isPrefixAllowed) {
         SubnetMaskValidation underTest = createUnderTest(isPrefixAllowed);
-        assertEquals(isMaskValid, underTest.validate(mask).getSuccess(), "Failed to validate mask: " + mask);//$NON-NLS-1$
+        assertEquals(isMaskValid, underTest.validate(mask).getSuccess(), "Failed to validate mask: " + mask); //$NON-NLS-1$
     }
 
     @Test
diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Event.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Event.java
index 447258628d7..87c75a37a6b 100644
--- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Event.java
+++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Event.java
@@ -138,7 +138,7 @@ public boolean equals(Object obj) {
     }
 
     public boolean matchesDefinition(EventDefinition other) {
-        if(other == null){
+        if (other == null) {
             return false;
         }
         return getName().equals(other.getName())
diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/IEnlistmentNotification.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/IEnlistmentNotification.java
index ce248d32ca8..d3e2f0ad65c 100644
--- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/IEnlistmentNotification.java
+++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/IEnlistmentNotification.java
@@ -4,7 +4,7 @@ public abstract class IEnlistmentNotification {
 
     private final String correlationId;
 
-    public IEnlistmentNotification(String correlationId){
+    public IEnlistmentNotification(String correlationId) {
         this.correlationId = correlationId;
     }
 
diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/MigrationPoliciesTranslator.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/MigrationPoliciesTranslator.java
index 7dd6deae995..2d0eb887564 100644
--- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/MigrationPoliciesTranslator.java
+++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/MigrationPoliciesTranslator.java
@@ -4,7 +4,7 @@
 
 import org.ovirt.engine.core.common.migration.MigrationPolicy;
 
-public class MigrationPoliciesTranslator  {
+public class MigrationPoliciesTranslator {
 
     private static final MigrationPoliciesTranslator INSTANCE = new MigrationPoliciesTranslator();
 
@@ -38,11 +38,11 @@ public String getDescription(MigrationPolicy policy) {
     }
 
     private String getNameKey(MigrationPolicy policy) {
-        return getKey("name_", policy);//$NON-NLS-1$
+        return getKey("name_", policy); //$NON-NLS-1$
     }
 
     private String getDescriptionKey(MigrationPolicy policy) {
-        return getKey("description_", policy);//$NON-NLS-1$
+        return getKey("description_", policy); //$NON-NLS-1$
     }
 
     private String getKey(String prefix, MigrationPolicy policy) {
diff --git a/frontend/webadmin/modules/uicompat/src/test/java/org/ovirt/engine/ui/uicompat/GwtMessagesValidator.java b/frontend/webadmin/modules/uicompat/src/test/java/org/ovirt/engine/ui/uicompat/GwtMessagesValidator.java
index 4db1952e9f1..c3556ccb687 100644
--- a/frontend/webadmin/modules/uicompat/src/test/java/org/ovirt/engine/ui/uicompat/GwtMessagesValidator.java
+++ b/frontend/webadmin/modules/uicompat/src/test/java/org/ovirt/engine/ui/uicompat/GwtMessagesValidator.java
@@ -100,7 +100,7 @@ private static Properties loadDefaultProperties(Class<? extends Messages> leafCl
 
                 for (Class<?> up : c.getInterfaces()) {
                     if (Messages.class.isAssignableFrom(up) && Messages.class != up) {
-                        round2.add((Class<? extends Messages>)up);
+                        round2.add((Class<? extends Messages>) up);
                     }
                 }
             }
@@ -111,7 +111,7 @@ private static Properties loadDefaultProperties(Class<? extends Messages> leafCl
 
         // load the properties into the hierarchy from the root down
         for (Class<?> theClass : hierarchy) {
-            String classPropertyFileName = theClass.getName().replace(".",  "/") + ".properties";
+            String classPropertyFileName = theClass.getName().replace(".", "/") + ".properties";
 
             URL theResource = theClass.getResource(classPropertyFileName);
             if (theResource == null) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java
index 77dee959679..bf2bef83b30 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/PresenterModule.java
@@ -846,17 +846,17 @@ protected void configure() {
                 RecoveryStoragePopupPresenterWidget.ViewDef.class,
                 RecoveryStorageConfirmationPopupView.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<StoragePool, DataCenterListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<DataCenterListModel>>(){},
-                new TypeLiteral<SearchPanelView<DataCenterListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<StoragePool, DataCenterListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<DataCenterListModel>>() { },
+                new TypeLiteral<SearchPanelView<DataCenterListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<StoragePool, DataCenterListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<StoragePool>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<StoragePool, DataCenterListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, StoragePool>>(){},
-            new TypeLiteral<ActionPanelView<Void, StoragePool>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, StoragePool>>(){},
-                new TypeLiteral<DetailActionPanelView<Void, StoragePool>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<StoragePool, DataCenterListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<StoragePool>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<StoragePool, DataCenterListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, StoragePool>>() { },
+            new TypeLiteral<ActionPanelView<Void, StoragePool>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, StoragePool>>() { },
+                new TypeLiteral<DetailActionPanelView<Void, StoragePool>>() { });
 
         // Storage
         bindPresenter(StorageSubTabPanelPresenter.class,
@@ -932,19 +932,19 @@ protected void configure() {
                 SubTabStorageDiskProfileView.class,
                 SubTabStorageDiskProfilePresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<StorageDomain, StorageListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<StorageListModel>>(){},
-                new TypeLiteral<SearchPanelView<StorageListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<StorageDomain, StorageListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<StorageListModel>>() { },
+                new TypeLiteral<SearchPanelView<StorageListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<StorageDomain, StorageListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<StorageDomain>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<StorageDomain, StorageListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, StorageDomain>>(){},
-                new TypeLiteral<ActionPanelView<Void, StorageDomain>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomain>>(){},
-            new TypeLiteral<ActionPanelView<StorageDomain, StorageDomain>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomain>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, StorageDomain>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<StorageDomain, StorageListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<StorageDomain>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<StorageDomain, StorageListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, StorageDomain>>() { },
+                new TypeLiteral<ActionPanelView<Void, StorageDomain>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomain>>() { },
+            new TypeLiteral<ActionPanelView<StorageDomain, StorageDomain>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomain>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, StorageDomain>>() { });
 
         // Cluster
         bindPresenter(ClusterSubTabPanelPresenter.class,
@@ -1005,17 +1005,17 @@ protected void configure() {
                 SubTabClusterEventView.class,
                 SubTabClusterEventPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<Cluster, ClusterListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<ClusterListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelView<ClusterListModel<Void>>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<Cluster, ClusterListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<ClusterListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelView<ClusterListModel<Void>>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Cluster, ClusterListModel<Void>>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Cluster>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<Cluster, ClusterListModel<Void>>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Cluster>>(){},
-            new TypeLiteral<ActionPanelView<Void, Cluster>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, Cluster>>(){},
-                new TypeLiteral<DetailActionPanelView<Void, Cluster>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Cluster, ClusterListModel<Void>>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Cluster>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<Cluster, ClusterListModel<Void>>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Cluster>>() { },
+            new TypeLiteral<ActionPanelView<Void, Cluster>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, Cluster>>() { },
+                new TypeLiteral<DetailActionPanelView<Void, Cluster>>() { });
 
         // Host
         bindPresenter(HostSubTabPanelPresenter.class,
@@ -1067,19 +1067,19 @@ protected void configure() {
                 SubTabHostGlusterStorageDevicesView.class,
                 SubTabHostGlusterStorageDevicesPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<VDS, HostListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<HostListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelView<HostListModel<Void>>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<VDS, HostListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<HostListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelView<HostListModel<Void>>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VDS, HostListModel<Void>>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VDS>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<VDS, HostListModel<Void>>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VDS, HostListModel<Void>>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VDS>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<VDS, HostListModel<Void>>>() { });
         bindPresenter(SubTabHostAffinityLabelPresenter.class,
                 SubTabHostAffinityLabelPresenter.ViewDef.class,
                 SubTabHostAffinityLabelView.class,
                 SubTabHostAffinityLabelPresenter.ProxyDef.class);
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VDS>>(){},
-            new TypeLiteral<ActionPanelView<Void, VDS>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VDS>>() { },
+            new TypeLiteral<ActionPanelView<Void, VDS>>() { });
 
         // VirtualMachine
         bindPresenter(VirtualMachineSubTabPanelPresenter.class,
@@ -1139,19 +1139,19 @@ protected void configure() {
                 SubTabVirtualMachineErrataView.class,
                 SubTabVirtualMachineErrataPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<VM, VmListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VmListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelView<VmListModel<Void>>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<VM, VmListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VmListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelView<VmListModel<Void>>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VM, VmListModel<Void>>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VM>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<VM, VmListModel<Void>>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VM, VmListModel<Void>>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VM>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<VM, VmListModel<Void>>>() { });
         bindPresenter(SubTabVirtualMachineAffinityLabelPresenter.class,
                 SubTabVirtualMachineAffinityLabelPresenter.ViewDef.class,
                 SubTabVirtualMachineAffinityLabelView.class,
                 SubTabVirtualMachineAffinityLabelPresenter.ProxyDef.class);
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VM>>(){},
-            new TypeLiteral<ActionPanelView<Void, VM>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VM>>() { },
+            new TypeLiteral<ActionPanelView<Void, VM>>() { });
 
         // Pool
         bindPresenter(PoolSubTabPanelPresenter.class,
@@ -1177,15 +1177,15 @@ protected void configure() {
                 PoolEditPopupPresenterWidget.ViewDef.class,
                 PoolEditPopupView.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<VmPool, PoolListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<PoolListModel>>(){},
-                new TypeLiteral<SearchPanelView<PoolListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<VmPool, PoolListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<PoolListModel>>() { },
+                new TypeLiteral<SearchPanelView<PoolListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VmPool, PoolListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VmPool>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<VmPool, PoolListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VmPool>>(){},
-            new TypeLiteral<ActionPanelView<Void, VmPool>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<VmPool, PoolListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<VmPool>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<VmPool, PoolListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VmPool>>() { },
+            new TypeLiteral<ActionPanelView<Void, VmPool>>() { });
 
         // Template
         bindPresenter(TemplateSubTabPanelPresenter.class,
@@ -1221,16 +1221,16 @@ protected void configure() {
                 SubTabTemplateEventView.class,
                 SubTabTemplateEventPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<VmTemplate, TemplateListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<TemplateListModel>>(){},
-                new TypeLiteral<SearchPanelView<TemplateListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<VmTemplate, TemplateListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<TemplateListModel>>() { },
+                new TypeLiteral<SearchPanelView<TemplateListModel>>() { });
         bindPresenterWidget(TemplateBreadCrumbsPresenterWidget.class,
                 TemplateBreadCrumbsPresenterWidget.TemplateBreadCrumbsViewDef.class,
                 TemplateBreadCrumbsView.class);
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VmTemplate>>(){},
-            new TypeLiteral<ActionPanelView<Void, VmTemplate>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, VmTemplate>>(){},
-                new TypeLiteral<DetailActionPanelView<Void, VmTemplate>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, VmTemplate>>() { },
+            new TypeLiteral<ActionPanelView<Void, VmTemplate>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, VmTemplate>>() { },
+                new TypeLiteral<DetailActionPanelView<Void, VmTemplate>>() { });
 
         // User
         bindPresenter(UserSubTabPanelPresenter.class,
@@ -1268,17 +1268,17 @@ protected void configure() {
         bindPresenterWidget(UserRolesPopupPresenterWidget.class, UserRolesPopupPresenterWidget.ViewDef.class,
                 UserRolesPopupView.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<DbUser, UserListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<UserListModel>>(){},
-                new TypeLiteral<SearchPanelView<UserListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<DbUser, UserListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<UserListModel>>() { },
+                new TypeLiteral<SearchPanelView<UserListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<DbUser, UserListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<DbUser>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<DbUser, UserListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, DbUser>>(){},
-            new TypeLiteral<ActionPanelView<Void, DbUser>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, UserProfileProperty>>(){},
-                new TypeLiteral<DetailActionPanelView<DbUser, UserProfileProperty>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<DbUser, UserListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<DbUser>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<DbUser, UserListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, DbUser>>() { },
+            new TypeLiteral<ActionPanelView<Void, DbUser>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, UserProfileProperty>>() { },
+                new TypeLiteral<DetailActionPanelView<DbUser, UserProfileProperty>>() { });
 
         // Quota
         bindPresenter(QuotaSubTabPanelPresenter.class,
@@ -1314,14 +1314,14 @@ protected void configure() {
                 SubTabQuotaEventView.class,
                 SubTabQuotaEventPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<Quota, QuotaListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<QuotaListModel>>(){},
-                new TypeLiteral<SearchPanelView<QuotaListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<Quota, QuotaListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<QuotaListModel>>() { },
+                new TypeLiteral<SearchPanelView<QuotaListModel>>() { });
         bindPresenterWidget(QuotaBreadCrumbsPresenterWidget.class,
                 QuotaBreadCrumbsPresenterWidget.QuotaBreadCrumbsViewDef.class,
                 QuotaBreadCrumbsView.class);
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Quota>>(){},
-            new TypeLiteral<ActionPanelView<Void, Quota>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Quota>>() { },
+            new TypeLiteral<ActionPanelView<Void, Quota>>() { });
 
         // Disk
         bindPresenter(DiskSubTabPanelPresenter.class,
@@ -1349,15 +1349,15 @@ protected void configure() {
                 SubTabDiskPermissionView.class,
                 SubTabDiskPermissionPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<Disk, DiskListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<DiskListModel>>(){},
-                new TypeLiteral<SearchPanelView<DiskListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<Disk, DiskListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<DiskListModel>>() { },
+                new TypeLiteral<SearchPanelView<DiskListModel>>() { });
         bindPresenterWidget(DisksBreadCrumbsPresenterWidget.class,
                 DisksBreadCrumbsPresenterWidget.DiskBreadCrumbsViewDef.class,
                 DisksBreadCrumbsView.class);
 
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Disk>>(){},
-            new TypeLiteral<ActionPanelView<Void, Disk>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Disk>>() { },
+            new TypeLiteral<ActionPanelView<Void, Disk>>() { });
 
         // Network
         bindPresenter(NetworkSubTabPanelPresenter.class,
@@ -1397,14 +1397,14 @@ protected void configure() {
                 SubTabNetworkPermissionView.class,
                 SubTabNetworkPermissionPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<NetworkView, NetworkListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<NetworkListModel>>(){},
-                new TypeLiteral<SearchPanelView<NetworkListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<NetworkView, NetworkListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<NetworkListModel>>() { },
+                new TypeLiteral<SearchPanelView<NetworkListModel>>() { });
         bindPresenterWidget(NetworkBreadCrumbsPresenterWidget.class,
                 NetworkBreadCrumbsPresenterWidget.NetworkBreadCrumbsViewDef.class,
                 NetworkBreadCrumbsView.class);
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<NetworkView, NetworkView>>(){},
-            new TypeLiteral<ActionPanelView<NetworkView, NetworkView>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<NetworkView, NetworkView>>() { },
+            new TypeLiteral<ActionPanelView<NetworkView, NetworkView>>() { });
 
         // Provider
         bindPresenter(ProviderSubTabPanelPresenter.class,
@@ -1424,15 +1424,15 @@ protected void configure() {
                 SubTabProviderSecretView.class,
                 SubTabProviderSecretPresenter.ProxyDef.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<Provider, ProviderListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<ProviderListModel>>(){},
-                new TypeLiteral<SearchPanelView<ProviderListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<Provider, ProviderListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<ProviderListModel>>() { },
+                new TypeLiteral<SearchPanelView<ProviderListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Provider, ProviderListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Provider>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<Provider, ProviderListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Provider>>(){},
-            new TypeLiteral<ActionPanelView<Void, Provider>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Provider, ProviderListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Provider>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<Provider, ProviderListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Provider>>() { },
+            new TypeLiteral<ActionPanelView<Void, Provider>>() { });
 
         // Errata
         bindPresenter(ErrataSubTabPanelPresenter.class,
@@ -1444,9 +1444,9 @@ protected void configure() {
                 SubTabEngineErrataDetailsView.class,
                 SubTabEngineErrataDetailsPresenter.ProxyDef.class);
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Erratum, EngineErrataListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Erratum>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<Erratum, EngineErrataListModel>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<Erratum, EngineErrataListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<Erratum>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<Erratum, EngineErrataListModel>>() { });
 
         // Profile
         bindPresenter(VnicProfileSubTabPanelPresenter.class,
@@ -1469,39 +1469,39 @@ protected void configure() {
                 VnicProfileBreadCrumbsPresenterWidget.VnicProfileBreadCrumbsViewDef.class,
                 VnicProfileBreadCrumbsView.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<VnicProfileView, VnicProfileListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VnicProfileListModel>>(){},
-                new TypeLiteral<SearchPanelView<VnicProfileListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VnicProfileView, VnicProfileView>>(){},
-            new TypeLiteral<ActionPanelView<VnicProfileView, VnicProfileView>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<VnicProfileView, VnicProfileListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VnicProfileListModel>>() { },
+                new TypeLiteral<SearchPanelView<VnicProfileListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VnicProfileView, VnicProfileView>>() { },
+            new TypeLiteral<ActionPanelView<VnicProfileView, VnicProfileView>>() { });
 
         // User Sessions
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<UserSession, SessionListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<SessionListModel>>(){},
-                new TypeLiteral<SearchPanelView<SessionListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<UserSession, SessionListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<SessionListModel>>() { },
+                new TypeLiteral<SearchPanelView<SessionListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<UserSession, SessionListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<UserSession>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<UserSession, SessionListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<UserSession, UserSession>>(){},
-            new TypeLiteral<ActionPanelView<UserSession, UserSession>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<UserSession, SessionListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<UserSession>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<UserSession, SessionListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<UserSession, UserSession>>() { },
+            new TypeLiteral<ActionPanelView<UserSession, UserSession>>() { });
 
         // Volume
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<GlusterVolumeEntity, VolumeListModel>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VolumeListModel>>(){},
-                new TypeLiteral<SearchPanelView<VolumeListModel>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<GlusterVolumeEntity, VolumeListModel>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<VolumeListModel>>() { },
+                new TypeLiteral<SearchPanelView<VolumeListModel>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<GlusterVolumeEntity, VolumeListModel>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<GlusterVolumeEntity>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<GlusterVolumeEntity, VolumeListModel>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, GlusterVolumeEntity>>(){},
-            new TypeLiteral<ActionPanelView<Void, GlusterVolumeEntity>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<GlusterVolumeEntity, VolumeListModel>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<GlusterVolumeEntity>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<GlusterVolumeEntity, VolumeListModel>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, GlusterVolumeEntity>>() { },
+            new TypeLiteral<ActionPanelView<Void, GlusterVolumeEntity>>() { });
 
         // Events
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, AuditLog>>(){},
-                new TypeLiteral<ActionPanelView<Void, AuditLog>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, AuditLog>>() { },
+                new TypeLiteral<ActionPanelView<Void, AuditLog>>() { });
 
         // Main section: popups
 
@@ -1987,13 +1987,13 @@ protected void configure() {
                 EventPopupPresenterWidget.ViewDef.class,
                 EventPopupView.class);
         bindSingletonPresenterWidget(
-                new TypeLiteral<SearchPanelPresenterWidget<AuditLog, EventListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<EventListModel<Void>>>(){},
-                new TypeLiteral<SearchPanelView<EventListModel<Void>>>(){});
+                new TypeLiteral<SearchPanelPresenterWidget<AuditLog, EventListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelPresenterWidget.ViewDef<EventListModel<Void>>>() { },
+                new TypeLiteral<SearchPanelView<EventListModel<Void>>>() { });
         bindPresenterWidget(
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<AuditLog, EventListModel<Void>>>(){},
-                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<AuditLog>>(){},
-                new TypeLiteral<OvirtBreadCrumbsView<AuditLog, EventListModel<Void>>>(){});
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget<AuditLog, EventListModel<Void>>>() { },
+                new TypeLiteral<OvirtBreadCrumbsPresenterWidget.ViewDef<AuditLog>>() { },
+                new TypeLiteral<OvirtBreadCrumbsView<AuditLog, EventListModel<Void>>>() { });
 
         // Provider
         bindPresenterWidget(ProviderPopupPresenterWidget.class,
@@ -2058,187 +2058,187 @@ protected void configure() {
                 TagsView.class);
 
         // Popup/detail Action panels
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Role, Permission>>(){},
-            new TypeLiteral<ActionPanelView<Role, Permission>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Permission>>(){},
-                new TypeLiteral<ActionPanelView<Void, Permission>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, MacPool>>(){},
-            new TypeLiteral<ActionPanelView<Void, MacPool>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Role>>(){},
-            new TypeLiteral<ActionPanelView<Void, Role>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Object, ClusterPolicy>>(){},
-            new TypeLiteral<ActionPanelView<Object, ClusterPolicy>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, InstanceType>>(){},
-            new TypeLiteral<ActionPanelView<Void, InstanceType>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, CpuQos>>(){},
-            new TypeLiteral<ActionPanelView<StoragePool, CpuQos>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, NetworkQoS>>(){},
-            new TypeLiteral<ActionPanelView<StoragePool, NetworkQoS>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, HostNetworkQos>>(){},
-            new TypeLiteral<ActionPanelView<StoragePool, HostNetworkQos>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, DiskProfile>>(){},
-            new TypeLiteral<ActionPanelView<?, DiskProfile>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, CpuProfile>>(){},
-            new TypeLiteral<ActionPanelView<?, CpuProfile>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VmTemplate, VmNetworkInterface>>(){},
-            new TypeLiteral<ActionPanelView<VmTemplate, VmNetworkInterface>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VM, VmNetworkInterface>>(){},
-                new TypeLiteral<ActionPanelView<VM, VmNetworkInterface>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, Snapshot>>(){},
-            new TypeLiteral<ActionPanelView<?, Snapshot>>(){});
-        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, HostDeviceView>>(){},
-            new TypeLiteral<ActionPanelView<?, HostDeviceView>>(){});
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Role, Permission>>() { },
+            new TypeLiteral<ActionPanelView<Role, Permission>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Permission>>() { },
+                new TypeLiteral<ActionPanelView<Void, Permission>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, MacPool>>() { },
+            new TypeLiteral<ActionPanelView<Void, MacPool>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, Role>>() { },
+            new TypeLiteral<ActionPanelView<Void, Role>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Object, ClusterPolicy>>() { },
+            new TypeLiteral<ActionPanelView<Object, ClusterPolicy>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<Void, InstanceType>>() { },
+            new TypeLiteral<ActionPanelView<Void, InstanceType>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, CpuQos>>() { },
+            new TypeLiteral<ActionPanelView<StoragePool, CpuQos>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, NetworkQoS>>() { },
+            new TypeLiteral<ActionPanelView<StoragePool, NetworkQoS>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<StoragePool, HostNetworkQos>>() { },
+            new TypeLiteral<ActionPanelView<StoragePool, HostNetworkQos>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, DiskProfile>>() { },
+            new TypeLiteral<ActionPanelView<?, DiskProfile>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, CpuProfile>>() { },
+            new TypeLiteral<ActionPanelView<?, CpuProfile>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VmTemplate, VmNetworkInterface>>() { },
+            new TypeLiteral<ActionPanelView<VmTemplate, VmNetworkInterface>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<VM, VmNetworkInterface>>() { },
+                new TypeLiteral<ActionPanelView<VM, VmNetworkInterface>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, Snapshot>>() { },
+            new TypeLiteral<ActionPanelView<?, Snapshot>>() { });
+        bindActionPanel(new TypeLiteral<ActionPanelPresenterWidget.ViewDef<?, HostDeviceView>>() { },
+            new TypeLiteral<ActionPanelView<?, HostDeviceView>>() { });
 
         // Label action panels
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, Label>>(){},
-            new TypeLiteral<DetailActionPanelView<VDS, Label>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Label>>(){},
-                new TypeLiteral<DetailActionPanelView<Cluster, Label>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Label>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, Label>>(){});
-
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, GlusterHookEntity>>(){},
-            new TypeLiteral<DetailActionPanelView<Cluster, GlusterHookEntity>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Network>>(){},
-            new TypeLiteral<DetailActionPanelView<Cluster, Network>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Network>>(){},
-                new TypeLiteral<DetailActionPanelView<StoragePool, Network>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, IscsiBond>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, IscsiBond>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterBrickEntity>>(){},
-            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterBrickEntity>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterVolumeOptionEntity>>(){},
-            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterVolumeOptionEntity>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, StorageDevice>>(){},
-            new TypeLiteral<DetailActionPanelView<VDS, StorageDevice>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterVolumeSnapshotEntity>>(){},
-            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterVolumeSnapshotEntity>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, GlusterServerService>>(){},
-            new TypeLiteral<DetailActionPanelView<VDS, GlusterServerService>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, NetworkCluster>>(){},
-            new TypeLiteral<DetailActionPanelView<?, NetworkCluster>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, ExternalSubnet>>(){},
-            new TypeLiteral<DetailActionPanelView<NetworkView, ExternalSubnet>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Provider, LibvirtSecret>>(){},
-            new TypeLiteral<DetailActionPanelView<Provider, LibvirtSecret>>(){});
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, Label>>() { },
+            new TypeLiteral<DetailActionPanelView<VDS, Label>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Label>>() { },
+                new TypeLiteral<DetailActionPanelView<Cluster, Label>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Label>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, Label>>() { });
+
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, GlusterHookEntity>>() { },
+            new TypeLiteral<DetailActionPanelView<Cluster, GlusterHookEntity>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Network>>() { },
+            new TypeLiteral<DetailActionPanelView<Cluster, Network>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Network>>() { },
+                new TypeLiteral<DetailActionPanelView<StoragePool, Network>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, IscsiBond>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, IscsiBond>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterBrickEntity>>() { },
+            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterBrickEntity>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterVolumeOptionEntity>>() { },
+            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterVolumeOptionEntity>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, StorageDevice>>() { },
+            new TypeLiteral<DetailActionPanelView<VDS, StorageDevice>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterVolumeSnapshotEntity>>() { },
+            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterVolumeSnapshotEntity>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, GlusterServerService>>() { },
+            new TypeLiteral<DetailActionPanelView<VDS, GlusterServerService>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, NetworkCluster>>() { },
+            new TypeLiteral<DetailActionPanelView<?, NetworkCluster>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, ExternalSubnet>>() { },
+            new TypeLiteral<DetailActionPanelView<NetworkView, ExternalSubnet>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Provider, LibvirtSecret>>() { },
+            new TypeLiteral<DetailActionPanelView<Provider, LibvirtSecret>>() { });
 
         // Permission action panels
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<Void, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Quota, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<Quota, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Role, Permission>>(){},
-            new TypeLiteral<DetailActionPanelView<Role, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<DbUser, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DiskProfile, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<DiskProfile, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<StoragePool, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<Cluster, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Disk, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<Disk, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<VDS, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmPool, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<VmPool, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VnicProfileView, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<VnicProfileView, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<NetworkView, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<VmTemplate, Permission>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, Permission>>(){},
-                new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, Permission>>(){});
-
-
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterGeoRepSession>>(){},
-            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterGeoRepSession>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<Cluster, NetworkCluster>>>(){},
-            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<Cluster, NetworkCluster>>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VdsNetworkInterface, VDS>>>(){},
-            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VdsNetworkInterface, VDS>>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VmNetworkInterface, VM>>>(){},
-            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VmNetworkInterface, VM>>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VmNetworkInterface, VmTemplate>>>(){},
-            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VmNetworkInterface, VmTemplate>>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageDomainDR>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, StorageDomainDR>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomainDR>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, StorageDomainDR>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, RepoImage>>(){},
-            new TypeLiteral<DetailActionPanelView<StorageDomain, RepoImage>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, DiskModel>>(){},
-            new TypeLiteral<DetailActionPanelView<VmTemplate, DiskModel>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, EventSubscriber>>(){},
-            new TypeLiteral<DetailActionPanelView<DbUser, EventSubscriber>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, AffinityGroup>>(){},
-            new TypeLiteral<DetailActionPanelView<Cluster, AffinityGroup>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, AffinityGroup>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, AffinityGroup>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, MacPool>>(){},
-            new TypeLiteral<DetailActionPanelView<?, MacPool>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, Role>>(){},
-            new TypeLiteral<DetailActionPanelView<?, Role>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, ClusterPolicy>>(){},
-            new TypeLiteral<DetailActionPanelView<?, ClusterPolicy>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, InstanceType>>(){},
-            new TypeLiteral<DetailActionPanelView<Void, InstanceType>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, CpuQos>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, CpuQos>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, NetworkQoS>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, NetworkQoS>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, HostNetworkQos>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, HostNetworkQos>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, DiskProfile>>(){},
-            new TypeLiteral<DetailActionPanelView<StorageDomain, DiskProfile>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, CpuProfile>>(){},
-            new TypeLiteral<DetailActionPanelView<Cluster, CpuProfile>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, VmNetworkInterface>>(){},
-            new TypeLiteral<DetailActionPanelView<VmTemplate, VmNetworkInterface>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, VmNetworkInterface>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, VmNetworkInterface>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Snapshot>>(){},
-            new TypeLiteral<DetailActionPanelView<VM, Snapshot>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, HostDeviceView>>(){},
-            new TypeLiteral<DetailActionPanelView<VM, HostDeviceView>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, VmDeviceFeEntity>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, VmDeviceFeEntity>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, HostInterfaceLineModel>>(){},
-            new TypeLiteral<DetailActionPanelView<VDS, HostInterfaceLineModel>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, HostDeviceView>>(){},
-                new TypeLiteral<DetailActionPanelView<VDS, HostDeviceView>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageQos>>(){},
-            new TypeLiteral<DetailActionPanelView<StoragePool, StorageQos>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, VDS>>(){},
-                new TypeLiteral<DetailActionPanelView<Cluster, VDS>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Quota>>(){},
-                new TypeLiteral<DetailActionPanelView<StoragePool, Quota>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, VM>>(){},
-                new TypeLiteral<DetailActionPanelView<VDS, VM>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmPool, VM>>(){},
-                new TypeLiteral<DetailActionPanelView<VmPool, VM>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, VM>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, VM>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, VnicProfileView>>(){},
-                new TypeLiteral<DetailActionPanelView<NetworkView, VnicProfileView>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Provider, NetworkView>>(){},
-                new TypeLiteral<DetailActionPanelView<Provider, NetworkView>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, Disk>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, Disk>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Disk>>(){},
-                new TypeLiteral<DetailActionPanelView<VM, Disk>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, VmTemplate>>(){},
-                new TypeLiteral<DetailActionPanelView<StorageDomain, VmTemplate>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, StorageDomain>>(){},
-                new TypeLiteral<DetailActionPanelView<VmTemplate, StorageDomain>>(){});
-        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageDomain>>(){},
-                new TypeLiteral<DetailActionPanelView<StoragePool, StorageDomain>>(){});
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<Void, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Quota, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<Quota, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Role, Permission>>() { },
+            new TypeLiteral<DetailActionPanelView<Role, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<DbUser, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DiskProfile, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<DiskProfile, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<StoragePool, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<Cluster, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Disk, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<Disk, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<VDS, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmPool, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<VmPool, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VnicProfileView, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<VnicProfileView, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<NetworkView, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<VmTemplate, Permission>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, Permission>>() { },
+                new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, Permission>>() { });
+
+
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<GlusterVolumeEntity, GlusterGeoRepSession>>() { },
+            new TypeLiteral<DetailActionPanelView<GlusterVolumeEntity, GlusterGeoRepSession>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<Cluster, NetworkCluster>>>() { },
+            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<Cluster, NetworkCluster>>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VdsNetworkInterface, VDS>>>() { },
+            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VdsNetworkInterface, VDS>>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VmNetworkInterface, VM>>>() { },
+            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VmNetworkInterface, VM>>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, PairQueryable<VmNetworkInterface, VmTemplate>>>() { },
+            new TypeLiteral<DetailActionPanelView<NetworkView, PairQueryable<VmNetworkInterface, VmTemplate>>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageDomainDR>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, StorageDomainDR>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, StorageDomainDR>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, StorageDomainDR>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, RepoImage>>() { },
+            new TypeLiteral<DetailActionPanelView<StorageDomain, RepoImage>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, DiskModel>>() { },
+            new TypeLiteral<DetailActionPanelView<VmTemplate, DiskModel>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<DbUser, EventSubscriber>>() { },
+            new TypeLiteral<DetailActionPanelView<DbUser, EventSubscriber>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, AffinityGroup>>() { },
+            new TypeLiteral<DetailActionPanelView<Cluster, AffinityGroup>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, AffinityGroup>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, AffinityGroup>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, MacPool>>() { },
+            new TypeLiteral<DetailActionPanelView<?, MacPool>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, Role>>() { },
+            new TypeLiteral<DetailActionPanelView<?, Role>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<?, ClusterPolicy>>() { },
+            new TypeLiteral<DetailActionPanelView<?, ClusterPolicy>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Void, InstanceType>>() { },
+            new TypeLiteral<DetailActionPanelView<Void, InstanceType>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, CpuQos>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, CpuQos>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, NetworkQoS>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, NetworkQoS>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, HostNetworkQos>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, HostNetworkQos>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, DiskProfile>>() { },
+            new TypeLiteral<DetailActionPanelView<StorageDomain, DiskProfile>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, CpuProfile>>() { },
+            new TypeLiteral<DetailActionPanelView<Cluster, CpuProfile>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, VmNetworkInterface>>() { },
+            new TypeLiteral<DetailActionPanelView<VmTemplate, VmNetworkInterface>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, VmNetworkInterface>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, VmNetworkInterface>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Snapshot>>() { },
+            new TypeLiteral<DetailActionPanelView<VM, Snapshot>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, HostDeviceView>>() { },
+            new TypeLiteral<DetailActionPanelView<VM, HostDeviceView>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, VmDeviceFeEntity>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, VmDeviceFeEntity>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, HostInterfaceLineModel>>() { },
+            new TypeLiteral<DetailActionPanelView<VDS, HostInterfaceLineModel>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, HostDeviceView>>() { },
+                new TypeLiteral<DetailActionPanelView<VDS, HostDeviceView>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageQos>>() { },
+            new TypeLiteral<DetailActionPanelView<StoragePool, StorageQos>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Cluster, VDS>>() { },
+                new TypeLiteral<DetailActionPanelView<Cluster, VDS>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, Quota>>() { },
+                new TypeLiteral<DetailActionPanelView<StoragePool, Quota>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VDS, VM>>() { },
+                new TypeLiteral<DetailActionPanelView<VDS, VM>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmPool, VM>>() { },
+                new TypeLiteral<DetailActionPanelView<VmPool, VM>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, VM>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, VM>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<NetworkView, VnicProfileView>>() { },
+                new TypeLiteral<DetailActionPanelView<NetworkView, VnicProfileView>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<Provider, NetworkView>>() { },
+                new TypeLiteral<DetailActionPanelView<Provider, NetworkView>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, Disk>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, Disk>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VM, Disk>>() { },
+                new TypeLiteral<DetailActionPanelView<VM, Disk>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StorageDomain, VmTemplate>>() { },
+                new TypeLiteral<DetailActionPanelView<StorageDomain, VmTemplate>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<VmTemplate, StorageDomain>>() { },
+                new TypeLiteral<DetailActionPanelView<VmTemplate, StorageDomain>>() { });
+        bindActionPanel(new TypeLiteral<DetailActionPanelPresenterWidget.ViewDef<StoragePool, StorageDomain>>() { },
+                new TypeLiteral<DetailActionPanelView<StoragePool, StorageDomain>>() { });
     }
 
     <P extends PresenterWidget<?>, V extends View> void bindSingletonPresenterWidget(
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UiCommonModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UiCommonModule.java
index a5dde208ea2..fccd27be47a 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UiCommonModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/UiCommonModule.java
@@ -113,7 +113,7 @@ void bindModels() {
         bind(ClusterPolicyClusterModelProvider.class).in(Singleton.class);
 
         bind(InstanceTypeModelProvider.class).in(Singleton.class);
-        bind(new TypeLiteral<DetailTabModelProvider<InstanceTypeListModel, InstanceTypeGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailTabModelProvider<InstanceTypeListModel, InstanceTypeGeneralModel>>() { }).in(Singleton.class);
 
         // disk profiles permissions
         bind(DiskProfilePermissionModelProvider.class).in(Singleton.class);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
index 3972f3c3bd0..fe135a0069b 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ClusterModule.java
@@ -362,7 +362,7 @@ public SearchableDetailModelProvider<AuditLog, ClusterListModel<Void>, ClusterEv
 
     @Override
     protected void configure() {
-        bind(new TypeLiteral<ClusterListModel<Void>> (){}).in(Singleton.class);
+        bind(new TypeLiteral<ClusterListModel<Void>> () { }).in(Singleton.class);
         bind(ClusterGeneralModel.class).in(Singleton.class);
         bind(ClusterHostListModel.class).in(Singleton.class);
         bind(ClusterNetworkListModel.class).in(Singleton.class);
@@ -371,28 +371,28 @@ protected void configure() {
         bind(ClusterGlusterHookListModel.class).in(Singleton.class);
         bind(ClusterAffinityGroupListModel.class).in(Singleton.class);
         bind(CpuProfileListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<Cluster>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<CpuProfile>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<Cluster>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<CpuProfile>>() { }).in(Singleton.class);
         bind(ClusterAffinityLabelListModel.class).in(Singleton.class);
         bind(ClusterEventListModel.class).in(Singleton.class);
         bind(ClusterMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<ClusterListModel<Void>, ClusterServiceModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<ClusterListModel<Void>, ClusterServiceModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<ClusterListModel<Void>, ClusterServiceModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<ClusterListModel<Void>, ClusterServiceModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<VDS, ClusterListModel<Void>, ClusterHostListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VDS, ClusterListModel<Void>, ClusterHostListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VDS, ClusterListModel<Void>, ClusterHostListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VDS, ClusterListModel<Void>, ClusterHostListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, ClusterListModel<Void>, ClusterVmListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, ClusterListModel<Void>, ClusterVmListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, ClusterListModel<Void>, ClusterVmListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, ClusterListModel<Void>, ClusterVmListModel>>() { })
             .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, ClusterListModel<Void>, PermissionListModel<Cluster>>>(){})
-            .to(new TypeLiteral<PermissionModelProvider<Cluster, ClusterListModel<Void>>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, ClusterListModel<Void>, PermissionListModel<Cluster>>>() { })
+            .to(new TypeLiteral<PermissionModelProvider<Cluster, ClusterListModel<Void>>>() { }).in(Singleton.class);
         // Cpu Profile permission list model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, CpuProfileListModel, PermissionListModel<CpuProfile>>>(){})
-            .to(new TypeLiteral<PermissionModelProvider<CpuProfile, CpuProfileListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, CpuProfileListModel, PermissionListModel<CpuProfile>>>() { })
+            .to(new TypeLiteral<PermissionModelProvider<CpuProfile, CpuProfileListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DataCenterModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DataCenterModule.java
index 94c8fa3e36d..3be8e09a1ea 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DataCenterModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DataCenterModule.java
@@ -480,15 +480,15 @@ protected void configure() {
         bind(DataCenterIscsiBondListModel.class).in(Singleton.class);
         bind(DataCenterStorageQosListModel.class).in(Singleton.class);
         bind(DataCenterCpuQosListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<StoragePool>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<StoragePool>>() { }).in(Singleton.class);
         bind(DataCenterMainSelectedItems.class).asEagerSingleton();
 
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<Cluster, DataCenterListModel, DataCenterClusterListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<Cluster, DataCenterListModel, DataCenterClusterListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<Cluster, DataCenterListModel, DataCenterClusterListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<Cluster, DataCenterListModel, DataCenterClusterListModel>>() { })
             .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DataCenterListModel, PermissionListModel<StoragePool>>>(){})
-            .to(new TypeLiteral<PermissionModelProvider<StoragePool, DataCenterListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DataCenterListModel, PermissionListModel<StoragePool>>>() { })
+            .to(new TypeLiteral<PermissionModelProvider<StoragePool, DataCenterListModel>>() { }).in(Singleton.class);
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DiskModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DiskModule.java
index bce478daae9..92d52e0b6e3 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DiskModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/DiskModule.java
@@ -99,25 +99,25 @@ protected void configure() {
         bind(DiskVmListModel.class).in(Singleton.class);
         bind(DiskTemplateListModel.class).in(Singleton.class);
         bind(DiskStorageListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<Disk>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<Disk>>() { }).in(Singleton.class);
         bind(DiskMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<DiskListModel, DiskGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<DiskListModel, DiskGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<DiskListModel, DiskGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<DiskListModel, DiskGeneralModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, DiskListModel, DiskVmListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, DiskListModel, DiskVmListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, DiskListModel, DiskVmListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, DiskListModel, DiskVmListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, DiskListModel, DiskTemplateListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, DiskListModel, DiskTemplateListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, DiskListModel, DiskTemplateListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, DiskListModel, DiskTemplateListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<StorageDomain, DiskListModel, DiskStorageListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<StorageDomain, DiskListModel, DiskStorageListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<StorageDomain, DiskListModel, DiskStorageListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<StorageDomain, DiskListModel, DiskStorageListModel>>() { })
             .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DiskListModel, PermissionListModel<Disk>>>(){})
-            .to(new TypeLiteral<PermissionModelProvider<Disk, DiskListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DiskListModel, PermissionListModel<Disk>>>() { })
+            .to(new TypeLiteral<PermissionModelProvider<Disk, DiskListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/EventModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/EventModule.java
index 084df600a79..29b4279455f 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/EventModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/EventModule.java
@@ -59,11 +59,11 @@ public EventModelProvider getEventModelProvider(EventBus eventBus,
 
     @Override
     protected void configure() {
-        bind(new TypeLiteral<EventListModel<Void>>(){})
-            .annotatedWith(Names.named("main")).to(new TypeLiteral<EventListModel<Void>>(){}) //$NON-NLS-1$
+        bind(new TypeLiteral<EventListModel<Void>>() { })
+            .annotatedWith(Names.named("main")).to(new TypeLiteral<EventListModel<Void>>() { }) //$NON-NLS-1$
             .in(Singleton.class);
-        bind(new TypeLiteral<EventListModel<Void>>(){})
-            .annotatedWith(Names.named("notification")).to(new TypeLiteral<EventListModel<Void>>(){}) //$NON-NLS-1$
+        bind(new TypeLiteral<EventListModel<Void>>() { })
+            .annotatedWith(Names.named("notification")).to(new TypeLiteral<EventListModel<Void>>() { }) //$NON-NLS-1$
             .in(Singleton.class);
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/HostModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/HostModule.java
index 81ad69d3d24..f601088fc04 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/HostModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/HostModule.java
@@ -396,7 +396,7 @@ public DetailTabModelProvider<HostListModel<Void>, HostErrataCountModel> getHost
 
     @Override
     protected void configure() {
-        bind(new TypeLiteral<HostListModel<Void>>() {}).in(Singleton.class);
+        bind(new TypeLiteral<HostListModel<Void>>() { }).in(Singleton.class);
         bind(HostGeneralModel.class).in(Singleton.class);
         bind(HostHardwareGeneralModel.class).in(Singleton.class);
         bind(HostHooksListModel.class).in(Singleton.class);
@@ -407,7 +407,7 @@ protected void configure() {
         bind(HostGlusterSwiftListModel.class).in(Singleton.class);
         bind(HostEventListModel.class).in(Singleton.class);
         bind(HostDeviceListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<VDS>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<VDS>>() { }).in(Singleton.class);
         bind(FenceAgentModelProvider.class).in(Singleton.class);
         bind(FenceProxyModelProvider.class).in(Singleton.class);
         bind(HostErrataCountModel.class).in(Singleton.class);
@@ -417,24 +417,24 @@ protected void configure() {
 
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<HostListModel<Void>, HostHardwareGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<HostListModel<Void>, HostHardwareGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<HostListModel<Void>, HostHardwareGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<HostListModel<Void>, HostHardwareGeneralModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<Map<String, String>, HostListModel<Void>, HostHooksListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<Map<String, String>, HostListModel<Void>, HostHooksListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<Map<String, String>, HostListModel<Void>, HostHooksListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<Map<String, String>, HostListModel<Void>, HostHooksListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<GlusterBrickEntity, HostListModel<Void>, HostBricksListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<GlusterBrickEntity, HostListModel<Void>, HostBricksListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<GlusterBrickEntity, HostListModel<Void>, HostBricksListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<GlusterBrickEntity, HostListModel<Void>, HostBricksListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<GlusterServerService, HostListModel<Void>, HostGlusterSwiftListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<GlusterServerService, HostListModel<Void>, HostGlusterSwiftListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<GlusterServerService, HostListModel<Void>, HostGlusterSwiftListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<GlusterServerService, HostListModel<Void>, HostGlusterSwiftListModel>>() { })
             .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<HostDeviceView, HostListModel<Void>, HostDeviceListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<HostDeviceView, HostListModel<Void>, HostDeviceListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<HostDeviceView, HostListModel<Void>, HostDeviceListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<HostDeviceView, HostListModel<Void>, HostDeviceListModel>>() { })
             .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, HostListModel<Void>, PermissionListModel<VDS>>>(){})
-            .to(new TypeLiteral<PermissionModelProvider<VDS, HostListModel<Void>>>() {}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, HostListModel<Void>, PermissionListModel<VDS>>>() { })
+            .to(new TypeLiteral<PermissionModelProvider<VDS, HostListModel<Void>>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/MacPoolModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/MacPoolModule.java
index 6c54d71afff..1be0673b440 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/MacPoolModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/MacPoolModule.java
@@ -18,9 +18,9 @@ protected void configure() {
         // SharedMacPoolListModel
         bind(SharedMacPoolModelProvider.class).in(Singleton.class);
 
-        bind(new TypeLiteral<PermissionListModel<MacPool>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<MacPool>>() { }).in(Singleton.class);
 
         // Permission Model
-        bind(new TypeLiteral<PermissionModelProvider<MacPool, SharedMacPoolListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionModelProvider<MacPool, SharedMacPoolListModel>>() { }).in(Singleton.class);
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java
index 03dda4ba3c8..7d51aefdf26 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java
@@ -337,12 +337,12 @@ protected void configure() {
         bind(NetworkHostListModel.class).in(Singleton.class);
         bind(NetworkVmListModel.class).in(Singleton.class);
         bind(NetworkTemplateListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<NetworkView>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<NetworkView>>() { }).in(Singleton.class);
         bind(NetworkMainSelectedItems.class).asEagerSingleton();
 
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, NetworkListModel, PermissionListModel<NetworkView>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<NetworkView, NetworkListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, NetworkListModel, PermissionListModel<NetworkView>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<NetworkView, NetworkListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/PoolModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/PoolModule.java
index 4c5f221ff1b..6649d4a3500 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/PoolModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/PoolModule.java
@@ -112,15 +112,15 @@ protected void configure() {
         bind(PoolListModel.class).in(Singleton.class);
         bind(PoolGeneralModel.class).in(Singleton.class);
         bind(PoolVmListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<VmPool>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<VmPool>>() { }).in(Singleton.class);
         bind(PoolMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<PoolListModel, PoolGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<PoolListModel, PoolGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<PoolListModel, PoolGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<PoolListModel, PoolGeneralModel>>() { }).in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, PoolListModel, PermissionListModel<VmPool>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<VmPool, PoolListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, PoolListModel, PermissionListModel<VmPool>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<VmPool, PoolListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ProviderModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ProviderModule.java
index 68d1dfc3a22..5e26f25b9ef 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ProviderModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/ProviderModule.java
@@ -152,7 +152,7 @@ protected void configure() {
         bind(ProviderMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<ProviderListModel, ProviderGeneralModel>>() {})
+        bind(new TypeLiteral<DetailModelProvider<ProviderListModel, ProviderGeneralModel>>() { })
                 .to(new TypeLiteral<DetailTabModelProvider<ProviderListModel, ProviderGeneralModel>>() {
                 }).in(Singleton.class);
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/QuotaModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/QuotaModule.java
index 286b3050242..3ed7085bdbc 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/QuotaModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/QuotaModule.java
@@ -202,17 +202,17 @@ protected void configure() {
 
         // Search-able Detail Models
         bind(new TypeLiteral<SearchableDetailModelProvider<QuotaCluster, QuotaListModel,
-                QuotaClusterListModel>>(){}).to(new TypeLiteral<SearchableDetailTabModelProvider<QuotaCluster,
-                        QuotaListModel, QuotaClusterListModel>>(){}).in(Singleton.class);
+                QuotaClusterListModel>>() { }).to(new TypeLiteral<SearchableDetailTabModelProvider<QuotaCluster,
+                        QuotaListModel, QuotaClusterListModel>>() { }).in(Singleton.class);
         bind(new TypeLiteral<SearchableDetailModelProvider<QuotaStorage, QuotaListModel,
-                QuotaStorageListModel>>(){}).to(new TypeLiteral<SearchableDetailTabModelProvider<QuotaStorage,
-                        QuotaListModel, QuotaStorageListModel>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, QuotaListModel, QuotaVmListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, QuotaListModel, QuotaVmListModel>>(){})
+                QuotaStorageListModel>>() { }).to(new TypeLiteral<SearchableDetailTabModelProvider<QuotaStorage,
+                        QuotaListModel, QuotaStorageListModel>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, QuotaListModel, QuotaVmListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, QuotaListModel, QuotaVmListModel>>() { })
             .in(Singleton.class);
         bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, QuotaListModel,
-                QuotaTemplateListModel>>(){}).to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate,
-                        QuotaListModel, QuotaTemplateListModel>>(){}).in(Singleton.class);
+                QuotaTemplateListModel>>() { }).to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate,
+                        QuotaListModel, QuotaTemplateListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
index 3dd58418157..0e1a91def43 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/StorageModule.java
@@ -545,29 +545,29 @@ protected void configure() {
         bind(DiskProfileListModel.class).in(Singleton.class);
         bind(StorageDRListModel.class).in(Singleton.class);
         bind(StorageLeaseListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<StorageDomain>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<DiskProfile>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<StorageDomain>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<DiskProfile>>() { }).in(Singleton.class);
         bind(StorageMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<StorageListModel, StorageGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<StorageListModel, StorageGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<StorageListModel, StorageGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<StorageListModel, StorageGeneralModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, StorageListModel, StorageTemplateListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, StorageListModel, StorageTemplateListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, StorageListModel, StorageTemplateListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, StorageListModel, StorageTemplateListModel>>() { })
            .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, StorageListModel, StorageVmListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, StorageListModel, StorageVmListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, StorageListModel, StorageVmListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, StorageListModel, StorageVmListModel>>() { })
            .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VmBase, StorageListModel, StorageLeaseListModel>>(){})
-                .to(new TypeLiteral<SearchableDetailTabModelProvider<VmBase, StorageListModel, StorageLeaseListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VmBase, StorageListModel, StorageLeaseListModel>>() { })
+                .to(new TypeLiteral<SearchableDetailTabModelProvider<VmBase, StorageListModel, StorageLeaseListModel>>() { })
                 .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, StorageListModel, PermissionListModel<StorageDomain>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<StorageDomain, StorageListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, StorageListModel, PermissionListModel<StorageDomain>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<StorageDomain, StorageListModel>>() { }).in(Singleton.class);
         // Permission Disk Profiles
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DiskProfileListModel, PermissionListModel<DiskProfile>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<DiskProfile, DiskProfileListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, DiskProfileListModel, PermissionListModel<DiskProfile>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<DiskProfile, DiskProfileListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/TemplateModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/TemplateModule.java
index b455acb473f..bf5001cd3d6 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/TemplateModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/TemplateModule.java
@@ -270,21 +270,21 @@ protected void configure() {
         bind(TemplateStorageListModel.class).in(Singleton.class);
         bind(TemplateVmListModel.class).in(Singleton.class);
         bind(TemplateEventListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<VmTemplate>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<VmTemplate>>() { }).in(Singleton.class);
         bind(TemplateMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<TemplateListModel, TemplateGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<TemplateListModel, TemplateGeneralModel>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<DetailModelProvider<ImportTemplatesModel, TemplateImportGeneralModel>>(){})
-        .to(new TypeLiteral<DetailTabModelProvider<ImportTemplatesModel, TemplateImportGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<TemplateListModel, TemplateGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<TemplateListModel, TemplateGeneralModel>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<ImportTemplatesModel, TemplateImportGeneralModel>>() { })
+        .to(new TypeLiteral<DetailTabModelProvider<ImportTemplatesModel, TemplateImportGeneralModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, TemplateListModel, TemplateVmListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, TemplateListModel, TemplateVmListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, TemplateListModel, TemplateVmListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, TemplateListModel, TemplateVmListModel>>() { })
            .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, TemplateListModel, PermissionListModel<VmTemplate>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<VmTemplate, TemplateListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, TemplateListModel, PermissionListModel<VmTemplate>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<VmTemplate, TemplateListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java
index 5edcd9ce7dc..7f72e53789d 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/UserModule.java
@@ -202,14 +202,14 @@ protected void configure() {
         bind(UserMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<UserListModel, UserGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<UserListModel, UserGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<UserListModel, UserGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<UserListModel, UserGeneralModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<Quota, UserListModel, UserQuotaListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<Quota, UserListModel, UserQuotaListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<Quota, UserListModel, UserQuotaListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<Quota, UserListModel, UserQuotaListModel>>() { })
            .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<UserGroup, UserListModel, UserGroupListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<UserGroup, UserListModel, UserGroupListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<UserGroup, UserListModel, UserGroupListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<UserGroup, UserListModel, UserGroupListModel>>() { })
            .in(Singleton.class);
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java
index 301def8794c..97a05201121 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VirtualMachineModule.java
@@ -516,7 +516,7 @@ public DetailTabModelProvider<VmListModel<Void>, VmErrataCountModel> getVmErrata
 
     @Override
     protected void configure() {
-        bind(new TypeLiteral<VmListModel<Void>>() {}).in(Singleton.class);
+        bind(new TypeLiteral<VmListModel<Void>>() { }).in(Singleton.class);
         bind(VmGeneralModel.class).in(Singleton.class);
         bind(VmImportGeneralModel.class).in(Singleton.class);
         bind(VmGuestInfoModel.class).in(Singleton.class);
@@ -525,35 +525,35 @@ protected void configure() {
         bind(VmEventListModel.class).in(Singleton.class);
         bind(VmSnapshotListModel.class).in(Singleton.class);
         bind(VmAffinityGroupListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<VmAppListModel<VM>>() {}).in(Singleton.class);
+        bind(new TypeLiteral<VmAppListModel<VM>>() { }).in(Singleton.class);
         bind(VmGuestContainerListModel.class).in(Singleton.class);
         bind(VmHostDeviceListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<VM>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<VmDevicesListModel<VM>>() {}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<VM>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<VmDevicesListModel<VM>>() { }).in(Singleton.class);
         bind(VmErrataCountModel.class).in(Singleton.class);
         bind(VmErrataListModel.class).in(Singleton.class);
         bind(VmAffinityLabelListModel.class).in(Singleton.class);
         bind(VirtualMachineMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<VmListModel<Void>, VmGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<VmListModel<Void>, VmGeneralModel>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<DetailModelProvider<ImportVmsModel, VmImportGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<ImportVmsModel, VmImportGeneralModel>>(){}).in(Singleton.class);
-        bind(new TypeLiteral<DetailModelProvider<VmListModel<Void>, VmGuestInfoModel>>(){})
-           .to(new TypeLiteral<DetailTabModelProvider<VmListModel<Void>, VmGuestInfoModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<VmListModel<Void>, VmGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<VmListModel<Void>, VmGeneralModel>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<ImportVmsModel, VmImportGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<ImportVmsModel, VmImportGeneralModel>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<VmListModel<Void>, VmGuestInfoModel>>() { })
+           .to(new TypeLiteral<DetailTabModelProvider<VmListModel<Void>, VmGuestInfoModel>>() { }).in(Singleton.class);
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<String, VmListModel<Void>, VmAppListModel<VM>>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<String, VmListModel<Void>, VmAppListModel<VM>>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<String, VmListModel<Void>, VmAppListModel<VM>>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<String, VmListModel<Void>, VmAppListModel<VM>>>() { })
            .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<GuestContainer, VmListModel<Void>, VmGuestContainerListModel>>(){})
-                .to(new TypeLiteral<SearchableDetailTabModelProvider<GuestContainer, VmListModel<Void>, VmGuestContainerListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<GuestContainer, VmListModel<Void>, VmGuestContainerListModel>>() { })
+                .to(new TypeLiteral<SearchableDetailTabModelProvider<GuestContainer, VmListModel<Void>, VmGuestContainerListModel>>() { })
                 .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VmListModel<Void>, PermissionListModel<VM>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<VM, VmListModel<Void>>>() {}).in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VmDeviceFeEntity, VmListModel<Void>, VmDevicesListModel<VM>>>(){})
-                .to(new TypeLiteral<SearchableDetailTabModelProvider<VmDeviceFeEntity, VmListModel<Void>, VmDevicesListModel<VM>>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VmListModel<Void>, PermissionListModel<VM>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<VM, VmListModel<Void>>>() { }).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<VmDeviceFeEntity, VmListModel<Void>, VmDevicesListModel<VM>>>() { })
+                .to(new TypeLiteral<SearchableDetailTabModelProvider<VmDeviceFeEntity, VmListModel<Void>, VmDevicesListModel<VM>>>() { })
                 .in(Singleton.class);
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VnicProfileModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VnicProfileModule.java
index 0fae62652cc..bd46230c604 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VnicProfileModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VnicProfileModule.java
@@ -78,19 +78,19 @@ protected void configure() {
         bind(VnicProfileListModel.class).in(Singleton.class);
         bind(VnicProfileVmListModel.class).in(Singleton.class);
         bind(VnicProfileTemplateListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<VnicProfileView>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<VnicProfileView>>() { }).in(Singleton.class);
         bind(VnicProfileMainSelectedItems.class).asEagerSingleton();
 
         // Search-able Detail Models
-        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, VnicProfileListModel, VnicProfileTemplateListModel>>(){})
-           .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, VnicProfileListModel, VnicProfileTemplateListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VmTemplate, VnicProfileListModel, VnicProfileTemplateListModel>>() { })
+           .to(new TypeLiteral<SearchableDetailTabModelProvider<VmTemplate, VnicProfileListModel, VnicProfileTemplateListModel>>() { })
            .in(Singleton.class);
-        bind(new TypeLiteral<SearchableDetailModelProvider<VM, VnicProfileListModel, VnicProfileVmListModel>>(){})
-            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, VnicProfileListModel, VnicProfileVmListModel>>(){})
+        bind(new TypeLiteral<SearchableDetailModelProvider<VM, VnicProfileListModel, VnicProfileVmListModel>>() { })
+            .to(new TypeLiteral<SearchableDetailTabModelProvider<VM, VnicProfileListModel, VnicProfileVmListModel>>() { })
             .in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VnicProfileListModel, PermissionListModel<VnicProfileView>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<VnicProfileView, VnicProfileListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VnicProfileListModel, PermissionListModel<VnicProfileView>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<VnicProfileView, VnicProfileListModel>>() { }).in(Singleton.class);
     }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VolumeModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VolumeModule.java
index 0ea3e014e0f..3c5bf4090df 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VolumeModule.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/VolumeModule.java
@@ -79,15 +79,15 @@ public MainModelProvider<GlusterVolumeEntity, VolumeListModel> getVolumeListProv
                     UICommand lastExecutedCommand, Model windowModel) {
                 if (lastExecutedCommand == getModel().getNewVolumeCommand()) {
                     return popupProvider.get();
-                } else if (lastExecutedCommand == getModel().getStatusRebalanceCommand() || lastExecutedCommand.getName().equals("onStopRebalance")) {//$NON-NLS-1$
+                } else if (lastExecutedCommand == getModel().getStatusRebalanceCommand() || lastExecutedCommand.getName().equals("onStopRebalance")) { //$NON-NLS-1$
                     return rebalanceStatusPopupProvider.get();
-                } else if (lastExecutedCommand == getModel().getShowVolumeProfileDetailsCommand() || lastExecutedCommand.getName().equals("showProfileDetails")) {//$NON-NLS-1$
+                } else if (lastExecutedCommand == getModel().getShowVolumeProfileDetailsCommand() || lastExecutedCommand.getName().equals("showProfileDetails")) { //$NON-NLS-1$
                     return volumeProfileStatsPopupProvider.get();
                 } else if (lastExecutedCommand == getModel().getConfigureVolumeSnapshotOptionsCommand()) {
                     return volumeSnapshotConfigOptionsPopupProvider.get();
                 } else if (lastExecutedCommand == getModel().getConfigureClusterSnapshotOptionsCommand()) {
                     return clusterSnapshotConfigOptionsPopupProvider.get();
-                }  else if (lastExecutedCommand == getModel().getCreateSnapshotCommand()) {
+                } else if (lastExecutedCommand == getModel().getCreateSnapshotCommand()) {
                     return snapshotPopupProvider.get();
                 } else if (lastExecutedCommand == getModel().getEditSnapshotScheduleCommand()) {
                     return snapshotPopupProvider.get();
@@ -140,7 +140,7 @@ public SearchableDetailModelProvider<GlusterBrickEntity, VolumeListModel, Volume
                     return removeBrickPopupProvider.get();
                 } else if (lastExecutedCommand == getModel().getStatusRemoveBricksCommand()) {
                     return removeBricksStatusPopupProvider.get();
-                }else if (lastExecutedCommand.getName().equals("OnStopRemoveBricks")) {  //$NON-NLS-1$
+                } else if (lastExecutedCommand.getName().equals("OnStopRemoveBricks")) {  //$NON-NLS-1$
                     return removeBricksStatusPopupProvider.get();
                 } else if (lastExecutedCommand == getModel().getReplaceBrickCommand()) {
                     return replaceBrickPopupProvider.get();
@@ -305,14 +305,14 @@ protected void configure() {
         bind(VolumeEventListModel.class).in(Singleton.class);
         bind(VolumeGeoRepListModel.class).in(Singleton.class);
         bind(GlusterVolumeSnapshotListModel.class).in(Singleton.class);
-        bind(new TypeLiteral<PermissionListModel<GlusterVolumeEntity>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<PermissionListModel<GlusterVolumeEntity>>() { }).in(Singleton.class);
         bind(VolumeMainSelectedItems.class).asEagerSingleton();
 
         // Form Detail Models
-        bind(new TypeLiteral<DetailModelProvider<VolumeListModel, VolumeGeneralModel>>(){})
-            .to(new TypeLiteral<DetailTabModelProvider<VolumeListModel, VolumeGeneralModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<DetailModelProvider<VolumeListModel, VolumeGeneralModel>>() { })
+            .to(new TypeLiteral<DetailTabModelProvider<VolumeListModel, VolumeGeneralModel>>() { }).in(Singleton.class);
         // Permission Detail Model
-        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VolumeListModel, PermissionListModel<GlusterVolumeEntity>>>(){})
-           .to(new TypeLiteral<PermissionModelProvider<GlusterVolumeEntity, VolumeListModel>>(){}).in(Singleton.class);
+        bind(new TypeLiteral<SearchableDetailModelProvider<Permission, VolumeListModel, PermissionListModel<GlusterVolumeEntity>>>() { })
+           .to(new TypeLiteral<PermissionModelProvider<GlusterVolumeEntity, VolumeListModel>>() { }).in(Singleton.class);
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java
index a37416b167a..ccccbc178aa 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/EntityObject.java
@@ -81,7 +81,7 @@ public static <T> EntityObject from(T businessEntity) {
             obj.setValueAsString("name", ((VmTemplate) businessEntity).getName()); //$NON-NLS-1$
         } else if (businessEntity instanceof GlusterVolumeEntity) {
             obj.setValueAsString("name", ((GlusterVolumeEntity) businessEntity).getName()); //$NON-NLS-1$
-            obj.setValueAsString("clusterId", ((GlusterVolumeEntity) businessEntity).getClusterId().toString());//$NON-NLS-1$
+            obj.setValueAsString("clusterId", ((GlusterVolumeEntity) businessEntity).getClusterId().toString()); //$NON-NLS-1$
         } else if (businessEntity instanceof Provider) {
             obj.setValueAsString("name", ((Provider) businessEntity).getName()); //$NON-NLS-1$
         } else if (businessEntity instanceof DbUser) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/TagObject.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/TagObject.java
index c0f65ac64d0..2a7345ae70d 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/TagObject.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/plugin/entity/TagObject.java
@@ -9,7 +9,7 @@
 import com.google.gwt.core.client.JsArray;
 
 public final class TagObject extends JsMutableObjectWithProperties {
-    protected TagObject() {}
+    protected TagObject() { }
 
     /**
      * Generate a Javascript TagObject from a GWT TagModel object, including the child nodes.
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainWithDetailsPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainWithDetailsPresenter.java
index e47e98f4fff..07bcdce166e 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainWithDetailsPresenter.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainWithDetailsPresenter.java
@@ -194,7 +194,7 @@ protected void onReveal() {
         PlaceRequest currentPlace = placeManager.getCurrentPlaceRequest();
         Set<FragmentParams> params = FragmentParams.getParams(currentPlace);
         params.forEach(param -> {
-            switch(param) {
+            switch (param) {
             case SEARCH:
                 String search = currentPlace.getParameter(FragmentParams.SEARCH.getName(), "");
                 if (!"".equals(search)) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
index 428d721f12e..d1c3a8cce88 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java
@@ -176,7 +176,7 @@ public void eventRaised(Event<? extends EventArgs> ev, Object sender, EventArgs
                 Collection<Job> jobs = taskModelProvider.getModel().getItems();
                 long count = jobs.stream().filter(job -> JobExecutionStatus.STARTED.equals(job.getStatus())).count();
                 // I know I will never have more than 100 items, so I can cast to int.
-                getView().setRunningTaskCount((int)count);
+                getView().setRunningTaskCount((int) count);
             }
 
         });
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainContentPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainContentPresenter.java
index 0af70e1a8c0..0d57909dd47 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainContentPresenter.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainContentPresenter.java
@@ -52,7 +52,7 @@ public void onRevealOverlayContent(RevealOverlayContentEvent event) {
             // Force a refresh of the data when we close the overlay.
             Presenter<?, ?> child = getChild(TYPE_SetContent);
             if (child instanceof AbstractMainWithDetailsPresenter) {
-                ((AbstractMainWithDetailsPresenter<?, ?, ?, ?>)child).refreshMainGridData();
+                ((AbstractMainWithDetailsPresenter<?, ?, ?, ?>) child).refreshMainGridData();
             }
         }
         setInSlot(TYPE_SetOverlay, event.getContent());
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainHostPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainHostPresenter.java
index 900c203f246..30c027e1dd7 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainHostPresenter.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/MainHostPresenter.java
@@ -23,7 +23,7 @@
 
 public class MainHostPresenter extends AbstractMainWithDetailsPresenter<VDS, HostListModel<Void>,
     MainHostPresenter.ViewDef, MainHostPresenter.ProxyDef>
-        implements TagActivationChangeEvent.TagActivationChangeHandler{
+        implements TagActivationChangeEvent.TagActivationChangeHandler {
 
     @GenEvent
     public class HostSelectionChange {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/HostErrataListWithDetailsPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/HostErrataListWithDetailsPopupPresenterWidget.java
index c7986ef7df2..b91a70fc13a 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/HostErrataListWithDetailsPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/HostErrataListWithDetailsPopupPresenterWidget.java
@@ -12,7 +12,7 @@ public class HostErrataListWithDetailsPopupPresenterWidget
     extends ErrataListWithDetailsPopupPresenterWidget<SearchableDetailModelProvider<Erratum,
                 HostListModel<Void>, HostErrataListModel>> {
 
-    public interface ViewDef extends ErrataListWithDetailsPopupPresenterWidget.ViewDef {};
+    public interface ViewDef extends ErrataListWithDetailsPopupPresenterWidget.ViewDef { };
 
     @Inject
     public HostErrataListWithDetailsPopupPresenterWidget(EventBus eventBus,
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/VmErrataListWithDetailsPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/VmErrataListWithDetailsPopupPresenterWidget.java
index 4e5334b5093..0030cf8509b 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/VmErrataListWithDetailsPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/VmErrataListWithDetailsPopupPresenterWidget.java
@@ -12,7 +12,7 @@ public class VmErrataListWithDetailsPopupPresenterWidget
     extends ErrataListWithDetailsPopupPresenterWidget<SearchableDetailModelProvider<Erratum,
         VmListModel<Void>, VmErrataListModel>> {
 
-    public interface ViewDef extends ErrataListWithDetailsPopupPresenterWidget.ViewDef {};
+    public interface ViewDef extends ErrataListWithDetailsPopupPresenterWidget.ViewDef { };
 
     @Inject
     public VmErrataListWithDetailsPopupPresenterWidget(EventBus eventBus,
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/EditDataCenterNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/EditDataCenterNetworkPopupPresenterWidget.java
index 4cce4c1b08e..2b169c391b9 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/EditDataCenterNetworkPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/EditDataCenterNetworkPopupPresenterWidget.java
@@ -3,7 +3,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class EditDataCenterNetworkPopupPresenterWidget extends EditNetworkPopupPresenterWidget{
+public class EditDataCenterNetworkPopupPresenterWidget extends EditNetworkPopupPresenterWidget {
 
     public interface ViewDef extends EditNetworkPopupPresenterWidget.ViewDef {
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewDataCenterNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewDataCenterNetworkPopupPresenterWidget.java
index a1052c91456..7e1e117ebf4 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewDataCenterNetworkPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewDataCenterNetworkPopupPresenterWidget.java
@@ -3,7 +3,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class NewDataCenterNetworkPopupPresenterWidget extends NewNetworkPopupPresenterWidget{
+public class NewDataCenterNetworkPopupPresenterWidget extends NewNetworkPopupPresenterWidget {
 
     public interface ViewDef extends NewNetworkPopupPresenterWidget.ViewDef {
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java
index a2c4f87a7fa..ea4f8398dfe 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/datacenter/NewNetworkPopupPresenterWidget.java
@@ -8,7 +8,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class NewNetworkPopupPresenterWidget extends AbstractNetworkPopupPresenterWidget<NewNetworkModel, NewNetworkPopupPresenterWidget.ViewDef>{
+public class NewNetworkPopupPresenterWidget extends AbstractNetworkPopupPresenterWidget<NewNetworkModel, NewNetworkPopupPresenterWidget.ViewDef> {
 
     public interface ViewDef extends AbstractNetworkPopupPresenterWidget.ViewDef<NewNetworkModel> {
         void setNetworkClusterList(ListModel<NetworkClusterModel> networkClusterList);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepActionConfirmPopUpViewPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepActionConfirmPopUpViewPresenterWidget.java
index 330c22fca9d..b90c9fc07c4 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepActionConfirmPopUpViewPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepActionConfirmPopUpViewPresenterWidget.java
@@ -18,13 +18,13 @@ public void init(final GlusterVolumeGeoRepActionConfirmationModel model) {
         super.init(model);
 
         model.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if(args.propertyName.equalsIgnoreCase("forceLabel")) {//$NON-NLS-1$
+            if (args.propertyName.equalsIgnoreCase("forceLabel")) { //$NON-NLS-1$
                 getView().setForceLabelMessage(model.getForceLabel());
-            } else if(args.propertyName.equalsIgnoreCase("forceHelp")) {//$NON-NLS-1$
+            } else if (args.propertyName.equalsIgnoreCase("forceHelp")) { //$NON-NLS-1$
                 getView().setForceHelp(model.getForceHelp());
-            } else if (args.propertyName.equalsIgnoreCase("Message")) {//$NON-NLS-1$
+            } else if (args.propertyName.equalsIgnoreCase("Message")) { //$NON-NLS-1$
                 getView().setErrorMessage(model.getMessage());
-            } else if(args.propertyName.equalsIgnoreCase("ActionConfirmationMessage")) {//$NON-NLS-1$
+            } else if (args.propertyName.equalsIgnoreCase("ActionConfirmationMessage")) { //$NON-NLS-1$
                 getView().setActionConfirmationMessage(model.getMessage());
             }
         });
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.java
index e823f755b9d..b7e427c410d 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.java
@@ -6,7 +6,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class GlusterVolumeGeoRepCreateSessionPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<GlusterVolumeGeoRepCreateModel, GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.ViewDef>{
+public class GlusterVolumeGeoRepCreateSessionPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<GlusterVolumeGeoRepCreateModel, GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.ViewDef> {
 
     @Inject
     public GlusterVolumeGeoRepCreateSessionPopupPresenterWidget(EventBus eventBus, ViewDef view) {
@@ -24,9 +24,9 @@ public void init(final GlusterVolumeGeoRepCreateModel model) {
         super.init(model);
 
         model.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if(args.propertyName.equalsIgnoreCase("RecommendationViolations")) {//$NON-NLS-1$
+            if (args.propertyName.equalsIgnoreCase("RecommendationViolations")) { //$NON-NLS-1$
                 getView().setSuggestedConfigViolations(model.getRecommendationViolations());
-            } else if (args.propertyName.equalsIgnoreCase("QueryFailed")) {//$NON-NLS-1$
+            } else if (args.propertyName.equalsIgnoreCase("QueryFailed")) { //$NON-NLS-1$
                 getView().setFailureMessage(model.getQueryFailureMessage());
             }
         });
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeSnapshotCreatePopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeSnapshotCreatePopupPresenterWidget.java
index e066485c108..e98702690b4 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeSnapshotCreatePopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/GlusterVolumeSnapshotCreatePopupPresenterWidget.java
@@ -35,10 +35,10 @@ public void init(final GlusterVolumeSnapshotModel model) {
         model.getEndByOptions().getSelectedItemChangedEvent().addListener((ev, sender, args) -> getView().setEndDateVisibility(model));
 
         model.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if(args.propertyName.equalsIgnoreCase("validateAndSwitchAppropriateTab")) {//$NON-NLS-1$
+            if (args.propertyName.equalsIgnoreCase("validateAndSwitchAppropriateTab")) { //$NON-NLS-1$
                 getView().handleValidationErrors(model);
                 getView().switchTabBasedOnEditorInvalidity();
-            } else if(args.propertyName.equalsIgnoreCase("modelPropertiesChanged")) {//$NON-NLS-1$
+            } else if (args.propertyName.equalsIgnoreCase("modelPropertiesChanged")) { //$NON-NLS-1$
                 getView().handleValidationErrors(model);
             }
         });
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/VolumeGeoRepSessionDetailsPopUpPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/VolumeGeoRepSessionDetailsPopUpPresenterWidget.java
index b8e88dfc610..dabbc13ad03 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/VolumeGeoRepSessionDetailsPopUpPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/gluster/VolumeGeoRepSessionDetailsPopUpPresenterWidget.java
@@ -9,7 +9,7 @@
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
-public class VolumeGeoRepSessionDetailsPopUpPresenterWidget extends AbstractModelBoundPopupPresenterWidget<VolumeGeoRepSessionDetailsModel, VolumeGeoRepSessionDetailsPopUpPresenterWidget.ViewDef>{
+public class VolumeGeoRepSessionDetailsPopUpPresenterWidget extends AbstractModelBoundPopupPresenterWidget<VolumeGeoRepSessionDetailsModel, VolumeGeoRepSessionDetailsPopUpPresenterWidget.ViewDef> {
     public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<VolumeGeoRepSessionDetailsModel> {
         public void setCheckPointCompletedAtVisibility(boolean visible);
         public void updateSessionDetailProperties(GlusterGeoRepSessionDetails selectedSessionDetail);
@@ -24,7 +24,7 @@ public VolumeGeoRepSessionDetailsPopUpPresenterWidget(EventBus eventBus, ViewDef
     public void init(final VolumeGeoRepSessionDetailsModel model) {
         super.init(model);
         model.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if(args.propertyName.equalsIgnoreCase("selectedSessionSummaryRow")) {//$NON-NLS-1$
+            if (args.propertyName.equalsIgnoreCase("selectedSessionSummaryRow")) { //$NON-NLS-1$
                 GlusterGeoRepSessionDetails selectedSessionDetail = model.getGeoRepSessionSummary().getSelectedItem().getEntity();
                 getView().setCheckPointCompletedAtVisibility(selectedSessionDetail.isCheckpointCompleted());
                 getView().updateSessionDetailProperties(selectedSessionDetail);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/ImportVmFromExternalProviderPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/ImportVmFromExternalProviderPopupPresenterWidget.java
index 7e7a85eda2c..bcc2d61f05e 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/ImportVmFromExternalProviderPopupPresenterWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/vm/ImportVmFromExternalProviderPopupPresenterWidget.java
@@ -6,7 +6,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class ImportVmFromExternalProviderPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<ImportVmFromExternalProviderModel, ImportVmFromExternalProviderPopupPresenterWidget.ViewDef>{
+public class ImportVmFromExternalProviderPopupPresenterWidget extends AbstractModelBoundPopupPresenterWidget<ImportVmFromExternalProviderModel, ImportVmFromExternalProviderPopupPresenterWidget.ViewDef> {
 
     public interface ViewDef extends AbstractModelBoundPopupPresenterWidget.ViewDef<ImportVmFromExternalProviderModel> {
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostErrataPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostErrataPresenter.java
index 2621379f113..14eb4477688 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostErrataPresenter.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/host/SubTabHostErrataPresenter.java
@@ -53,7 +53,7 @@ static TabData getTabData() {
 
     @Inject
     public SubTabHostErrataPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy,
-            PlaceManager placeManager,  HostMainSelectedItems selectedItems,
+            PlaceManager placeManager, HostMainSelectedItems selectedItems,
             DetailTabModelProvider<HostListModel<Void>, HostErrataCountModel> modelProvider) {
         // No action panel on errata view, can pass null.
         super(eventBus, view, proxy, placeManager, modelProvider, selectedItems, null,
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/VirtualMachineMainSelectedItems.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/VirtualMachineMainSelectedItems.java
index 5af844c1f65..0b4670eac46 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/VirtualMachineMainSelectedItems.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/virtualMachine/VirtualMachineMainSelectedItems.java
@@ -8,7 +8,7 @@
 import com.google.web.bindery.event.shared.EventBus;
 
 public class VirtualMachineMainSelectedItems extends AbstractMainSelectedItems<VM>
-        implements VirtualMachineSelectionChangeEvent.VirtualMachineSelectionChangeHandler{
+        implements VirtualMachineSelectionChangeEvent.VirtualMachineSelectionChangeHandler {
 
     @Inject
     VirtualMachineMainSelectedItems(EventBus eventBus) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java
index 8c66c9db23e..35785cbbd57 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java
@@ -67,7 +67,7 @@ interface ViewIdHandler extends ElementIdHandler<HeaderView> {
     AnchorListItem tasks;
     private Span tasksBadge;
 
-    @UiField (provided=true)
+    @UiField (provided = true)
     @WithElementId
     EventsListPopover events;
     private NotificationListWidget eventsWidget;
@@ -133,7 +133,7 @@ public HeaderView(ApplicationDynamicMessages dynamicMessages) {
         // manage the Tasks badge explicity to allow fine control of the positioning
         tasksBadge = new Span();
         tasksBadge.setStyleName(Styles.BADGE);
-        Anchor tasksAnchor = (Anchor)tasks.getWidget(0);
+        Anchor tasksAnchor = (Anchor) tasks.getWidget(0);
         tasksAnchor.add(tasksBadge);
 
         // Put PF user icon on the drop down instead of the FA one.
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainHostView.java
index 50060671fdd..e537c5a58c2 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainHostView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainHostView.java
@@ -252,7 +252,7 @@ public String getValue(VDS object) {
                     int lowValue = defaultSpmPriority / 2;
                     int highValue = defaultSpmPriority + (maxSpmPriority - defaultSpmPriority) / 2;
 
-                    if (object.getSpmStatus() != VdsSpmStatus.None){
+                    if (object.getSpmStatus() != VdsSpmStatus.None) {
                         return object.getSpmStatus().name();
                     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainNetworkView.java
index 047e61dd8f0..aa3b2ec64dd 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainNetworkView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainNetworkView.java
@@ -167,11 +167,11 @@ public String getValue(NetworkView object) {
         AbstractTextColumn<NetworkView> qosColumn = new AbstractTextColumn<NetworkView>() {
             @Override
             public String getValue(NetworkView object) {
-                return object.getQosName() == null ? "-" : object.getQosName().toString();//$NON-NLS-1$
+                return object.getQosName() == null ? "-" : object.getQosName().toString(); //$NON-NLS-1$
             }
         };
         qosColumn.makeSortable(NetworkConditionFieldAutoCompleter.QOS);
-        getTable().ensureColumnVisible(qosColumn, constants.qosName(), virtMode, "60px");//$NON-NLS-1$
+        getTable().ensureColumnVisible(qosColumn, constants.qosName(), virtMode, "60px"); //$NON-NLS-1$
 
         AbstractTextColumn<NetworkView> labelColumn = new AbstractTextColumn<NetworkView>() {
             @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainQuotaView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainQuotaView.java
index 104faa1f16e..bf795882bec 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainQuotaView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainQuotaView.java
@@ -118,7 +118,7 @@ protected Integer getProgressValue(Quota object) {
                 if (allocated == 0) {
                     return 0;
                 }
-                value = (int)(((double)used/allocated) * 100);
+                value = (int) (((double) used / allocated) * 100);
                 return allocated < 0 ? -1 : value > 100 ? 100 : value;
             }
         },
@@ -144,16 +144,16 @@ public String getValue(Quota object) {
                         }
                     }
                 }
-                value = (int)(allocated-used);
+                value = (int) (allocated - used);
                 String returnVal;
                 if (allocated < 0) {
                     returnVal = constants.unlimited();
-                } else if (value <= 0){
+                } else if (value <= 0) {
                     returnVal = messages.mebibytes("0"); //$NON-NLS-1$
-                } else if (value <= 5*1024) {
+                } else if (value <= 5 * 1024) {
                     returnVal = messages.mebibytes(String.valueOf(value));
                 } else {
-                    returnVal = messages.gibibytes(decimalFormat.format((double)value/1024));
+                    returnVal = messages.gibibytes(decimalFormat.format((double) value / 1024));
                 }
                 return returnVal;
             }
@@ -184,7 +184,7 @@ protected Integer getProgressValue(Quota object) {
                 if (allocated == 0) {
                     return 0;
                 }
-                value = (int)(((double)used/allocated) * 100);
+                value = (int) (((double) used / allocated) * 100);
                 return allocated < 0 ? -1 : value > 100 ? 100 : value;
             }
         },
@@ -249,7 +249,7 @@ protected Integer getProgressValue(Quota object) {
                 if (allocated == 0) {
                     return 0;
                 }
-                value = (int)((used/allocated) * 100);
+                value = (int) ((used / allocated) * 100);
                 return allocated < 0 ? -1 : value > 100 ? 100 : value;
             }
         },
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainVolumeView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainVolumeView.java
index 7b8f334e2ed..32bb07b956f 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainVolumeView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MainVolumeView.java
@@ -154,7 +154,7 @@ public GlusterVolumeEntity getValue(GlusterVolumeEntity object) {
                 return object;
             }
         };
-        getTable().addColumn(capacityColumn, constants.volumeCapacity(), "100px");//$NON-NLS-1$
+        getTable().addColumn(capacityColumn, constants.volumeCapacity(), "100px"); //$NON-NLS-1$
 
         getTable().addColumn(new VolumeActivityColumn<GlusterVolumeEntity>(
                 new VolumeActivityCompositeCell<GlusterTaskSupport>(compositeList)),
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MenuView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MenuView.java
index a9b720f12ac..a797c3ec68a 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MenuView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/MenuView.java
@@ -363,9 +363,9 @@ private FlowPanel createSecondaryMenuHeader(ListGroupItem primaryMenuItem) {
             if (widget.asWidget() instanceof Anchor) {
                 // This is the anchor with the href, replace it with javascrip:;
                 Anchor labelAnchor = (Anchor) widget.asWidget();
-                for (int j= 0; j < labelAnchor.getWidgetCount(); j++) {
+                for (int j = 0; j < labelAnchor.getWidgetCount(); j++) {
                     if (labelAnchor.getWidget(j).getStyleName().contains(PatternflyStyles.LIST_GROUP_ITEM_VALUE)) {
-                        secondaryMenuHeaderLabel.setText(((Span)labelAnchor.getWidget(j)).getText());
+                        secondaryMenuHeaderLabel.setText(((Span) labelAnchor.getWidget(j)).getText());
                     }
                 }
             }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ErrataTableView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ErrataTableView.java
index 3f0baa527d7..b86ebe8db20 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ErrataTableView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ErrataTableView.java
@@ -61,7 +61,7 @@ public interface Style extends CssResource {
 
     private static final ApplicationConstants constants = AssetProvider.getConstants();
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     EntityModelCellTable<AbstractErrataListModel> errataTable;
 
     @UiField
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportTemplatesPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportTemplatesPopupView.java
index 25a9d71763f..538f4b22dc5 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportTemplatesPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/ImportTemplatesPopupView.java
@@ -156,7 +156,7 @@ void initEntityModelCellTables() {
             @Override
             public String getValue(EntityModel<VmTemplate> externalVmModel) {
                 if (externalVmModel instanceof OvaTemplateModel && ((OvaTemplateModel) externalVmModel).getOvaFileName() != null) {
-                    return externalVmModel.getEntity().getName() + " (" + ((OvaTemplateModel) externalVmModel).getOvaFileName() + ")";//$NON-NLS-1$ //$NON-NLS-2$
+                    return externalVmModel.getEntity().getName() + " (" + ((OvaTemplateModel) externalVmModel).getOvaFileName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 return externalVmModel.getEntity().getName();
             }
@@ -166,7 +166,7 @@ public String getValue(EntityModel<VmTemplate> externalVmModel) {
             @Override
             public String getValue(EntityModel<VmTemplate> externalVmModel) {
                 if (externalVmModel instanceof OvaTemplateModel && ((OvaTemplateModel) externalVmModel).getOvaFileName() != null) {
-                    return externalVmModel.getEntity().getName() + " (" + ((OvaTemplateModel) externalVmModel).getOvaFileName() + ")";//$NON-NLS-1$ //$NON-NLS-2$
+                    return externalVmModel.getEntity().getName() + " (" + ((OvaTemplateModel) externalVmModel).getOvaFileName() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 return externalVmModel.getEntity().getName();
             }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/ConfigurePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/ConfigurePopupView.java
index 2c438f89ebf..f7fea756577 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/ConfigurePopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/ConfigurePopupView.java
@@ -30,19 +30,19 @@ interface ViewUiBinder extends UiBinder<SimpleDialogPanel, ConfigurePopupView> {
     @UiField
     DialogTab clusterPoliciesTab;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     RoleView roleView;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     SystemPermissionView systemPermissionView;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     ClusterPolicyView clusterPolicyView;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     InstanceTypesView instanceTypesView;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     SharedMacPoolView sharedMacPoolView;
 
     @Inject
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
index ec2c4a40374..4b768833793 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/configure/SystemPermissionView.java
@@ -44,7 +44,7 @@ interface ViewIdHandler extends ElementIdHandler<SystemPermissionView> {
     private static final ApplicationConstants constants = AssetProvider.getConstants();
 
     @Inject
-    public SystemPermissionView(EventBus eventBus,  ClientStorage clientStorage,
+    public SystemPermissionView(EventBus eventBus, ClientStorage clientStorage,
             SystemPermissionModelProvider modelProvider,
             SystemPermissionActionPanelPresenterWidget actionPanel) {
         super();
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java
index fad89b60327..f21866364d9 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/AddBrickPopupView.java
@@ -159,7 +159,7 @@ public String renderNullSafe(VDS vds) {
 
     }
 
-    protected void initTableColumns(){
+    protected void initTableColumns() {
         // Table Entity Columns
         bricksTable.addColumn(new AbstractEntityModelTextColumn<GlusterBrickEntity>() {
             @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
index d7d8301ac96..30b0f577003 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/CreateBrickPopupView.java
@@ -223,7 +223,7 @@ public void cleanup() {
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 
     @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java
index 033dd1d93dd..822527a7493 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/DetachGlusterHostsPopupView.java
@@ -65,7 +65,7 @@ public DetachGlusterHostsPopupView(EventBus eventBus) {
         driver.initialize(this);
     }
 
-    protected void initTableColumns(){
+    protected void initTableColumns() {
         // Table Entity Columns
         hostsTable.addColumn(new AbstractEntityModelTextColumn<String>() {
             @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
index d93ba839b86..c4bfaba1a9e 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoRepCreateSessionPopupView.java
@@ -24,7 +24,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.inject.Inject;
 
-public class GlusterVolumeGeoRepCreateSessionPopupView extends AbstractModelBoundPopupView<GlusterVolumeGeoRepCreateModel> implements GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.ViewDef{
+public class GlusterVolumeGeoRepCreateSessionPopupView extends AbstractModelBoundPopupView<GlusterVolumeGeoRepCreateModel> implements GlusterVolumeGeoRepCreateSessionPopupPresenterWidget.ViewDef {
 
     interface Driver extends UiCommonEditorDriver<GlusterVolumeGeoRepCreateModel, GlusterVolumeGeoRepCreateSessionPopupView> {
     }
@@ -158,7 +158,7 @@ public void edit(final GlusterVolumeGeoRepCreateModel object) {
     @Override
     public void setFailureMessage(String failureMessage) {
         boolean failureMessageVisible = failureMessage != null;
-        if(failureMessageVisible) {
+        if (failureMessageVisible) {
             message.setText(failureMessage);
         }
         message.setVisible(failureMessageVisible);
@@ -167,7 +167,7 @@ public void setFailureMessage(String failureMessage) {
     @Override
     public void setSuggestedConfigViolations(String recommendationViolations) {
         boolean recommendationViolationsVisible = recommendationViolations != null;
-        if(recommendationViolationsVisible) {
+        if (recommendationViolationsVisible) {
             suggestedConfigViolations.setText(recommendationViolations);
         }
         suggestedConfigViolations.setVisible(recommendationViolationsVisible);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java
index 9af7779eaae..41dc1870e8c 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeGeoReplicationSessionConfigPopupView.java
@@ -67,7 +67,7 @@ protected String getText(Pair<Boolean, GlusterGeoRepSessionConfiguration> entity
                 return entity.getSecond().getKey();
             }
         },
-                constants.optionKeyVolumeParameter(), "150px");//$NON-NLS-1$
+                constants.optionKeyVolumeParameter(), "150px"); //$NON-NLS-1$
 
         geoReplicationConfigTable.addColumn(new AbstractScrollableTextColumn<EntityModel<Pair<Boolean, GlusterGeoRepSessionConfiguration>>>() {
             @Override
@@ -77,11 +77,11 @@ public String getValue(EntityModel<Pair<Boolean, GlusterGeoRepSessionConfigurati
             }
         },
                 constants.descriptionVolumeParameter(),
-                "300px");//$NON-NLS-1$
+                "300px"); //$NON-NLS-1$
 
         geoReplicationConfigTable.addColumn(new GlusterConfigAwareColumn(),
                 constants.optionValueVolumeParameter(),
-                "200px");//$NON-NLS-1$
+                "200px"); //$NON-NLS-1$
 
         geoReplicationConfigTable.addColumn(new AbstractCheckboxColumn<EntityModel<Pair<Boolean, GlusterGeoRepSessionConfiguration>>>(true,
                 (index, object, value) -> object.getEntity().setFirst(value)) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotConfigureOptionsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotConfigureOptionsPopupView.java
index c8c750c4502..7e18f2cb491 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotConfigureOptionsPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotConfigureOptionsPopupView.java
@@ -93,7 +93,7 @@ public String getText(VolumeSnapshotOptionModel object) {
                 new Column<EntityModel<VolumeSnapshotOptionModel>, String>(new TextInputCell()) {
             @Override
             public String getValue(EntityModel<VolumeSnapshotOptionModel> object) {
-                return ((VolumeSnapshotOptionModel)object.getEntity()).getOptionValue();
+                return ((VolumeSnapshotOptionModel) object.getEntity()).getOptionValue();
             }
         };
         configsTable.addColumn(valueColumn, constants.volumeSnapshotConfigValue(), "100px"); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotCreatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotCreatePopupView.java
index 6f64d1af7f9..a910eec03f5 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotCreatePopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/GlusterVolumeSnapshotCreatePopupView.java
@@ -192,7 +192,7 @@ public String render(DayOfWeek object) {
         endDate.getContentWidget().setDateTimeFormat(GwtBootstrapDateTimePicker.DEFAULT_DATE_TIME_FORMAT);
         endDate.getContentWidget().showDateAndTime();
         executionTimeEditor = new EntityModelDateTimeBoxEditor();
-        executionTimeEditor.getContentWidget().setDateTimeFormat("hh:ii");//$NON-NLS-1$
+        executionTimeEditor.getContentWidget().setDateTimeFormat("hh:ii"); //$NON-NLS-1$
         executionTimeEditor.getContentWidget().showTimeOnly();
         recurrenceEditor =
                 new ListModelListBoxEditor<>(new AbstractRenderer<GlusterVolumeSnapshotScheduleRecurrence>() {
@@ -276,7 +276,7 @@ private String collectScheduleTabErrors(GlusterVolumeSnapshotModel object) {
 
     private String collectGeneralTabErrors(GlusterVolumeSnapshotModel object) {
         StringBuilder generalTabErrorBuilder = new StringBuilder();
-        if (!snapshotNameEditor.isValid()){
+        if (!snapshotNameEditor.isValid()) {
             appendErrors(Collections.singletonList(constants.volumeSnapshotNamePrefixLabel()), generalTabErrorBuilder);
             appendErrors(object.getSnapshotName().getInvalidityReasons(), generalTabErrorBuilder);
         }
@@ -296,9 +296,9 @@ public void switchTabBasedOnEditorInvalidity() {
     }
 
     private void appendErrors(List<String> errors, StringBuilder sBuilder) {
-        for(String currentError : errors) {
+        for (String currentError : errors) {
             sBuilder.append(currentError);
-            sBuilder.append("\n");//$NON-NLS-1$
+            sBuilder.append("\n"); //$NON-NLS-1$
         }
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java
index 24345bef522..f7894874bb9 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/RemoveBrickStatusPopupView.java
@@ -22,7 +22,7 @@ public String getColumnHeaderForFilesMoved() {
     }
 
     @Override
-    public boolean isSkippedFileCountNeeded(){
+    public boolean isSkippedFileCountNeeded() {
         return false;
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeGeoRepSessionDetailsPopUpView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeGeoRepSessionDetailsPopUpView.java
index d7ba94a5aec..6c76ff71f0f 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeGeoRepSessionDetailsPopUpView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeGeoRepSessionDetailsPopUpView.java
@@ -26,7 +26,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.inject.Inject;
 
-public class VolumeGeoRepSessionDetailsPopUpView extends AbstractModelBoundPopupView<VolumeGeoRepSessionDetailsModel> implements VolumeGeoRepSessionDetailsPopUpPresenterWidget.ViewDef{
+public class VolumeGeoRepSessionDetailsPopUpView extends AbstractModelBoundPopupView<VolumeGeoRepSessionDetailsModel> implements VolumeGeoRepSessionDetailsPopUpPresenterWidget.ViewDef {
 
     interface Driver extends UiCommonEditorDriver<VolumeGeoRepSessionDetailsModel, VolumeGeoRepSessionDetailsPopUpView> {
     }
@@ -178,7 +178,7 @@ protected Date getRawValue(EntityModel<GlusterGeoRepSessionDetails> object) {
     }
 
     @Override
-    public void setCheckPointCompletedAtVisibility(boolean visible)  {
+    public void setCheckPointCompletedAtVisibility(boolean visible) {
         checkPointCompletedAt.setVisible(visible);
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java
index 221bd0dc370..662bcd8c3af 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeProfileStatisticsPopupView.java
@@ -156,21 +156,21 @@ protected String getText(FopStats entity) {
         volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpMaxLatency());
 
         volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpMinLatency());
 
         volumeProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpAvgLatency());
 
@@ -193,21 +193,21 @@ protected String getText(FopStats entity) {
         nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getMaxLatencyFormatted().getFirst() + " " + entity.getMaxLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpMaxLatency());
 
         nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getMinLatencyFormatted().getFirst() + " " + entity.getMinLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpMinLatency());
 
         nfsServerProfileStats.addColumn(new AbstractEntityModelTextColumn<FopStats>() {
             @Override
             protected String getText(FopStats entity) {
-                return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond();//$NON-NLS-1$
+                return entity.getAvgLatencyFormatted().getFirst() + " " + entity.getAvgLatencyFormatted().getSecond(); //$NON-NLS-1$
             }
         }, constants.fOpAvgLatency());
 
@@ -216,7 +216,7 @@ protected String getText(FopStats entity) {
     private void initAnchor(String url, Anchor anchor) {
         anchor.setHref(url);
         anchor.setText(constants.exportToText());
-        anchor.setTarget("_blank");//$NON-NLS-1$
+        anchor.setTarget("_blank"); //$NON-NLS-1$
     }
 
     @Override
@@ -240,29 +240,29 @@ public void edit(final VolumeProfileStatisticsModel object) {
         nfsRefreshIcon.setRefreshIconClickListener(nfsTabClickHandler);
 
         object.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if (args.propertyName.equals("brickProfileRunTimeChanged")) {//$NON-NLS-1$
+            if (args.propertyName.equals("brickProfileRunTimeChanged")) { //$NON-NLS-1$
                 profileRunTime.setText(object.getProfileRunTime());
             }
-            if (args.propertyName.equals("brickProfileDataRead")) {//$NON-NLS-1$
+            if (args.propertyName.equals("brickProfileDataRead")) { //$NON-NLS-1$
                 bytesRead.setText(object.getBytesRead());
             }
-            if (args.propertyName.equals("brickProfileDataWritten")) {//$NON-NLS-1$
+            if (args.propertyName.equals("brickProfileDataWritten")) { //$NON-NLS-1$
                 bytesWritten.setText(object.getBytesWritten());
             }
-            if (args.propertyName.equals("nfsProfileRunTimeChanged")) {//$NON-NLS-1$
+            if (args.propertyName.equals("nfsProfileRunTimeChanged")) { //$NON-NLS-1$
                 nfsProfileRunTime.setText(object.getNfsProfileRunTime());
             }
-            if (args.propertyName.equals("nfsProfileDataRead")) {//$NON-NLS-1$
+            if (args.propertyName.equals("nfsProfileDataRead")) { //$NON-NLS-1$
                 nfsBytesRead.setText(object.getNfsBytesRead());
             }
-            if (args.propertyName.equals("nfsProfileDataWritten")) {//$NON-NLS-1$
+            if (args.propertyName.equals("nfsProfileDataWritten")) { //$NON-NLS-1$
                 nfsBytesWritten.setText(object.getNfsBytesWritten());
             }
-            if(args.propertyName.equals("statusOfFetchingProfileStats")) {//$NON-NLS-1$
+            if (args.propertyName.equals("statusOfFetchingProfileStats")) { //$NON-NLS-1$
                 boolean disableErrorLabels = !object.isSuccessfulProfileStatsFetch();
-                if(!disableErrorLabels) {
+                if (!disableErrorLabels) {
                     String url = object.getProfileExportUrl();
-                    boolean isBrickTabSelected = !url.contains(";nfsStatistics=true");//$NON-NLS-1$
+                    boolean isBrickTabSelected = !url.contains(";nfsStatistics=true"); //$NON-NLS-1$
                     initAnchor(url, isBrickTabSelected ? brickProfileAnchor : nfsProfileAnchor);
                 }
                 bricksError.setVisible(disableErrorLabels);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
index aa5caad273e..16ea18e19ad 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
@@ -164,7 +164,7 @@ protected String getText(GlusterVolumeTaskStatusForHost entity) {
             }
         }, constants.rebalanceFailedFileCount());
 
-        if (isSkippedFileCountNeeded()){
+        if (isSkippedFileCountNeeded()) {
             rebalanceHostsTable.addColumn(new AbstractEntityModelTextColumn<GlusterVolumeTaskStatusForHost>() {
                 @Override
                 protected String getText(GlusterVolumeTaskStatusForHost entity) {
@@ -189,7 +189,7 @@ protected Double getRawValue(EntityModel object) {
         }, constants.rebalanceRunTime());
     }
 
-    public boolean isSkippedFileCountNeeded(){
+    public boolean isSkippedFileCountNeeded() {
         return true;
     }
 
@@ -204,9 +204,9 @@ public void edit(final VolumeRebalanceStatusModel object) {
         rebalanceHostsTable.asEditor().edit(object.getRebalanceSessions());
 
         object.getPropertyChangedEvent().addListener((ev, sender, args) -> {
-            if (args.propertyName.equals("STATUS_UPDATED")) {//$NON-NLS-1$
+            if (args.propertyName.equals("STATUS_UPDATED")) { //$NON-NLS-1$
                 status.setVisible(object.isStatusAvailable());
-            } else if (args.propertyName.equals("STOP_TIME_UPDATED")) {//$NON-NLS-1$
+            } else if (args.propertyName.equals("STOP_TIME_UPDATED")) { //$NON-NLS-1$
                 stopTimeColumn.setVisible(object.isStopTimeVisible());
             }
         });
@@ -216,7 +216,7 @@ private EntityModelLabelEditor<Date> getInstanceOfDateEditor() {
         return new EntityModelLabelEditor<>(new AbstractRenderer<Date>() {
             @Override
             public String render(Date entity) {
-                if(entity == null) {
+                if (entity == null) {
                     return constants.unAvailablePropertyLabel();
                 }
                 return renderer.render(entity);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/AutoScrollAdapter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/AutoScrollAdapter.java
index 2d9a97450ad..abe1f4d36f2 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/AutoScrollAdapter.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/AutoScrollAdapter.java
@@ -47,8 +47,8 @@ public void run() {
             int top = sp.getAbsoluteTop();
             int height = sp.getOffsetHeight();
 
-            int topEdgeDelta    = mouseY < top || mouseY > (top+height) ? -1 : mouseY - top;
-            int bottomEdgeDelta = mouseY < top || mouseY > (top+height) ? -1 : top + height - mouseY;
+            int topEdgeDelta = mouseY < top || mouseY > (top + height) ? -1 : mouseY - top;
+            int bottomEdgeDelta = mouseY < top || mouseY > (top + height) ? -1 : top + height - mouseY;
 
             if (topEdgeDelta > -1 && topEdgeDelta < EDGE_DELTA_FOR_SCROLLING) {
                 log.finer("inside the EDGE_DELTA_FOR_SCROLLING on the top"); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java
index 39ef5beafc9..dd0af62c1b9 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostConfigureLocalStoragePopupView.java
@@ -217,7 +217,7 @@ public String renderNullSafe(Version object) {
         clusterCpuTypeEditor = new ListModelListBoxEditor<>(new AbstractRenderer<ServerCpu>() {
             @Override
             public String render(ServerCpu object) {
-                return object != null  && object.getCpuName().length() > 0
+                return object != null && object.getCpuName().length() > 0
                         ?
                         object.getCpuName()
                         :
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostFenceAgentPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostFenceAgentPopupView.java
index add859b91e6..fb61f45bd04 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostFenceAgentPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostFenceAgentPopupView.java
@@ -88,7 +88,7 @@ interface Style extends CssResource {
     @WithElementId("pmOptions")
     StringEntityModelTextBoxEditor pmOptionsEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     @Path(value = "pmEncryptOptions.entity")
     @WithElementId("pmEncryptOptions")
     EntityModelCheckBoxEditor pmEncryptOptionsEditor;
@@ -101,7 +101,7 @@ interface Style extends CssResource {
     @Ignore
     Label testMessage;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     @Path(value = "pmSecure.entity")
     @WithElementId("pmSecure")
     EntityModelCheckBoxEditor pmSecureEditor;
@@ -131,9 +131,9 @@ public HostFenceAgentPopupView(EventBus eventBus) {
 
     private void initEditors() {
         pmTypeEditor = new ListModelListBoxEditor<>(new StringRenderer<String>());
-        pmEncryptOptionsEditor= new EntityModelCheckBoxEditor(Align.RIGHT);
+        pmEncryptOptionsEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         pmEncryptOptionsEditor.setUsePatternFly(true);
-        pmSecureEditor= new EntityModelCheckBoxEditor(Align.RIGHT);
+        pmSecureEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         pmSecureEditor.setUsePatternFly(true);
         fencingOptionsUrl = new Anchor(constants.fencingOptionsLabel());
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
index 69f30a32633..9b3b01f3edc 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
@@ -219,7 +219,7 @@ public void edit(final InstallModel model) {
         });
 
         boolean installedFailed = model.getVds().getStatus() == VDSStatus.InstallFailed;
-        model.setAuthenticationMethod(installedFailed ? AuthenticationMethod.Password: AuthenticationMethod.PublicKey);
+        model.setAuthenticationMethod(installedFailed ? AuthenticationMethod.Password : AuthenticationMethod.PublicKey);
         displayPasswordField(installedFailed);
         rbPassword.setValue(installedFailed);
         rbPublicKey.setValue(!installedFailed);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
index ae7ce115117..dceb40573d2 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
@@ -248,7 +248,7 @@ interface ViewIdHandler extends ElementIdHandler<HostPopupView> {
     @Ignore
     DialogTab hostedEngineTab;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     @Path(value = "hostedEngineHostModel.selectedItem")
     ListModelListBoxEditor<HostedEngineDeployConfiguration.Action> hostedEngineDeployActionsEditor;
 
@@ -739,7 +739,7 @@ private void createSpmControls(final HostModel object) {
 
             RadioButton rb = new RadioButton("spm"); // $//$NON-NLS-1$
             rb.setText(model.getTitle());
-            Element labelElement = (Element)rb.getElement().getChild(1);
+            Element labelElement = (Element) rb.getElement().getChild(1);
             labelElement.addClassName(style.patternFlyRadio());
             rb.setValue(object.getSpmPriority().getSelectedItem() == model);
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java
index 5694d22756b..ddf2b01c572 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostSetupNetworksPopupView.java
@@ -156,7 +156,7 @@ private void onRadioButtonSelection(boolean networksPanelSelected) {
     // Create an auto-scroll adapter for the nicList's parent ScrollPanel
     private void setupNicListAutoScrolling() {
         if (nicList.getParent() instanceof ScrollPanel) {
-            ScrollPanel sp = (ScrollPanel)nicList.getParent();
+            ScrollPanel sp = (ScrollPanel) nicList.getParent();
             new AutoScrollAdapter(eventBus, sp);
         }
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
index 1cc91678a27..5b00f620cab 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/ItemInfoPopup.java
@@ -51,9 +51,9 @@ public class ItemInfoPopup extends DecoratedPopupPanel {
     private static final ApplicationResources resources = AssetProvider.getResources();
     private static final ApplicationConstants constants = AssetProvider.getConstants();
     private static final ApplicationMessages messages = AssetProvider.getMessages();
-    private static final String BACKGROUND_COLOR = "#333333";//$NON-NLS-1$
-    private static final String WHITE_TEXT_COLOR = "white";//$NON-NLS-1$
-    private static final String TEXT_COLOR = "#c4c4c4";//$NON-NLS-1$
+    private static final String BACKGROUND_COLOR = "#333333"; //$NON-NLS-1$
+    private static final String WHITE_TEXT_COLOR = "white"; //$NON-NLS-1$
+    private static final String TEXT_COLOR = "#c4c4c4"; //$NON-NLS-1$
     private static final String BOND_OPTIONS_IP_SEPARATOR = ","; //$NON-NLS-1$
 
     private SafeHtml mgmtNetworkImage = safeHtmlFromTrustedString(resources.mgmtNetwork());
@@ -86,7 +86,7 @@ public final SafeHtml getTooltipContent(NetworkItemModel<?> item) {
             showNetwork((LogicalNetworkModel) item);
         } else if (item instanceof NetworkInterfaceModel) {
             showNic((NetworkInterfaceModel) item);
-        } else if (item instanceof NetworkLabelModel){
+        } else if (item instanceof NetworkLabelModel) {
             return null;
         }
 
@@ -213,7 +213,7 @@ private void showNetwork(LogicalNetworkModel networkModel) {
     private void addSyncDiff(LogicalNetworkModel networkModel) {
         addRow(templates.imageTextSetupNetwork(notInSyncImage, templates.coloredText(constants.hostOutOfSync(),
                 SafeStylesUtils.forTrustedColor(TEXT_COLOR))));
-        SafeHtml safeHtml  = SafeHtmlUtils.fromTrustedString(generatePreviewSentence());
+        SafeHtml safeHtml = SafeHtmlUtils.fromTrustedString(generatePreviewSentence());
         addRow(safeHtml);
         List<ReportedConfiguration> panelParameters = filterSyncProperties(networkModel);
         Widget networkOutOfSyncPanel = new NetworkOutOfSyncPanel(panelParameters).outOfSyncTableAsWidget();
@@ -235,7 +235,7 @@ private String generatePreviewSentence() {
      * will filter out all sync properties
      * @param networkModel must be managed
      */
-    private List<ReportedConfiguration> filterSyncProperties(LogicalNetworkModel networkModel){
+    private List<ReportedConfiguration> filterSyncProperties(LogicalNetworkModel networkModel) {
         ReportedConfigurations reportedConfigurations = networkModel.getReportedConfigurations();
         List<ReportedConfiguration> reportedConfigurationList = reportedConfigurations.getReportedConfigurationList();
         return Linq.where(reportedConfigurationList, reportedConfiguration -> !reportedConfiguration.isInSync());
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
index c6e2df61929..cbdae17f9e1 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkItemPanel.java
@@ -197,7 +197,7 @@ private MenuBar rootMenu(NetworkItemModel<?> item) {
     }
 
     private void showContextMenu(NetworkItemPanel<?> panel, int clientX, int clientY) {
-        if (!menu.isEmpty()){
+        if (!menu.isEmpty()) {
             menuPopup.setWidget(menu);
 
             int y = panel.getAbsoluteTop() + panel.getOffsetHeight() / 2;
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkOutOfSyncPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkOutOfSyncPanel.java
index acf99810f52..107caf7d99a 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkOutOfSyncPanel.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/panels/NetworkOutOfSyncPanel.java
@@ -24,9 +24,9 @@ public class NetworkOutOfSyncPanel extends FlowPanel {
     private static final ColumnSize MAIN_COLUMN_SIZE = ColumnSize.SM_12;
     private static final ColumnSize PROPERTY_COLUMN_SIZE = ColumnSize.SM_6;
     private static final ColumnSize COLUMN_SIZE = ColumnSize.SM_3;
-    private static final String BACKGROUND_COLOR = "rgb(67, 67, 67)";//$NON-NLS-1$
-    private static final String WHITE_TEXT_COLOR = "white";//$NON-NLS-1$
-    private static final String TEXT_COLOR = "#c4c4c4";//$NON-NLS-1$
+    private static final String BACKGROUND_COLOR = "rgb(67, 67, 67)"; //$NON-NLS-1$
+    private static final String WHITE_TEXT_COLOR = "white"; //$NON-NLS-1$
+    private static final String TEXT_COLOR = "#c4c4c4"; //$NON-NLS-1$
     private FlowPanel flowPanel;
     private final List<ReportedConfiguration> reportedConfigurationList;
     private static final ApplicationConstants constants = AssetProvider.getConstants();
@@ -37,7 +37,7 @@ public NetworkOutOfSyncPanel(List<ReportedConfiguration> reportedConfigurationLi
         sortReportedConfigurationList();
     }
 
-    private void sortReportedConfigurationList(){
+    private void sortReportedConfigurationList() {
         Collections.sort(reportedConfigurationList, Comparator.comparing(r -> r.getType().getName()));
     }
 
@@ -51,7 +51,7 @@ public Widget outOfSyncTableAsWidget() {
         return flowPanel.asWidget();
     }
 
-    private void addOutOfSyncRow(List<Label> values, TextAlign textAlign){
+    private void addOutOfSyncRow(List<Label> values, TextAlign textAlign) {
         addOutOfSyncRow(values, textAlign, false);
     }
 
@@ -73,13 +73,13 @@ private void addOutOfSyncRow(List<Label> values, TextAlign textAlign, boolean bo
         }
         row.add(mainColumn);
 
-        if (bottomBorderSolid){
+        if (bottomBorderSolid) {
             Row container = new Row();
             container.setPaddingBottom(4);
             container.add(row);
-            container.getElement().getStyle().setProperty("margin", "0 0 4px");//$NON-NLS-1$ //$NON-NLS-2$
-            container.getElement().getStyle().setProperty("borderBottomStyle", "solid");//$NON-NLS-1$ //$NON-NLS-2$
-            container.getElement().getStyle().setProperty("borderWidth", "1px");//$NON-NLS-1$ //$NON-NLS-2$
+            container.getElement().getStyle().setProperty("margin", "0 0 4px"); //$NON-NLS-1$ //$NON-NLS-2$
+            container.getElement().getStyle().setProperty("borderBottomStyle", "solid"); //$NON-NLS-1$ //$NON-NLS-2$
+            container.getElement().getStyle().setProperty("borderWidth", "1px"); //$NON-NLS-1$ //$NON-NLS-2$
             flowPanel.add(container);
         } else {
             flowPanel.add(row);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java
index 25ad86a5440..71927b51c8b 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/provider/ProviderPopupView.java
@@ -44,7 +44,7 @@
 
 public class ProviderPopupView extends AbstractModelBoundPopupView<ProviderModel> implements ProviderPopupPresenterWidget.ViewDef {
 
-    interface Driver extends UiCommonEditorDriver<ProviderModel, ProviderPopupView> {}
+    interface Driver extends UiCommonEditorDriver<ProviderModel, ProviderPopupView> { }
 
     private final Driver driver = GWT.create(Driver.class);
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/qos/HostNetworkQosWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/qos/HostNetworkQosWidget.java
index 7fc24124a9e..6258da09d4c 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/qos/HostNetworkQosWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/qos/HostNetworkQosWidget.java
@@ -31,17 +31,17 @@ interface WidgetIdHandler extends ElementIdHandler<HostNetworkQosWidget> {
     EnableableFormLabel qosOutLabel;
 
     @UiField(provided = true)
-    @Path(value="outAverageLinkshare.entity")
+    @Path(value = "outAverageLinkshare.entity")
     @WithElementId
     StringEntityModelTextBoxEditor outAverageLinkshare;
 
     @UiField(provided = true)
-    @Path(value="outAverageUpperlimit.entity")
+    @Path(value = "outAverageUpperlimit.entity")
     @WithElementId
     StringEntityModelTextBoxEditor outAverageUpperlimit;
 
     @UiField(provided = true)
-    @Path(value="outAverageRealtime.entity")
+    @Path(value = "outAverageRealtime.entity")
     @WithElementId
     StringEntityModelTextBoxEditor outAverageRealtime;
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java
index a20841cce3a..da3861d1a16 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/scheduling/AffinityGroupPopupView.java
@@ -62,18 +62,18 @@ interface ViewIdHandler extends ElementIdHandler<AffinityGroupPopupView> {
     EntityModelWidgetWithInfo priorityEditorWithInfo;
 
     @Path(value = "vmAffinityRule.selectedItem")
-    @UiField(provided=true)
+    @UiField(provided = true)
     ListModelListBoxEditor<EntityAffinityRule> vmAffinityRuleEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     InfoIcon vmAffinityRuleEditorInfoIcon;
 
     @Path(value = "vmAffinityEnforcing.entity")
     @WithElementId("vmAffinityEnforcing")
-    @UiField(provided=true)
+    @UiField(provided = true)
     EntityModelCheckBoxEditor vmAffinityEnforcingEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     InfoIcon vmAffinityEnforcingEditorInfoIcon;
 
     @UiField
@@ -81,18 +81,18 @@ interface ViewIdHandler extends ElementIdHandler<AffinityGroupPopupView> {
     EnableableFormLabel vmAffinityEnforcingEditorLabel;
 
     @Path(value = "hostAffinityRule.selectedItem")
-    @UiField(provided=true)
+    @UiField(provided = true)
     ListModelListBoxEditor<EntityAffinityRule> hostAffinityRuleEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     InfoIcon hostAffinityRuleEditorInfoIcon;
 
     @Path(value = "hostAffinityEnforcing.entity")
     @WithElementId("hostAffinityEnforcing")
-    @UiField(provided=true)
+    @UiField(provided = true)
     EntityModelCheckBoxEditor hostAffinityEnforcingEditor;
 
-    @UiField(provided=true)
+    @UiField(provided = true)
     InfoIcon hostAffinityEnforcingEditorInfoIcon;
 
     @UiField
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
index 41d6e3df4f1..8c1d372efff 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/GlusterStorageView.java
@@ -85,7 +85,7 @@ public GlusterStorageView() {
     }
 
     void initEditors() {
-        linkGlusterVolumeEditor =  new EntityModelCheckBoxEditor(Align.RIGHT);
+        linkGlusterVolumeEditor = new EntityModelCheckBoxEditor(Align.RIGHT);
         glusterVolumesEditor = new ListModelListBoxEditor<>(new NullSafeRenderer<GlusterVolumeEntity>() {
             @Override
             protected String renderNullSafe(GlusterVolumeEntity glusterVolume) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
index 616408206a5..1ed4ffb6bea 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ImportExportImagePopupView.java
@@ -196,7 +196,7 @@ public void setMessage(String message) {
 
         messagePanel.setVisible(message != null && !message.isEmpty());
         messagePanel.clear();
-        if(message != null) {
+        if (message != null) {
             messagePanel.add(new Label(message));
         }
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ManagedBlockStorageView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ManagedBlockStorageView.java
index 95f5c1d3ff3..532d936c800 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ManagedBlockStorageView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/ManagedBlockStorageView.java
@@ -81,6 +81,6 @@ public void cleanup() {
     }
 
     @Override
-    public void focus() {}
+    public void focus() { }
 
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java
index 0d0f3af23b7..7b2d56a9ba8 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmPopupView.java
@@ -58,7 +58,7 @@ public void edit(final RegisterVmModel model) {
     }
 
     private void addBadMacsValidationListener(RegisterVmModel model) {
-        for(RegisterVmData vmData : model.getEntities().getItems()) {
+        for (RegisterVmData vmData : model.getEntities().getItems()) {
             vmData.getBadMacsExist().getEntityChangedEvent().addListener((ev, sender, args) -> refreshEntityTable());
         }
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java
index d56b43ca6a8..beecbcb26b7 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportCloneDialogPopupView.java
@@ -95,7 +95,7 @@ public void edit(ImportCloneModel object) {
             suffixEditor.setLabel(constants.cloneImportSuffixVm());
         } else {
             dialogLabelEditor.setText(constants.sameTemplateNameExists()
-                    + " (" + ((ImportTemplateData) object.getEntity()).getTemplate().getName() + ")");//$NON-NLS-1$ //$NON-NLS-2$
+                    + " (" + ((ImportTemplateData) object.getEntity()).getTemplate().getName() + ")"); //$NON-NLS-1$ //$NON-NLS-2$
             cloneEditor.setLabel(constants.cloneImportTemplate());
             suffixEditor.setLabel(constants.cloneImportSuffixTemplate());
         }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmGeneralSubTabView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmGeneralSubTabView.java
index c988b6b099b..0df8b724049 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmGeneralSubTabView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmGeneralSubTabView.java
@@ -16,7 +16,7 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.ui.Widget;
 
-public class ImportVmGeneralSubTabView  extends AbstractSubTabFormView<VM, ImportVmModel, VmImportGeneralModel> {
+public class ImportVmGeneralSubTabView extends AbstractSubTabFormView<VM, ImportVmModel, VmImportGeneralModel> {
 
     interface ViewUiBinder extends UiBinder<Widget, ImportVmGeneralSubTabView> {
         ViewUiBinder uiBinder = GWT.create(ViewUiBinder.class);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
index 78dddf5ee2e..1a5f60766b2 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
@@ -168,7 +168,7 @@ private Widget createCpuType() {
     private void updateCpuTypeInfo(WidgetWithInfo widgetWithInfo) {
         if (getModel().getCpuVerb() != null) {
             widgetWithInfo.setIconVisible(true);
-            String cpuVerb = getModel().getCpuVerb().replace(",", ", ");//$NON-NLS-1$ //$NON-NLS-2$
+            String cpuVerb = getModel().getCpuVerb().replace(",", ", "); //$NON-NLS-1$ //$NON-NLS-2$
             widgetWithInfo.setIconTooltipText(messages.clusterCpuTypeInfo(cpuVerb));
         } else {
             widgetWithInfo.setIconVisible(false);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java
index 621b337c8c1..591b49ef024 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/SubTabClusterServiceView.java
@@ -139,7 +139,7 @@ public String getText(GlusterServerService entity) {
         servicesTable.addColumn(new AbstractEnumColumn<EntityModel, GlusterServiceStatus>() {
             @Override
             protected GlusterServiceStatus getRawValue(EntityModel object) {
-                return ((GlusterServerService)object.getEntity()).getStatus();
+                return ((GlusterServerService) object.getEntity()).getStatus();
             }
         }, constants.statusService());
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
index 632ecb1e85c..f55f12fe357 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeBrickView.java
@@ -74,7 +74,7 @@ public String getValue(GlusterBrickEntity brick) {
             @Override
             public String getValue(GlusterBrickEntity brick) {
                 String qualifiedName = brick.getQualifiedName();
-                if(brick.getIsArbiter()){
+                if (brick.getIsArbiter()) {
                     qualifiedName += " (" + constants.arbiter() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
                 }
                 return qualifiedName;
@@ -89,7 +89,7 @@ public String getValue(GlusterBrickEntity brick) {
             public BrickProperties getValue(GlusterBrickEntity object) {
                 return object.getBrickProperties();
             }
-        }, constants.volumeCapacity(), "100px");//$NON-NLS-1$
+        }, constants.volumeCapacity(), "100px"); //$NON-NLS-1$
 
         BrickHealInfoColumn healInfoColumn = new BrickHealInfoColumn();
         getTable().addColumn(healInfoColumn, constants.healInfo(), "110px"); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
index 47a85de0aa8..85b9a14804c 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/gluster/SubTabVolumeGeneralView.java
@@ -114,7 +114,7 @@ public SubTabVolumeGeneralView(DetailModelProvider<VolumeListModel, VolumeGenera
         redundancyCountFormItem = new FormItem(constants.redundancyCount(), redundancyCount, 9, 0);
         formBuilder.addFormItem(redundancyCountFormItem);
 
-        volumeCapacityDetailsLabel.setWidth("275px");//$NON-NLS-1$
+        volumeCapacityDetailsLabel.setWidth("275px"); //$NON-NLS-1$
         formBuilder.addFormItem(new FormItem(constants.volumeCapacityStatistics(), volumeCapacityDetailsLabel, 10, 0));
 
         getDetailModel().getPropertyChangedEvent().addListener((ev, sender, args) -> {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/HostGeneralSubTabView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/HostGeneralSubTabView.java
index 686e130a31e..22ceaf6cf10 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/HostGeneralSubTabView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/HostGeneralSubTabView.java
@@ -270,7 +270,7 @@ private void populateGeneralFormPanel(boolean virtSupported) {
         generalFormBuilder.setRelativeColumnWidth(1, 4);
         generalFormBuilder.setRelativeColumnWidth(2, 5);
 
-        generalFormBuilder.addFormItem(new FormItem(constants.ipHost(), hostName,  0, 0).withAutoPlacement());
+        generalFormBuilder.addFormItem(new FormItem(constants.ipHost(), hostName, 0, 0).withAutoPlacement());
         generalFormBuilder.addFormItem(new FormItem(constants.spmPriority(), spmPriority, 0, virtSupported).withAutoPlacement());
         generalFormBuilder.addFormItem(new FormItem(constants.activeVmsHostGeneral(), activeVms, 0, virtSupported).withAutoPlacement());
         generalFormBuilder.addFormItem(new FormItem(constants.logicalCores(), logicalCores, 0).withAutoPlacement());
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
index 40d6c1c44b1..ba10fc4b1c3 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGlusterStorageDevicesView.java
@@ -99,7 +99,7 @@ public String getValue(StorageDevice object) {
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 
     @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java
index dc0d1cf53fa..bd3d2e1da87 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostVmView.java
@@ -117,14 +117,14 @@ public String getValue(VM object) {
         attachmentToCurHostColumn = new AbstractTextColumn<VM>() {
             @Override
             public String getValue(VM object) {
-                Guid vdsId = getDetailModel().getEntity() != null? getDetailModel().getEntity().getId() : null;
+                Guid vdsId = getDetailModel().getEntity() != null ? getDetailModel().getEntity().getId() : null;
                 // if no hosts is set for the model yet, return an empty status.
                 if (vdsId == null) {
                     return constants.empty();
                 }
                 boolean pinned = object.getDedicatedVmForVdsList() != null ? object.getDedicatedVmForVdsList().contains(vdsId) : false;
-                boolean running = object.getRunOnVds() != null? object.getRunOnVds().equals(vdsId) : false;
-                return pinned ? (running? constants.runningAndPinnedOnCurHost() : constants.pinnedToCurHost()) : constants.runningOnCurHost();
+                boolean running = object.getRunOnVds() != null ? object.getRunOnVds().equals(vdsId) : false;
+                return pinned ? (running ? constants.runningAndPinnedOnCurHost() : constants.pinnedToCurHost()) : constants.runningOnCurHost();
             }
         };
         attachmentToCurHostColumn.makeSortable();
@@ -200,7 +200,7 @@ protected List<Integer> getProgressValues(VM object) {
             }
         }, constants.networkVm(), "120px"); //$NON-NLS-1$
 
-        VmStatusColumn statusColumn = new VmStatusColumn(() ->  {
+        VmStatusColumn statusColumn = new VmStatusColumn(() -> {
             VDS host = getDetailModel().getEntity();
             return host != null ? host.getId() : null;
         });
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
index e04bc82d8ee..b604ea8ecd3 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkHostView.java
@@ -119,7 +119,7 @@ public String getValue(PairQueryable<VdsNetworkInterface, VDS> object) {
         }
     };
 
-    AbstractSafeHtmlColumn<PairQueryable<VdsNetworkInterface, VDS>> nicStatusColumn = new AbstractSafeHtmlColumn<PairQueryable<VdsNetworkInterface, VDS>>(){
+    AbstractSafeHtmlColumn<PairQueryable<VdsNetworkInterface, VDS>> nicStatusColumn = new AbstractSafeHtmlColumn<PairQueryable<VdsNetworkInterface, VDS>>() {
 
         @Override
         public SafeHtml getValue(PairQueryable<VdsNetworkInterface, VDS> object) {
@@ -200,7 +200,7 @@ public String getValue(PairQueryable<VdsNetworkInterface, VDS> object) {
     private final AbstractTextColumn<PairQueryable<VdsNetworkInterface, VDS>> nicRxColumn = new AbstractRxTxRateColumn<PairQueryable<VdsNetworkInterface, VDS>>() {
         @Override
         protected Double getRate(PairQueryable<VdsNetworkInterface, VDS> object) {
-            if (object.getFirst() != null){
+            if (object.getFirst() != null) {
                 return object.getFirst().getStatistics().getReceiveRate();
             }
             return null;
@@ -219,9 +219,9 @@ protected Double getSpeed(PairQueryable<VdsNetworkInterface, VDS> object) {
     private final AbstractTextColumn<PairQueryable<VdsNetworkInterface, VDS>> nicTxColumn = new AbstractRxTxRateColumn<PairQueryable<VdsNetworkInterface, VDS>>() {
         @Override
         protected Double getRate(PairQueryable<VdsNetworkInterface, VDS> object) {
-            if (object.getFirst() != null){
+            if (object.getFirst() != null) {
                 return object.getFirst().getStatistics().getTransmitRate();
-            }else{
+            } else {
                 return null;
             }
         }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
index 0d0b8e792c0..e56f80c42b1 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderGeneralView.java
@@ -69,7 +69,7 @@ public SubTabProviderGeneralView(DetailModelProvider<ProviderListModel, Provider
         // Build a form using the FormBuilder
         formBuilder = new FormBuilder(formPanel, 1, 4);
 
-        formBuilder.addFormItem(new FormItem(constants.nameProvider(), name, 0, 0),  2, 10);
+        formBuilder.addFormItem(new FormItem(constants.nameProvider(), name, 0, 0), 2, 10);
         formBuilder.addFormItem(new FormItem(constants.typeProvider(), type, 1, 0), 2, 10);
         formBuilder.addFormItem(new FormItem(constants.descriptionProvider(), description, 2, 0), 2, 10);
         formBuilder.addFormItem(new FormItem(constants.urlProvider(), url, 3, 0), 2, 10);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java
index fd5a1fb20a1..5a924616df3 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStorageDiskView.java
@@ -88,7 +88,7 @@ void initTable(StorageDomain storageDomain) {
 
         getTable().ensureColumnVisible(sizeColumn, constants.provisionedSizeDisk(), true, "100px"); //$NON-NLS-1$
 
-        getTable().ensureColumnVisible(actualSizeColumn, constants.sizeDisk(), isDataStorage,   "130px"); //$NON-NLS-1$
+        getTable().ensureColumnVisible(actualSizeColumn, constants.sizeDisk(), isDataStorage, "130px"); //$NON-NLS-1$
 
         getTable().ensureColumnVisible(allocationColumn, constants.allocationDisk(), isDataStorage, "130px"); //$NON-NLS-1$
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStoragePermissionView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStoragePermissionView.java
index 29a6474a109..a26c2c1eaff 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStoragePermissionView.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/storage/SubTabStoragePermissionView.java
@@ -15,7 +15,7 @@
 import com.google.gwt.event.shared.EventBus;
 import com.google.inject.Inject;
 
-public class SubTabStoragePermissionView extends AbstractSubTabPermissionsView<StorageDomain, StorageListModel,  PermissionListModel<StorageDomain>>
+public class SubTabStoragePermissionView extends AbstractSubTabPermissionsView<StorageDomain, StorageListModel, PermissionListModel<StorageDomain>>
         implements SubTabStoragePermissionPresenter.ViewDef {
 
     interface ViewIdHandler extends ElementIdHandler<SubTabStoragePermissionView> {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/alert/NotificationListWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/alert/NotificationListWidget.java
index 18b14478af2..9f05a860370 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/alert/NotificationListWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/alert/NotificationListWidget.java
@@ -255,7 +255,7 @@ public void setDataToggleInfo(Toggle toggle, String parentId) {
     }
 
     public void setContainerHeight(int height) {
-        this.containerHeight  = height;
+        this.containerHeight = height;
         eventPanelBody.getElement().getStyle().setProperty(MAX_HEIGHT, containerHeight + Unit.PX.getType());
         eventPanelBody.getElement().getStyle().setOverflowY(Overflow.AUTO);
     }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/autocomplete/SearchSuggestBox.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/autocomplete/SearchSuggestBox.java
index 768c46e551b..29487547b8e 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/autocomplete/SearchSuggestBox.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/autocomplete/SearchSuggestBox.java
@@ -287,7 +287,7 @@ public SearchSuggestBox(SuggestOracle suggestOracle) {
     }
 
     public void hideSuggestion() {
-        ((SearchSuggestionDisplay)getSuggestionDisplay()).hideSuggestions();
+        ((SearchSuggestionDisplay) getSuggestionDisplay()).hideSuggestions();
     }
 
     @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/errata/ErrataFilterPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/errata/ErrataFilterPanel.java
index eb62fc0cf2b..14c0edc3822 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/errata/ErrataFilterPanel.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/errata/ErrataFilterPanel.java
@@ -73,7 +73,7 @@ public void addValueChangeHandler(final ValueChangeHandler<ErrataFilterValue> ha
                 ErrataFilterValue value = new ErrataFilterValue(securityCheckbox.isActive(),
                         bugCheckbox.isActive(), enhancementCheckbox.isActive());
 
-                handler.onValueChange(new ValueChangeEvent<ErrataFilterValue>(value) {});
+                handler.onValueChange(new ValueChangeEvent<ErrataFilterValue>(value) { });
             });
         };
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentWidget.java
index b5bc2bb5603..1af0d8c3db1 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentWidget.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentWidget.java
@@ -259,7 +259,7 @@ public void setEnabled(boolean enabled) {
         for (int i = 0; i < concurrentPanel.getWidgetCount(); i++) {
             IsWidget widget = concurrentPanel.getWidget(i);
             if (widget instanceof HasEnabled) {
-                ((HasEnabled)widget).setEnabled(enabled);
+                ((HasEnabled) widget).setEnabled(enabled);
             }
         }
         editFenceAgent.setEnabled(enabled);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentsEditor.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentsEditor.java
index d8b5cde5e4a..d24e7025d1a 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentsEditor.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/FenceAgentsEditor.java
@@ -117,7 +117,7 @@ protected FenceAgentWidget createWidget(final FenceAgentModel model) {
             if (sender instanceof ListModel) {
                 @SuppressWarnings("unchecked")
                 ListModel<String> sourceListModel = (ListModel<String>) sender;
-                if(sourceListModel.getItems() != null && !sourceListModel.getItems().isEmpty()
+                if (sourceListModel.getItems() != null && !sourceListModel.getItems().isEmpty()
                         && sourceListModel.getItems() instanceof List) {
                     List<String> options = (List<String>) sourceListModel.getItems();
                     if (!options.get(0).equals(sourceListModel.getSelectedItem())) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceBondedListViewItem.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceBondedListViewItem.java
index 66e17ddec06..ce16b5c19a8 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceBondedListViewItem.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceBondedListViewItem.java
@@ -40,7 +40,7 @@
 
 public class HostNetworkInterfaceBondedListViewItem extends HostNetworkInterfaceListViewItem {
 
-    private static final String INVALID_AD_PARTNER_MAC = "00:00:00:00:00:00";//$NON-NLS-1$
+    private static final String INVALID_AD_PARTNER_MAC = "00:00:00:00:00:00"; //$NON-NLS-1$
     private static final int MAX_SLAVES = 1000;
 
     private static final ApplicationTemplates templates = AssetProvider.getTemplates();
@@ -93,7 +93,7 @@ private Container createSlavesContainer() {
         Container container = createItemContainerPanel(content);
 
         CellTable<HostInterface> slavesTable = new CellTable<>(MAX_SLAVES,
-                (Resources)GWT.create(CellTablePopupTableResources.class));
+                (Resources) GWT.create(CellTablePopupTableResources.class));
 
         slavesTable.getElement().addClassName(Styles.TABLE);
         slavesTable.getElement().addClassName(PatternflyConstants.PF_TABLE_STRIPED);
@@ -206,7 +206,7 @@ protected IsWidget createBondInterfaceStatusPanel(boolean isUp) {
                 message.append(constants.bondInMode4HasNoPartnerMac());
             }
             if (!isAdPartnerMacValid && !isAdAggregatorIdValid) {
-                message.append(" ");//$NON-NLS-1$
+                message.append(" "); //$NON-NLS-1$
             }
             if (!isAdAggregatorIdValid) {
                 message.append(constants.bondInMode4HasInvalidAggregatorId());
@@ -248,10 +248,10 @@ private SafeHtml createBondTooltipMessage(HostInterfaceLineModel lineModel, Inte
         boolean isBond4 = BondMode.BOND4.equals(BondMode.parseBondMode(bond.getBondOptions()));
 
         if (InterfaceStatus.UP.equals(interfaceStatus) && isBond4) {
-            bondProperties.append("\n").append(createActiveBondTooltipMessage(bond, lineModel));//$NON-NLS-1$
+            bondProperties.append("\n").append(createActiveBondTooltipMessage(bond, lineModel)); //$NON-NLS-1$
         }
         if (bond.getActiveSlave() != null && bond.getActiveSlave().length() > 0) {
-            bondProperties.append("\n").append(messages.bondActiveSlave(bond.getActiveSlave()));//$NON-NLS-1$
+            bondProperties.append("\n").append(messages.bondActiveSlave(bond.getActiveSlave())); //$NON-NLS-1$
         }
         return new SafeHtmlBuilder().appendEscapedLines(bondProperties.toString()).toSafeHtml();
     }
@@ -268,10 +268,10 @@ private String createActiveBondTooltipMessage(Bond bond, HostInterfaceLineModel
             String nicAggregatorId = Objects.toString(nic.getInterface().getAdAggregatorId(), "");
             bondProperties.add(messages.bondSlaveAdAggregatorId(nicName, nicAggregatorId));
         }
-        return String.join("\n", bondProperties);//$NON-NLS-1$
+        return String.join("\n", bondProperties); //$NON-NLS-1$
     }
 
-    private boolean isAdPartnerMacValid(Bond bond){
+    private boolean isAdPartnerMacValid(Bond bond) {
         String partnerMac = bond.getAdPartnerMac();
         boolean isAdPartnerMacEmpty = partnerMac == null || partnerMac.isEmpty() || partnerMac.equals(INVALID_AD_PARTNER_MAC);
         boolean isIfcUp = InterfaceStatus.UP.equals(bond.getStatistics().getStatus());
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceListViewItem.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceListViewItem.java
index a8a33654ef7..09b4741e7e3 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceListViewItem.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/HostNetworkInterfaceListViewItem.java
@@ -300,7 +300,7 @@ private Container createLogicalNetworkContainer() {
         Container container = createItemContainerPanel(content);
 
         CellTable<HostVLan> logicalNetworkTable = new CellTable<>(MAX_LOGICAL_NETWORKS,
-                (Resources)GWT.create(CellTablePopupTableResources.class));
+                (Resources) GWT.create(CellTablePopupTableResources.class));
         logicalNetworkTable.getElement().addClassName(Styles.TABLE);
         logicalNetworkTable.getElement().addClassName(PatternflyConstants.PF_TABLE_STRIPED);
         logicalNetworkTable.getElement().addClassName(PatternflyConstants.PF_TABLE_BORDERED);
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
index 2e1e29b131c..6242404a950 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/host/InterfaceStatusImage.java
@@ -16,7 +16,7 @@ public InterfaceStatusImage(InterfaceStatus status) {
         setResource(getResource(status));
     }
 
-    public static ImageResource getResource(InterfaceStatus status){
+    public static ImageResource getResource(InterfaceStatus status) {
         switch (status) {
         case UP:
             return resources.upImage();
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/ValueListLabel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/ValueListLabel.java
index 45976c9fae7..ca4a230fcec 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/ValueListLabel.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/label/ValueListLabel.java
@@ -20,7 +20,7 @@ public ValueListLabel(final String delimiter, final Renderer<T> itemRenderer) {
             public String render(List<T> values) {
                 StringBuilder builder = new StringBuilder();
                 if (values != null) {
-                    for(T value: values) {
+                    for (T value: values) {
                         if (value != values.get(0)) {
                             builder.append(delimiter);
                         }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/HumanReadableTimeRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/HumanReadableTimeRenderer.java
index 3e37ee81e6a..c2a45333733 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/HumanReadableTimeRenderer.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/HumanReadableTimeRenderer.java
@@ -12,23 +12,23 @@ public String render(Double time) {
         StringBuilder formatTime = new StringBuilder();
 
         if ( time > SECONDS_IN_A_DAY) {
-            formatTime.append((int) (time/SECONDS_IN_A_DAY));
-            formatTime.append(" days " );//$NON-NLS-1$
+            formatTime.append((int) (time / SECONDS_IN_A_DAY));
+            formatTime.append(" days " ); //$NON-NLS-1$
             time = time % SECONDS_IN_A_DAY;
         }
-        if( time > SECONDS_IN_AN_HOUR ) {
-            formatTime.append((int) (time/SECONDS_IN_AN_HOUR));
-            formatTime.append(" h ");//$NON-NLS-1$
+        if ( time > SECONDS_IN_AN_HOUR ) {
+            formatTime.append((int) (time / SECONDS_IN_AN_HOUR));
+            formatTime.append(" h "); //$NON-NLS-1$
             time = time % SECONDS_IN_AN_HOUR;
         }
-        if( time > SECONDS_IN_A_MINUTE) {
-            formatTime.append((int) (time/SECONDS_IN_A_MINUTE));
-            formatTime.append(" m ");//$NON-NLS-1$
+        if ( time > SECONDS_IN_A_MINUTE) {
+            formatTime.append((int) (time / SECONDS_IN_A_MINUTE));
+            formatTime.append(" m "); //$NON-NLS-1$
             time = time % SECONDS_IN_A_MINUTE;
         }
-        if(time >= 0){
+        if (time >= 0) {
             formatTime.append(time.intValue());
-            formatTime.append(" s ");//$NON-NLS-1$
+            formatTime.append(" s "); //$NON-NLS-1$
         }
 
         return formatTime.toString();
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java
index 714f7572fba..de5f4d94603 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/RebalanceFileSizeRenderer.java
@@ -16,12 +16,12 @@ public class RebalanceFileSizeRenderer<T extends Number> extends AbstractRendere
 
     @Override
     public String render(T size) {
-        Pair<SizeUnit, Double>  sizePair = SizeConverter.autoConvert(size.longValue(), SizeUnit.BYTES);
+        Pair<SizeUnit, Double> sizePair = SizeConverter.autoConvert(size.longValue(), SizeUnit.BYTES);
         return messages.sizeUnitString(formatSize(sizePair.getSecond()),
                 EnumTranslator.getInstance().translate(sizePair.getFirst()));
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
index 278a5d4316f..0408afb53ae 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/renderer/VolumeCapacityRenderer.java
@@ -32,6 +32,6 @@ public String render(T size) {
     }
 
     public String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
index b733dc9b810..cafe6de2e75 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/HostStatusCell.java
@@ -195,7 +195,7 @@ private SafeHtml getAlertTooltipText(VDS vds) {
         if (cpuFlagsMissing(vds)) {
             appendLine(sb,
                     messages.hostHasMissingCpuFlagsTooltipAlert(
-                            String.join(", ", vds.getCpuFlagsMissing())));//$NON-NLS-1$);
+                            String.join(", ", vds.getCpuFlagsMissing()))); //$NON-NLS-1$);
         }
 
         return sb.toSafeHtml();
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityCompositeCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityCompositeCell.java
index 89d1d4c5e9b..5b632427490 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityCompositeCell.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityCompositeCell.java
@@ -29,15 +29,15 @@ public Set<String> getConsumedEvents() {
         if (hasCells == null) {
             return set;
         }
-        for(HasCell<T, ?> currentHasCell : hasCells) {
-            if(currentHasCell instanceof Column) {
+        for (HasCell<T, ?> currentHasCell : hasCells) {
+            if (currentHasCell instanceof Column) {
                 Set<String> consumedEvents = ((Column) currentHasCell).getCell().getConsumedEvents();
-                if(consumedEvents != null) {
+                if (consumedEvents != null) {
                     set.addAll(consumedEvents);
                 }
             }
-            if(currentHasCell instanceof Cell) {
-                set.addAll(((Cell)currentHasCell).getConsumedEvents());
+            if (currentHasCell instanceof Cell) {
+                set.addAll(((Cell) currentHasCell).getConsumedEvents());
             }
         }
         return set;
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java
index d306bdfc483..2fe96b325f5 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/cell/VolumeActivityStatusCell.java
@@ -24,7 +24,7 @@ public class VolumeActivityStatusCell<T extends GlusterTaskSupport> extends Abst
     public void render(Context context, T value, SafeHtmlBuilder sb, String id) {
         // Nothing to render if no task is provided, or if task status is empty:
         if (value == null || value.getAsyncTask() == null || value.getAsyncTask().getType() == null
-                ||value.getAsyncTask().getStatus() == null) {
+                || value.getAsyncTask().getStatus() == null) {
             return;
         }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
index 68e79b82b49..482f96f1504 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/AbstractLineChartProgressBarColumn.java
@@ -127,7 +127,7 @@ private int getChartWidth() {
 
         if (actualWidth.indexOf("px") == -1) { //$NON-NLS-1$
             // this is a developer mistake - fail with an exception to simplify debugging
-            throw new IllegalArgumentException("The size is expected to be in PX in a format: 100px but it was: '"  + actualWidth + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+            throw new IllegalArgumentException("The size is expected to be in PX in a format: 100px but it was: '" + actualWidth + "'"); //$NON-NLS-1$ //$NON-NLS-2$
         }
 
         String withoutPx = actualWidth.substring(0, actualWidth.indexOf("px")); //$NON-NLS-1$
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
index ca6d8cedf4c..a999876d085 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/BrickCapacityCell.java
@@ -9,7 +9,7 @@ public class BrickCapacityCell<P extends BrickProperties> extends GlusterCapacit
 
     @Override
     public void render(Context context, BrickProperties value, SafeHtmlBuilder sb, String id) {
-        if(value != null) {
+        if (value != null) {
             setFreeSize(value.getFreeSize());
             setTotalSize(value.getTotalSize());
             setUsedSize(value.getTotalSize() - value.getFreeSize());
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ClusterUpgradeStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ClusterUpgradeStatusColumn.java
index 17082e982e4..eb5f10e9ece 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ClusterUpgradeStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ClusterUpgradeStatusColumn.java
@@ -71,7 +71,7 @@ public Integer getProgressValue(Cluster object) {
 
         @Override
         protected String getStyle() {
-            return "engine-progress-box-migration";//$NON-NLS-1$
+            return "engine-progress-box-migration"; //$NON-NLS-1$
         }
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ColumnResizeTableLineChartProgressBar.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ColumnResizeTableLineChartProgressBar.java
index b0fd2d3ad1c..8a85709a21b 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ColumnResizeTableLineChartProgressBar.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ColumnResizeTableLineChartProgressBar.java
@@ -4,7 +4,7 @@
 
 import org.ovirt.engine.ui.common.widget.table.AbstractActionTable;
 
-public abstract class ColumnResizeTableLineChartProgressBar<E, T> extends AbstractLineChartProgressBarColumn<T>{
+public abstract class ColumnResizeTableLineChartProgressBar<E, T> extends AbstractLineChartProgressBarColumn<T> {
 
     private AbstractActionTable<E, T> table;
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
index e311a967b8f..b13c02403e0 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/GlusterCapacityCell.java
@@ -19,7 +19,7 @@
 import com.google.gwt.safehtml.shared.SafeHtml;
 import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
 
-public abstract class GlusterCapacityCell<P extends Serializable> extends AbstractCell<P>{
+public abstract class GlusterCapacityCell<P extends Serializable> extends AbstractCell<P> {
 
     protected ApplicationTemplates templates = AssetProvider.getTemplates();
     protected ApplicationMessages messages = AssetProvider.getMessages();
@@ -31,7 +31,7 @@ public abstract class GlusterCapacityCell<P extends Serializable> extends Abstra
     private SizeUnit inUnit;
 
     protected String getSizeString(Double size, SizeUnit inUnit) {
-        if(size == null) {
+        if (size == null) {
             return constants.notAvailableLabel();
         } else {
             Pair<SizeUnit, Double> sizeWithUnits = SizeConverter.autoConvert(size.longValue(), inUnit);
@@ -41,26 +41,26 @@ protected String getSizeString(Double size, SizeUnit inUnit) {
     }
 
     private String formatSize(double size) {
-        return NumberFormat.getFormat("#.##").format(size);//$NON-NLS-1$
+        return NumberFormat.getFormat("#.##").format(size); //$NON-NLS-1$
     }
 
     protected String getProgressText(Double freeSize, Double totalSize) {
-        if(freeSize == null || totalSize == null) {
-            return "?";//$NON-NLS-1$
+        if (freeSize == null || totalSize == null) {
+            return "?"; //$NON-NLS-1$
         } else {
-            return (int) getPercentageUsage(freeSize, totalSize) + "%";//$NON-NLS-1$
+            return (int) getPercentageUsage(freeSize, totalSize) + "%"; //$NON-NLS-1$
         }
     }
 
     protected int getProgressValue(Double freeSize, Double totalSize) {
-        if(freeSize == null || totalSize == null) {
+        if (freeSize == null || totalSize == null) {
             return 0;
         }
         return (int) Math.round(getPercentageUsage(freeSize, totalSize));
     }
 
     private double getPercentageUsage(Double freeSize, Double totalSize) {
-        return ((totalSize - freeSize)  * 100 )/totalSize;
+        return ((totalSize - freeSize) * 100 ) / totalSize;
     }
 
     protected void setFreeSize(Double freeSize) {
@@ -88,7 +88,7 @@ public void clearAll() {
 
     @Override
     public void render(Context context, Serializable value, SafeHtmlBuilder sb, String id) {
-        if(value == null) {
+        if (value == null) {
             clearAll();
         }
         SafeStylesBuilder stylesBuilder = new SafeStylesBuilder();
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostAdditionalStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostAdditionalStatusColumn.java
index a56b3d4dcd6..5690f17b454 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostAdditionalStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostAdditionalStatusColumn.java
@@ -54,7 +54,7 @@ private Map<SafeHtml, String> getSafeHtmlStringMap(VDS object) {
         if (host.isHostedEngineHost()) {
             imagesToText.put(getImageSafeHtml(resources.mgmtNetwork()), constants.hostedEngineVmTooltip());
         } else if (host.getHighlyAvailableIsActive()) {
-            if(host.getHighlyAvailableScore() > 0) {
+            if (host.getHighlyAvailableScore() > 0) {
                 imagesToText.put(getImageSafeHtml(resources.haActive()), constants.haActiveTooltip());
             } else {
                 imagesToText.put(getImageSafeHtml(resources.haActiveZeroHaScore()),
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
index 54a6ba73a51..638f5964b36 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/HostStatusColumn.java
@@ -16,11 +16,11 @@ public HostStatusColumn() {
 
     @Override
     public VDS getValue(S object) {
-        if (object instanceof VDS){
+        if (object instanceof VDS) {
             return (VDS) object;
         }
-        if (object instanceof PairQueryable){
-            if (((PairQueryable) object).getSecond() instanceof VDS){
+        if (object instanceof PairQueryable) {
+            if (((PairQueryable) object).getSecond() instanceof VDS) {
                 return (VDS) ((PairQueryable) object).getSecond();
             }
         }
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
index b08ee87fd29..331c8ad9237 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/ImportProgressColumn.java
@@ -22,7 +22,7 @@ public SafeHtml getValue(VM object) {
 
     @Override
     protected String getStyle() {
-        return "engine-progress-box-migration";//$NON-NLS-1$
+        return "engine-progress-box-migration"; //$NON-NLS-1$
     }
 
     @Override
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MigrationProgressColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MigrationProgressColumn.java
index 7e56f4aec84..374d79863de 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MigrationProgressColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/MigrationProgressColumn.java
@@ -45,7 +45,7 @@ public boolean migrating(VM vm) {
 
     @Override
     protected String getStyle() {
-        return "engine-progress-box-migration";//$NON-NLS-1$
+        return "engine-progress-box-migration"; //$NON-NLS-1$
 
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
index 35cf0f2f22c..56a5f592595 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NetworkClusterStatusColumn.java
@@ -7,13 +7,13 @@
 
 import com.google.gwt.resources.client.ImageResource;
 
-public class NetworkClusterStatusColumn extends AbstractImageResourceColumn<PairQueryable<Cluster, NetworkCluster>>{
+public class NetworkClusterStatusColumn extends AbstractImageResourceColumn<PairQueryable<Cluster, NetworkCluster>> {
 
     private final NetworkStatusColumn networkStatusColumn = new NetworkStatusColumn();
 
     @Override
     public ImageResource getValue(PairQueryable<Cluster, NetworkCluster> object) {
-        if (object.getSecond() != null){
+        if (object.getSecond() != null) {
             return networkStatusColumn.getValue(object.getSecond());
         }
      return null;
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
index 024584cbff5..f37a00f02c7 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/QuotaUtilizationStatusColumn.java
@@ -20,9 +20,9 @@ public class QuotaUtilizationStatusColumn<Queryable> extends AbstractImageResour
     public ImageResource getValue(Queryable quota) {
         boolean quotaExceeded = false;
         if (quota instanceof QuotaStorage) {
-            quotaExceeded = getQuotaExceeded((QuotaStorage)quota);
+            quotaExceeded = getQuotaExceeded((QuotaStorage) quota);
         } else if (quota instanceof QuotaCluster) {
-            quotaExceeded = getQuotaExceeded((QuotaCluster)quota);
+            quotaExceeded = getQuotaExceeded((QuotaCluster) quota);
         } else {
             return null;
         }
@@ -34,9 +34,9 @@ public ImageResource getValue(Queryable quota) {
     public SafeHtml getTooltip(Queryable quota) {
         boolean quotaExceeded = false;
         if (quota instanceof QuotaStorage) {
-            quotaExceeded = getQuotaExceeded((QuotaStorage)quota);
+            quotaExceeded = getQuotaExceeded((QuotaStorage) quota);
         } else if (quota instanceof QuotaCluster) {
-            quotaExceeded = getQuotaExceeded((QuotaCluster)quota);
+            quotaExceeded = getQuotaExceeded((QuotaCluster) quota);
         }
 
         if (quotaExceeded) {
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusIconColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusIconColumn.java
index 19389dad3d9..9bf98466cf2 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusIconColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmStatusIconColumn.java
@@ -36,10 +36,10 @@ public VmStatusIconColumn() {
 
     @Override
     public VM getValue(T object) {
-        if (object instanceof VM){
-            return (VM)object;
+        if (object instanceof VM) {
+            return (VM) object;
         }
-        if (object instanceof PairQueryable && ((PairQueryable) object).getSecond() instanceof VM){
+        if (object instanceof PairQueryable && ((PairQueryable) object).getSecond() instanceof VM) {
             return ((PairQueryable<VmNetworkInterface, VM>) object).getSecond();
         }
         return null;
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
index f85ca33e101..fe27b7cf800 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java
@@ -87,7 +87,7 @@ private Map<SafeHtml, SafeHtml> getImagesToTooltipTextMap(VM vm) {
 
         if (configurationWillChangeAfterRestart(vm)) {
             Set<String> nextRunFields = vm.getNextRunChangedFields() != null ? vm.getNextRunChangedFields() : new HashSet<>();
-            if (clusterCpuChanged(vm) && !nextRunFields.contains("customCpuName")){ //$NON-NLS-1$
+            if (clusterCpuChanged(vm) && !nextRunFields.contains("customCpuName")) { //$NON-NLS-1$
                 nextRunFields.add("clusterCpuChange"); //$NON-NLS-1$
             }
             if (vm.isVnicsOutOfSync()) {
@@ -98,7 +98,7 @@ private Map<SafeHtml, SafeHtml> getImagesToTooltipTextMap(VM vm) {
         return res;
     }
 
-    private static boolean clusterCpuChanged(VM vm){
+    private static boolean clusterCpuChanged(VM vm) {
         return vm.isManaged()
                 && !vm.isHostedEngine()
                 && vm.isRunningOrPaused()
@@ -107,7 +107,7 @@ private static boolean clusterCpuChanged(VM vm){
                 && !Objects.equals(vm.getCpuName(), vm.getClusterCpuVerb());
     }
 
-    private static boolean configurationWillChangeAfterRestart(VM vm){
+    private static boolean configurationWillChangeAfterRestart(VM vm) {
         return clusterCpuChanged(vm) || vm.isNextRunConfigurationExists() || vm.isVnicsOutOfSync();
     }
 
diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityStatusColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityStatusColumn.java
index e2fbdc4fa88..e7693124007 100644
--- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityStatusColumn.java
+++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VolumeActivityStatusColumn.java
@@ -28,7 +28,7 @@ public SafeHtml getTooltip(T value) {
 
         // Nothing to render if no task is provided, or if task status is empty:
         if (value == null || value.getAsyncTask() == null || value.getAsyncTask().getType() == null
-                ||value.getAsyncTask().getStatus() == null) {
+                || value.getAsyncTask().getStatus() == null) {
             return null;
         }