Revize 621e3fca

re #8144 #8143 #8148

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

@@ -5 +5 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
+import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.stereotype.Service;
 import vldc.aswi.dao.*;
 import vldc.aswi.dao.parameter.ParameterInConfigurationRepository;
@@ -59 +60 @@
     private ParameterInConfigurationManager parameterInConfigurationManager;
 
     /**
-     * Initialization setup for configuration manager. Check if configuration repository contains
-     * records and if not, initialize default values.
+     * Initialization setup for configuration manager.
+     * Check if table "Konfigurace" exists.
      */
     @EventListener(classes = {
             ContextRefreshedEvent.class
     })
-    @Order(1)
+    @Order(3)
     @Transactional
     public void setup() {
-        if (this.configurationRepository.count() == 0) {
-            log.info("No configuration present, creating items.");
-
+        try {
+            if (this.configurationRepository.count() == 0) {
+                // Just checking if table exists.
+            }
+        }
+        catch (InvalidDataAccessResourceUsageException e) {
+            log.error("Table \"Konfigurace\" did not exists in database!");
+            System.exit(1);
         }
     }
 
@@ -174 +180 @@
         Configuration savedConfiguration = configurationRepository.save(configuration);
 
         savedConfiguration.setParametersInConfiguration(new ArrayList<>());
-        for(int i = 0; i < newConfiguration.getParametersInConfiguration().size(); i++) {
-            ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
-            parameterInConfiguration.setParameter(assembly.getParameters().get(i));
-            parameterInConfiguration.setConfiguration(savedConfiguration);
-            parameterInConfiguration.setParameterOrder(newConfiguration.getParametersInConfiguration().get(i).getParameterOrder());
-            parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
-            parameterInConfiguration.setColumnName(assembly.getParameters().get(i).getName());
-            if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
-                    !newConfiguration.getParametersInConfiguration().get(i).getColumnName().equals("")) {
-                parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
-            }
-            if(newConfiguration.getParametersInConfiguration().get(i).getLocation() != null) {
-                parameterInConfiguration.setLocation(locationRepository.getById(
-                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
-            }
-            if(newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
-                parameterInConfiguration.setOperator(operatorRepository.getByName(
-                        newConfiguration.getParametersInConfiguration().get(i).getOperator().getName()));
-            }
-            if(newConfiguration.getParametersInConfiguration().get(i).getFunctions() != null) {
-                parameterInConfiguration.setFunctions(new ArrayList<>());
-                for (Function function : newConfiguration.getParametersInConfiguration().get(i).getFunctions()) {
-                    parameterInConfiguration.getFunctions().add(functionRepository.getByName(function.getName()));
+
+        if (newConfiguration.getParametersInConfiguration() != null) {
+            for (int i = 0; i < newConfiguration.getParametersInConfiguration().size(); i++) {
+                ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
+                parameterInConfiguration.setParameter(assembly.getParameters().get(i));
+                parameterInConfiguration.setConfiguration(savedConfiguration);
+                parameterInConfiguration.setParameterOrder(newConfiguration.getParametersInConfiguration().get(i).getParameterOrder());
+                parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
+                parameterInConfiguration.setColumnName(assembly.getParameters().get(i).getName());
+                if (newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null &&
+                        !newConfiguration.getParametersInConfiguration().get(i).getColumnName().equals("")) {
+                    parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
+                }
+                if (newConfiguration.getParametersInConfiguration().get(i).getLocation() != null) {
+                    parameterInConfiguration.setLocation(locationRepository.getById(
+                            newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
+                }
+                if (newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
+                    parameterInConfiguration.setOperator(operatorRepository.getByName(
+                            newConfiguration.getParametersInConfiguration().get(i).getOperator().getName()));
+                }
+                if (newConfiguration.getParametersInConfiguration().get(i).getFunctions() != null) {
+                    parameterInConfiguration.setFunctions(new ArrayList<>());
+                    for (Function function : newConfiguration.getParametersInConfiguration().get(i).getFunctions()) {
+                        parameterInConfiguration.getFunctions().add(functionRepository.getByName(function.getName()));
+                    }
                 }
+                ParameterInConfiguration savedParameterInConfiguration = parameterInConfigurationRepository.save(
+                        parameterInConfiguration);
+                savedConfiguration.getParametersInConfiguration().add(savedParameterInConfiguration);
             }
-            ParameterInConfiguration savedParameterInConfiguration = parameterInConfigurationRepository.save(
-                    parameterInConfiguration);
-            savedConfiguration.getParametersInConfiguration().add(savedParameterInConfiguration);
         }
         savedConfiguration = configurationRepository.save(savedConfiguration);