lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor, add db clean script

Browse Source 
Signed-off-by: Melanie Retter <melanie.retter@bosch-si.com>
This commit is contained in:
Melanie Retter
2016-08-26 10:32:48 +02:00
parent 171f96f309
commit f3534bc4d9
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/exception/ConstraintViolationException.java
View File

@@ -8,13 +8,8 @@
*/ */
package org.eclipse.hawkbit.repository.exception; package org.eclipse.hawkbit.repository.exception;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.validation.ConstraintViolation;
import org.eclipse.hawkbit.exception.AbstractServerRtException; import org.eclipse.hawkbit.exception.AbstractServerRtException;
import org.eclipse.hawkbit.exception.SpServerError; import org.eclipse.hawkbit.exception.SpServerError;
@@ -49,12 +44,10 @@ public class ConstraintViolationException extends AbstractServerRtException {
* @return message String with proper error information * @return message String with proper error information
*/ */
public static String getExceptionMessage(final javax.validation.ConstraintViolationException ex) { public static String getExceptionMessage(final javax.validation.ConstraintViolationException ex) {
final Set<ConstraintViolation<?>> violations = ex.getConstraintViolations(); return ex
final List<String> messages = new ArrayList<>(); .getConstraintViolations().stream().map(violation -> violation.getPropertyPath()
violations.stream().forEach( + MESSAGE_FORMATTER_SEPARATOR + violation.getMessage() + ".")
violation -> messages.add(violation.getPropertyPath() + MESSAGE_FORMATTER_SEPARATOR + violation.getMessage() + ".")); .collect(Collectors.joining(MESSAGE_FORMATTER_SEPARATOR));
return messages.stream().collect(Collectors.joining(MESSAGE_FORMATTER_SEPARATOR));
} }
} }

1
hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/H2/V1_7_0__swmType_maxAssignment_greater_0__H2.sql Normal file
View File

@@ -0,0 +1 @@
Update sp_software_module_type set max_ds_assignments = 1 where max_ds_assignments < 1;

1
hawkbit-repository/hawkbit-repository-jpa/src/main/resources/db/migration/MYSQL/V1_7_0__swmType_maxAssignment_greater_0__MYSQL.sql Normal file
View File

@@ -0,0 +1 @@
Update sp_software_module_type set max_ds_assignments = 1 where max_ds_assignments < 1;