work

Author: thomaswoehlke

src/main/java/org/woehlke/greenshop/oodm/admin/entities/TaxZone.java

@@ -2,7 +2,7 @@
 
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -28,13 +28,13 @@ public class TaxZone {
     @Column(name="geo_zone_id",columnDefinition = "INT(11)")
     private Long id;
 
-    @SafeHtml
+    //@SafeHtml
     @NotBlank
     @Length(max=32)
     @Column(name="geo_zone_name",columnDefinition = "varchar(32)")
     private String name;
 
-    @SafeHtml
+    //@SafeHtml
     @NotBlank
     @Length(max=255)
     @Column(name="geo_zone_description",columnDefinition = "varchar(255)")

src/main/java/org/woehlke/greenshop/oodm/catalog/model/AdvancedSearchBean.java

@@ -1,7 +1,7 @@
 package org.woehlke.greenshop.oodm.catalog.model;
 
 import org.hibernate.validator.constraints.NotEmpty;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -15,7 +15,7 @@ public class AdvancedSearchBean implements Serializable {
 
     @NotNull
     @NotEmpty
-    @SafeHtml
+    //@SafeHtml
     private String searchKeywords;
 
     private Long category;

src/main/java/org/woehlke/greenshop/oodm/catalog/model/WriteReviewBean.java

@@ -2,7 +2,7 @@
 
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
@@ -16,7 +16,7 @@ public class WriteReviewBean implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Length(min=50)
-    @SafeHtml
+    //@SafeHtml
     @NotBlank
     private String reviewText;
 

src/main/java/org/woehlke/greenshop/oodm/checkout/model/AddressBean.java

@@ -5,7 +5,7 @@
 
 import javax.validation.constraints.Pattern;
 
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 
@@ -15,21 +15,21 @@ public class AddressBean implements Serializable {
 
 	@Pattern(regexp="m|f") private String gender;
 
-	@SafeHtml private String firstname;
+	//@SafeHtml private String firstname;
 
-	@SafeHtml private String lastname;
+	//@SafeHtml private String lastname;
 
-	@SafeHtml private String company;
+	//@SafeHtml private String company;
 
-	@SafeHtml private String streetAddress;
+	//@SafeHtml private String streetAddress;
 
-	@SafeHtml private String suburb;
+	//@SafeHtml private String suburb;
 
-	@SafeHtml private String postcode;
+	//@SafeHtml private String postcode;
 
-	@SafeHtml private String city;
+	//@SafeHtml private String city;
 
-	@SafeHtml private String state;
+	//@SafeHtml private String state;
 
 	private long countryId;
 

src/main/java/org/woehlke/greenshop/oodm/customer/model/ChangePasswordBean.java

@@ -2,25 +2,25 @@
 
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.NotBlank;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 import org.springframework.security.crypto.password.Md4PasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
 
 public class ChangePasswordBean {
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String passwordCurrent;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String passwordNew;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String passwordConfirmation;
 

src/main/java/org/woehlke/greenshop/oodm/customer/model/CreateNewCustomerFormBean.java

@@ -9,7 +9,7 @@
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.Range;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 
 public class CreateNewCustomerFormBean {
 
@@ -18,71 +18,71 @@ public class CreateNewCustomerFormBean {
 	private String gender;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String firstname;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String lastname;
 
-	@SafeHtml
+	//@SafeHtml
 	@NotNull
 	private String dob;
 
 	@Length(min=6)
-	@SafeHtml
+	//@SafeHtml
 	@Email
 	@NotBlank
 	private String emailAddress;
 
-	@SafeHtml
+	//@SafeHtml
 	private String company;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String streetAddress;
 
-	@SafeHtml
+	//@SafeHtml
 	private String suburb;
 
 	@Length(min=4)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String postcode;
 
 	@Length(min=3)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String city;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String state;
 
 	@Range(min = 1)
 	private long country;
 
 	@Length(min=3)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String telephone;
 
-	@SafeHtml
+	//@SafeHtml
 	private String fax;
 
 	private boolean newsletter=false;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String password;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank 
 	private String confirmation;
 

src/main/java/org/woehlke/greenshop/oodm/customer/model/CustomerAddressBean.java

@@ -6,7 +6,7 @@
 import org.hibernate.validator.constraints.NotBlank;
 import org.hibernate.validator.constraints.NotEmpty;
 import org.hibernate.validator.constraints.Range;
-import org.hibernate.validator.constraints.SafeHtml;
+//import org.hibernate.validator.constraints.SafeHtml;
 
 public class CustomerAddressBean {
 
@@ -15,38 +15,38 @@ public class CustomerAddressBean {
 	private String gender;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String firstname;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String lastname;
 
-	@SafeHtml
+	//@SafeHtml
 	private String company;
 
 	@Length(min=5)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String streetAddress;
 
-	@SafeHtml
+	//@SafeHtml
 	private String suburb;
 
 	@Length(min=4)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String postcode;
 
 	@Length(min=3)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String city;
 
 	@Length(min=2)
-	@SafeHtml
+	//@SafeHtml
 	@NotBlank
 	private String state;