From 147480605d65cfbd720583cdfd9dc02979241e73 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Fri, 28 Feb 2020 09:30:20 +0100 Subject: [PATCH 1/4] Trying Gitlab CI --- .gitlab-ci.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f73ad4c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,17 @@ +code_quality: + image: docker:stable + variables: + DOCKER_DRIVER: overlay2 + allow_failure: true + services: + - docker:stable-dind + script: + - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') + - docker run + --env SOURCE_CODE="$PWD" + --volume "$PWD":/code + --volume /var/run/docker.sock:/var/run/docker.sock + "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code + artifacts: + reports: + codequality: gl-code-quality-report.json From 11d3679fdb4d4ff2af13495b143a4b3ef27679c9 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Fri, 28 Feb 2020 16:57:32 +0100 Subject: [PATCH 2/4] Fix to email constraint --- .gitignore | 2 ++ .idea/misc.xml | 2 +- .../inf/sa4/sanmarinoes/smarthut/models/User.java | 12 ++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 69ca520..1375525 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.idea/misc.xml + **/.DS_Store # Compiled class file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7c6191b..241f098 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java index e4ce24e..7909fe8 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/User.java @@ -2,11 +2,7 @@ package ch.usi.inf.sa4.sanmarinoes.smarthut.models; import java.util.Set; import javax.persistence.*; -import javax.validation.constraints.Email; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; +import javax.validation.constraints.*; /** A user of the Smarthut application */ @Entity(name = "smarthutuser") @@ -33,7 +29,11 @@ public class User { @NotNull @Column(nullable = false) @NotEmpty(message = "Please provide a password") - @Min(value = 6, message = "Your password should be at least 6 characters long") + @Size( + min = 6, + max = 255, + message = + "Your password should be at least 6 characters long and at most 255 chars long") private String password; /** From 0257a9a89c57d8deb5e4388467c301f163cb8cc2 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sun, 1 Mar 2020 13:38:51 +0100 Subject: [PATCH 3/4] Idea misc.xml removed --- .idea/misc.xml | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 .idea/misc.xml diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 241f098..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From b294144a2289ff0af58e7975f574543550461218 Mon Sep 17 00:00:00 2001 From: Claudio Maggioni Date: Sun, 1 Mar 2020 13:46:15 +0100 Subject: [PATCH 4/4] Idea configuration removed so not to cause complaining for the SDK different installations between team members --- .gitignore | 2 +- .idea/.name | 1 - .idea/jarRepositories.xml | 20 -------------------- .idea/vcs.xml | 6 ------ 4 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index 1375525..1b1a367 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -.idea/misc.xml +.idea/** **/.DS_Store diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 03128f2..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -smarthut \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index fdc392f..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file