Revize ba7a20a1

re #8176 removed comparators from controllers, added sorting to configuration manager

src/main/java/vldc/aswi/service/ConfigurationManagerImpl.java

@@ -17 +17 @@
 
 import javax.transaction.Transactional;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 @Service
@@ -59 +61 @@
     @Autowired
     private ParameterInConfigurationManager parameterInConfigurationManager;
 
+    /** Autowired assembly manager. */
+    @Autowired
+    private AssemblyManager assemblyManager;
+
     /**
      * Initialization setup for configuration manager.
      * Check if table "Konfigurace" exists.
@@ -103 +109 @@
      */
     @Override
     public Configuration getConfigurationById(Long id) {
-        return configurationRepository.getById(id);
+        Configuration configuration = configurationRepository.getById(id);
+        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
+        configuration.getParametersInConfiguration().sort(comparator);
+        return configuration;
     }
 
     /**
@@ -172 +181 @@
             // TODO: 04.05.2020 error message, user not authenticated
         }
         Configuration configuration = new Configuration();
-        Assembly assembly = assemblyRepository.getById(newConfiguration.getAssembly().getId());
+        Assembly assembly = assemblyManager.getAssemblyById(newConfiguration.getAssembly().getId());
+        Collections.sort(assembly.getParameters());
         configuration.setAssembly(assembly);
         configuration.setName(newConfiguration.getName());
         configuration.setTableName(newConfiguration.getTableName());
@@ -224 +234 @@
      * @return saved configuration
      */
     private Configuration editConfiguration(Configuration newConfiguration, Long id) {
-        Configuration configuration = configurationRepository.getById(id);
+        Configuration configuration = getConfigurationById(id);
         configuration.setName(newConfiguration.getName());
         configuration.setTableName(newConfiguration.getTableName());
 

src/main/java/vldc/aswi/web/controller/AssemblyController.java

@@ -145 +145 @@
             configuration.getParametersInConfiguration().add(parameterInConfiguration);
         }
 
-        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
-
         boolean isNotRemoveEmpty = false;
         modelMap.addAttribute("isNotRemoveEmpty", isNotRemoveEmpty);
         modelMap.addAttribute("configuration", configuration);
-        modelMap.addAttribute("comparator", comparator);
         modelMap.addAttribute("formAction", "/assembly?assemblyID=" + assembly.getId());
 
         return modelAndView;
@@ -256 +253 @@
      * @param modelMap ModelMap to which data is added.
      */
     private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
-        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
         initializeFields(newConfiguration);
         modelMap.addAttribute("configuration", newConfiguration);
-        modelMap.addAttribute("comparator", comparator);
         modelMap.addAttribute("formAction", "/assembly?assemblyID=" + newConfiguration.getAssembly().getId());
         modelAndView.setViewName("assembly");
     }

src/main/java/vldc/aswi/web/controller/ConfigurationController.java

@@ -100 +100 @@
         configuration.setParametersInConfiguration(parametersInConfiguration);
 
         initializeFields(configuration);
-        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
 
         modelMap.addAttribute("configuration", configuration);
-        modelMap.addAttribute("comparator", comparator);
         modelMap.addAttribute("formAction", "/configuration?configurationID=" + configuration.getId());
 
         modelMap.addAttribute(assemblySuccessName, successMsg);
@@ -273 +271 @@
      * @param modelMap ModelMap to which data is added.
      */
     private void addConfigurationDataIntoModelAndView(Configuration newConfiguration, ModelAndView modelAndView, ModelMap modelMap) {
-        Comparator<ParameterInConfiguration> comparator = Comparator.comparingInt(o -> o.getParameter().getParameterOrder());
         initializeFields(newConfiguration);
         modelMap.addAttribute("configuration", newConfiguration);
-        modelMap.addAttribute("comparator", comparator);
         modelMap.addAttribute("formAction", "/configuration?configurationID=" + newConfiguration.getAssembly().getId());
         modelAndView.setViewName("assembly");
     }