Revize ea163a4c

changed parameter fetch type in assembly to LAZY, added comments, added table name check, changed in assembly template to always load table name

src/main/java/vldc/aswi/domain/Assembly.java

@@ -39 +39 @@
     private List<Configuration> configurations;
 
     /** List of parameters, which using this assembly. */
-    @OneToMany(mappedBy = "assembly", fetch = FetchType.EAGER)
+    @OneToMany(mappedBy = "assembly", fetch = FetchType.LAZY)
     private List<Parameter> parameters;
 
     /**

src/main/java/vldc/aswi/model/table/contingencyTable/ContingencyTableRow.java

@@ -55 +55 @@
 
     /**
      * Get level of current cell.
-     * @return
+     * @return Level uf current cell.
      */
     public int getLevel() {
         return level;

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

@@ -17 +17 @@
 
     /**
      * Get location from database by ID.
-     * @return location by ID.
+     * @param id ID of the location.
+     * @return Location by ID.
      */
     public Location getLocationById(long id);
 }

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

@@ -59 +59 @@
 
     /**
      * Get location from database by ID.
-     * @return location by ID.
+     * @param id ID of the location.
+     * @return Location by ID.
      */
     @Override
     public Location getLocationById(long id) {

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

@@ -47 +47 @@
                 generateFullSQLQuery(assembly.getSQLQuery(), parametersInConfiguration)
         );
 
+        // there was an error in the query
         if (tableColumns == null) {
             return null;
         }
 
+        // no rows were returned by query
         if (tableColumns.values().iterator().next().getValues().size() == 0) {
             return new ArrayList<>();
         }

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

@@ -28 +28 @@
 @Slf4j
 public class UserManagerImpl implements UserManager, UserDetailsService {
 
+    /** Autowired user password encoder */
     @Autowired
     private PasswordEncoder encoder;
 
@@ -105 +106 @@
      * Add new user into database.
      * @param username - login username for user.
      * @param password - password for user.
+     * @param roleId ID of the role.
      * @return ID of newly created user.
      */
     @Override

src/main/java/vldc/aswi/service/parameter/ParameterInConfigurationManager.java

@@ -20 +20 @@
     /**
      * Delete all parameters in configuration by configuration id.
      * @param id - ID of parameter / configuration.
+     * @param configurationUsed Stores if configuration was used.
      * @return List of deleted parameters in configuration.
      */
     boolean deleteParametersInConfiguration(Long id, boolean configurationUsed);
 
     /**
      * Add newly created parameters to all configurations, which are created from current assembly
+     * @param parameters Parameters to be added.
      * @param assemblyId - ID of current assembly.
      */
     void addParameterIntoConfigurations(Long assemblyId, ArrayList<Parameter> parameters);

src/main/java/vldc/aswi/service/parameter/ParameterInConfigurationManagerImpl.java

@@ -70 +70 @@
     /**
      * Add newly created parameters to all configurations, which are created from current assembly
      * @param assemblyId - ID of current assembly.
+     * @param parameters Parameters to be added.
      */
     @Override
     public void addParameterIntoConfigurations(Long assemblyId, ArrayList<Parameter> parameters) {
@@ -96 +97 @@
     /**
      * Delete all parameters in configuration by configuration id.
      * @param id - ID of parameter / configuration.
+     * @param configurationUsed Stores if configuration is used.
      * @return List of deleted parameters in configuration.
      */
     @Override

src/main/java/vldc/aswi/service/parameter/ParameterValueManagerImpl.java

@@ -27 +27 @@
     @Autowired
     private ParameterValueRepository parameterValueRepository;
 
-    @Autowired
-    private ParameterRepository parameterRepository;
-
     /**
      * Initialization setup for parameter value manager.
      * Check if table "Parametr_hodnota" exists.

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

@@ -198 +198 @@
         {
             Assembly assembly = this.assemblyManager.getAssemblyById(Long.parseLong(id));
             newConfiguration.setAssembly(assembly);
-            newConfiguration.setTableName(assembly.getName());
+
+            if (newConfiguration.getTableName() == null || newConfiguration.getTableName().equals("")) {
+                newConfiguration.setTableName(assembly.getName());
+            }
 
             // If configuration name is empty, then replace it by assembly name.
             if (newConfiguration.getName().equals("")) {

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

@@ -90 +90 @@
 		return modelAndView;
 	}
 
+	/**
+	 * Post method for index.
+	 * @param id ID of the assembly.
+	 * @return ModelAndView.
+	 */
 	@PostMapping("/")
 	public ModelAndView indexPost(@Valid @ModelAttribute("assemblyID") String id) {
 		ModelAndView modelAndView = new ModelAndView();
@@ -128 +133 @@
 		return attributes;
 	}
 
+	/**
+	 * Saves order of assemblies.
+	 * @param data Data string with order of assemblies.
+	 * @return Success message.
+	 */
 	@ResponseBody
 	@RequestMapping("/saveOrder")
 	public String saveOrder(@RequestBody String data) {

src/main/webapp/WEB-INF/templates/assembly.html

@@ -27 +27 @@
                     <div class="col-md-12 form-group row">
                         <label th:for="${tableName}" class="name-input-label">Titulek tabulky:</label>
                         <input type="text" class="form-control name-input" th:field="*{tableName}"
-                               th:value="${configuration?.tableName}">
+                               th:value="${configuration.tableName}">
                     </div>
                     <span>Parametry:</span>
                     <div class="col-md-9">