Revize 8490c92c

Updating last merge.

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

@@ -4 +4 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import vldc.aswi.domain.parameter.ParameterInConfiguration;
-import vldc.aswi.utils.validator.OperatorValueConstraint;
 
 import javax.persistence.*;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**

src/main/java/vldc/aswi/domain/parameter/Parameter.java

@@ -38 +38 @@
     @Column(name = "default_hodnota")
     private String defaultValue;
 
-    /** Specific type of parameter, which represents type of entry. */
-    @ManyToOne(fetch=FetchType.LAZY)
-    @JoinColumn(name = "parametr_typ_id")
-    private ParameterType parameterType;
-
     /** List of parametersInConfiguration, which using this parameter. */
     @OneToMany(mappedBy = "parameter", cascade = {CascadeType.ALL})
     private List<ParameterInConfiguration> parametersInConfiguration;

src/main/java/vldc/aswi/domain/parameter/ParameterInConfiguration.java

@@ -4 +4 @@
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import vldc.aswi.domain.*;
-import vldc.aswi.utils.validator.OperatorValueConstraint;
+import vldc.aswi.validators.operator.value.OperatorValueConstraint;
 
 import javax.persistence.*;
 import java.util.List;

src/main/java/vldc/aswi/utils/validator/OperatorValueConstraint.java

@@ -1 @@
-package vldc.aswi.utils.validator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-import java.lang.annotation.*;
-
-/**
- * Annotation used for validation of operator value
- */
-@Documented
-@Constraint(validatedBy = OperatorValueValidator.class)
-@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface OperatorValueConstraint {
-
-    /**
-     * Message of operator value is invalid
-     * @return error message
-     */
-    String message() default "Neplatná hodnota filtru!";
-
-    /**
-     * Array of classes
-     * @return array of classes
-     */
-    Class<?>[] groups() default {};
-
-    /**
-     * Class payload
-     * @return class payload
-     */
-    Class<? extends Payload>[] payload() default {};
-}

src/main/java/vldc/aswi/utils/validator/OperatorValueValidator.java

@@ -1 @@
-package vldc.aswi.utils.validator;
-
-import vldc.aswi.domain.parameter.ParameterInConfiguration;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-/**
- * Validator class for validation operator value according to used operator
- */
-public class OperatorValueValidator implements
-        ConstraintValidator<OperatorValueConstraint, Object> {
-
-    /**
-     * Initialize validator
-     * @param operatorValue operator value
-     */
-    @Override
-    public void initialize(OperatorValueConstraint operatorValue) {
-    }
-
-    /**
-     * Validation process of operator value
-     * @param o object to be validated
-     * @param constraintValidatorContext context
-     * @return true if operator value is valid
-     */
-    @Override
-    public boolean isValid(Object o, ConstraintValidatorContext constraintValidatorContext) {
-        ParameterInConfiguration parameterInConfiguration = (ParameterInConfiguration) o;
-        if (parameterInConfiguration.getOperator() != null && parameterInConfiguration.getOperator().getName().equals("BETWEEN")) {
-            return parameterInConfiguration.getOperatorValue().matches(".;.");
-        }
-
-        return true;
-    }
-}

src/main/java/vldc/aswi/validators/operator/value/OperatorValueConstraint.java

@@ +1 @@
+package vldc.aswi.validators.operator.value;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.*;
+
+/**
+ * Annotation used for validation of operator value
+ */
+@Documented
+@Constraint(validatedBy = OperatorValueValidator.class)
+@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OperatorValueConstraint {
+
+    /**
+     * Message of operator value is invalid
+     * @return error message
+     */
+    String message() default "Neplatná hodnota filtru!";
+
+    /**
+     * Array of classes
+     * @return array of classes
+     */
+    Class<?>[] groups() default {};
+
+    /**
+     * Class payload
+     * @return class payload
+     */
+    Class<? extends Payload>[] payload() default {};
+}

src/main/java/vldc/aswi/validators/operator/value/OperatorValueValidator.java

@@ +1 @@
+package vldc.aswi.validators.operator.value;
+
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+/**
+ * Validator class for validation operator value according to used operator
+ */
+public class OperatorValueValidator implements
+        ConstraintValidator<OperatorValueConstraint, Object> {
+
+    /**
+     * Initialize validator
+     * @param operatorValue operator value
+     */
+    @Override
+    public void initialize(OperatorValueConstraint operatorValue) {
+    }
+
+    /**
+     * Validation process of operator value
+     * @param o object to be validated
+     * @param constraintValidatorContext context
+     * @return true if operator value is valid
+     */
+    @Override
+    public boolean isValid(Object o, ConstraintValidatorContext constraintValidatorContext) {
+        ParameterInConfiguration parameterInConfiguration = (ParameterInConfiguration) o;
+        if (parameterInConfiguration.getOperator() != null && parameterInConfiguration.getOperator().getName().equals("BETWEEN")) {
+            return parameterInConfiguration.getOperatorValue().matches(".;.");
+        }
+
+        return true;
+    }
+}

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

@@ -13 +13 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import vldc.aswi.domain.Assembly;
+import vldc.aswi.domain.Configuration;
+import vldc.aswi.domain.Location;
+import vldc.aswi.domain.Operator;
+import vldc.aswi.domain.parameter.Parameter;
+import vldc.aswi.domain.parameter.ParameterInConfiguration;
 import vldc.aswi.service.*;
 import vldc.aswi.service.parameter.ParameterManager;
 import vldc.aswi.service.parameter.ParameterTypeManager;
@@ -63 +68 @@
     @Autowired
     private AssemblyValidator assemblyValidator;
 
+    @Autowired
+    private ConfigurationManager configurationManager;
+
     /** Name of thymeleaf parameter, which will contain text in assembly form. */
     private String assemblyTitleName = "title";
 
@@ -167 +175 @@
 
         long assemblyID = assembly.getId();
         System.out.println(assemblyID);
-        Assembly assembly2 = assemblyManager.getAssemblyById(assemblyID);
 
         Assembly assembly2 = this.assemblyManager.getAssemblyById(assemblyID);