Revize 50c00b46

re #7981 re #7979 re #7974 default table name added, assembly order implemented, parameter order in configuration implemented

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

@@ -170 +170 @@
         for(int i = 0; i < newConfiguration.getParametersInConfiguration().size(); i++) {
             ParameterInConfiguration parameterInConfiguration = new ParameterInConfiguration();
             parameterInConfiguration.setParameter(assembly.getParameters().get(i));
-            parameterInConfiguration.setColumnName(newConfiguration.getParametersInConfiguration().get(i).getColumnName());
             parameterInConfiguration.setConfiguration(savedConfiguration);
             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.getByName(
-                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getName()));
+                parameterInConfiguration.setLocation(locationRepository.getById(
+                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
             }
             if(newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
                 parameterInConfiguration.setOperator(operatorRepository.getByName(
@@ -211 +214 @@
         for(int i = 0; i < configuration.getParametersInConfiguration().size(); i++) {
             ParameterInConfiguration parameterInConfiguration = configuration.getParametersInConfiguration().get(i);
             parameterInConfiguration.setOperatorValue(newConfiguration.getParametersInConfiguration().get(i).getOperatorValue());
-            if(newConfiguration.getParametersInConfiguration().get(i).getColumnName() != null) {
+            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.getByName(
-                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getName()));
+                parameterInConfiguration.setLocation(locationRepository.getById(
+                        newConfiguration.getParametersInConfiguration().get(i).getLocation().getId()));
+            }
+            else {
+                parameterInConfiguration.setLocation(null);
             }
             if(newConfiguration.getParametersInConfiguration().get(i).getOperator() != null) {
                 parameterInConfiguration.setOperator(operatorRepository.getByName(