migrate spring-boot

Author: thomaswoehlke

etc/serialversions.txt

@@ -16,7 +16,7 @@ org.woehlke.simpleworklist.oodm.entities.UserRegistration:    private static fin
 org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem:    private static final long serialVersionUID = 8276819198016077167L;
 org.woehlke.simpleworklist.breadcrumb.Breadcrumb:    private static final long serialVersionUID = 7932703111140692689L;
 org.woehlke.simpleworklist.user.login.LoginForm:    private static final long serialVersionUID = 5936886560348238355L;
-org.woehlke.simpleworklist.model.beans.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
+org.woehlke.simpleworklist.context.NewContextForm:    private static final long serialVersionUID = -937143305653156981L;
 org.woehlke.simpleworklist.user.messages.NewUser2UserMessage:    private static final long serialVersionUID = 1576610181966480168L;
 org.woehlke.simpleworklist.search.SearchResult:    private static final long serialVersionUID = 1682809351146047764L;
 org.woehlke.simpleworklist.model.beans.UserAccountForm:    private static final long serialVersionUID = 9180383385243540190L;

getserialversionid.cmd

@@ -33,7 +33,7 @@ serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration  >> ..\..\et
 serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> ..\..\etc\serialversions.txt
-serialver org.woehlke.simpleworklist.model.beans.NewContextForm >> ..\..\etc\serialversions.txt
+serialver org.woehlke.simpleworklist.context.NewContextForm >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.search.SearchResult >> ..\..\etc\serialversions.txt
 serialver org.woehlke.simpleworklist.model.beans.UserAccountForm  >> ..\..\etc\serialversions.txt

getserialversionid.sh

@@ -45,7 +45,7 @@ serialver org.woehlke.simpleworklist.oodm.entities.UserRegistration  >> $SERIALV
 serialver org.woehlke.simpleworklist.breadcrumb.BreadcrumbItem  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.breadcrumb.Breadcrumb  >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.login.LoginForm >> $SERIALVERSIONS_FILE
-serialver org.woehlke.simpleworklist.model.beans.NewContextForm >> $SERIALVERSIONS_FILE
+serialver org.woehlke.simpleworklist.context.NewContextForm >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.user.messages.NewUser2UserMessage >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.search.SearchResult >> $SERIALVERSIONS_FILE
 serialver org.woehlke.simpleworklist.model.beans.UserAccountForm  >> $SERIALVERSIONS_FILE

src/main/java/org/woehlke/simpleworklist/model/beans/NewContextForm.java renamed to src/main/java/org/woehlke/simpleworklist/context/NewContextForm.java

@@ -1,68 +1,68 @@
-package org.woehlke.simpleworklist.model.beans;
-
-import org.hibernate.validator.constraints.Length;
-import javax.validation.constraints.NotBlank;
-import org.hibernate.validator.constraints.SafeHtml;
-
-import java.io.Serializable;
-
-/**
- * Created by tw on 15.03.16.
- */
-public class NewContextForm implements Serializable {
-
-    private static final long serialVersionUID = -937143305653156981L;
-
-    @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    @NotBlank
-    @Length(min = 1, max = 255)
-    private String nameDe;
-
-    @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
-    @NotBlank
-    @Length(min = 1, max = 255)
-    private String nameEn;
-
-    public String getNameDe() {
-        return nameDe;
-    }
-
-    public void setNameDe(String nameDe) {
-        this.nameDe = nameDe;
-    }
-
-    public String getNameEn() {
-        return nameEn;
-    }
-
-    public void setNameEn(String nameEn) {
-        this.nameEn = nameEn;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof NewContextForm)) return false;
-
-        NewContextForm that = (NewContextForm) o;
-
-        if (nameDe != null ? !nameDe.equals(that.nameDe) : that.nameDe != null) return false;
-        return nameEn != null ? nameEn.equals(that.nameEn) : that.nameEn == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = nameDe != null ? nameDe.hashCode() : 0;
-        result = 31 * result + (nameEn != null ? nameEn.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "NewContextForm{" +
-                "nameDe='" + nameDe + '\'' +
-                ", nameEn='" + nameEn + '\'' +
-                '}';
-    }
-}
+package org.woehlke.simpleworklist.context;
+
+import org.hibernate.validator.constraints.Length;
+import javax.validation.constraints.NotBlank;
+import org.hibernate.validator.constraints.SafeHtml;
+
+import java.io.Serializable;
+
+/**
+ * Created by tw on 15.03.16.
+ */
+public class NewContextForm implements Serializable {
+
+    private static final long serialVersionUID = -937143305653156981L;
+
+    @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
+    @NotBlank
+    @Length(min = 1, max = 255)
+    private String nameDe;
+
+    @SafeHtml(whitelistType = SafeHtml.WhiteListType.NONE)
+    @NotBlank
+    @Length(min = 1, max = 255)
+    private String nameEn;
+
+    public String getNameDe() {
+        return nameDe;
+    }
+
+    public void setNameDe(String nameDe) {
+        this.nameDe = nameDe;
+    }
+
+    public String getNameEn() {
+        return nameEn;
+    }
+
+    public void setNameEn(String nameEn) {
+        this.nameEn = nameEn;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof NewContextForm)) return false;
+
+        NewContextForm that = (NewContextForm) o;
+
+        if (nameDe != null ? !nameDe.equals(that.nameDe) : that.nameDe != null) return false;
+        return nameEn != null ? nameEn.equals(that.nameEn) : that.nameEn == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = nameDe != null ? nameDe.hashCode() : 0;
+        result = 31 * result + (nameEn != null ? nameEn.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "NewContextForm{" +
+                "nameDe='" + nameDe + '\'' +
+                ", nameEn='" + nameEn + '\'' +
+                '}';
+    }
+}

src/main/java/org/woehlke/simpleworklist/oodm/services/ContextService.java

@@ -1,25 +1,25 @@
-package org.woehlke.simpleworklist.oodm.services;
-
-import org.woehlke.simpleworklist.oodm.entities.Context;
-import org.woehlke.simpleworklist.oodm.entities.UserAccount;
-import org.woehlke.simpleworklist.model.beans.NewContextForm;
-
-import java.util.List;
-
-/**
- * Created by tw on 13.03.16.
- */
-public interface ContextService {
-
-    List<Context> getAllForUser(UserAccount user);
-
-    Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
-
-    void createNewContext(NewContextForm newContext, UserAccount user);
-
-    void updateContext(Context context);
-
-    boolean delete(Context context);
-
-    boolean contextHasItems(Context context);
-}
+package org.woehlke.simpleworklist.oodm.services;
+
+import org.woehlke.simpleworklist.oodm.entities.Context;
+import org.woehlke.simpleworklist.oodm.entities.UserAccount;
+import org.woehlke.simpleworklist.context.NewContextForm;
+
+import java.util.List;
+
+/**
+ * Created by tw on 13.03.16.
+ */
+public interface ContextService {
+
+    List<Context> getAllForUser(UserAccount user);
+
+    Context findByIdAndUserAccount(long newContextId, UserAccount userAccount);
+
+    void createNewContext(NewContextForm newContext, UserAccount user);
+
+    void updateContext(Context context);
+
+    boolean delete(Context context);
+
+    boolean contextHasItems(Context context);
+}

src/main/java/org/woehlke/simpleworklist/oodm/services/impl/ContextServiceImpl.java

@@ -3,7 +3,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
-import org.woehlke.simpleworklist.model.beans.NewContextForm;
+import org.woehlke.simpleworklist.context.NewContextForm;
 import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.oodm.entities.UserAccount;
 import org.woehlke.simpleworklist.oodm.repository.ContextRepository;

src/main/java/org/woehlke/simpleworklist/user/selfservice/UserSelfserviceController.java

@@ -18,12 +18,12 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.woehlke.simpleworklist.breadcrumb.Breadcrumb;
 import org.woehlke.simpleworklist.common.AbstractController;
+import org.woehlke.simpleworklist.context.NewContextForm;
 import org.woehlke.simpleworklist.context.UserChangeDefaultContextForm;
 import org.woehlke.simpleworklist.language.UserChangeLanguageForm;
 import org.woehlke.simpleworklist.oodm.entities.Context;
 import org.woehlke.simpleworklist.oodm.entities.UserAccount;
 import org.woehlke.simpleworklist.oodm.enumerations.Language;
-import org.woehlke.simpleworklist.model.beans.*;
 import org.woehlke.simpleworklist.user.UserAccountAccessService;
 import org.woehlke.simpleworklist.user.UserSessionBean;