From 11d3679fdb4d4ff2af13495b143a4b3ef27679c9 Mon Sep 17 00:00:00 2001
From: Claudio Maggioni <maggicl@usi.ch>
Date: Fri, 28 Feb 2020 16:57:32 +0100
Subject: [PATCH 1/2] 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11.0.3" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="12.0.1" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ 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 <maggicl@usi.ch>
Date: Sun, 1 Mar 2020 13:38:51 +0100
Subject: [PATCH 2/2] 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="12.0.1" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file