From f042e8389771ce2c6ac68b18c7d0af1b3e4d40d1 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Fri, 8 Jan 2016 13:45:04 +0100
Subject: [PATCH] refactor and clean code
---
src/main/java/org/hbp/mip/MIPApplication.java | 1 +
.../mip/{ => controllers}/ApiException.java | 2 +-
.../{ => controllers}/ApiOriginFilter.java | 2 +-
.../{ => controllers}/ApiResponseMessage.java | 2 +-
.../mip/{ => controllers}/ArticlesApi.java | 3 +-
.../mip/{ => controllers}/DatasetsApi.java | 2 +-
.../hbp/mip/{ => controllers}/GroupsApi.java | 2 +-
.../mip/{ => controllers}/HibernateUtil.java | 2 +-
.../hbp/mip/{ => controllers}/ModelsApi.java | 2 +-
.../{ => controllers}/NotFoundException.java | 2 +-
.../mip/{ => controllers}/VariablesApi.java | 2 +-
.../java/org/hbp/mip/mock/ArticleMock.java | 45 -------------------
src/main/java/org/hbp/mip/mock/ModelMock.java | 18 --------
src/main/java/org/hbp/mip/mock/UserMock.java | 33 --------------
14 files changed, 12 insertions(+), 106 deletions(-)
rename src/main/java/org/hbp/mip/{ => controllers}/ApiException.java (90%)
rename src/main/java/org/hbp/mip/{ => controllers}/ApiOriginFilter.java (96%)
rename src/main/java/org/hbp/mip/{ => controllers}/ApiResponseMessage.java (97%)
rename src/main/java/org/hbp/mip/{ => controllers}/ArticlesApi.java (98%)
rename src/main/java/org/hbp/mip/{ => controllers}/DatasetsApi.java (98%)
rename src/main/java/org/hbp/mip/{ => controllers}/GroupsApi.java (98%)
rename src/main/java/org/hbp/mip/{ => controllers}/HibernateUtil.java (97%)
rename src/main/java/org/hbp/mip/{ => controllers}/ModelsApi.java (99%)
rename src/main/java/org/hbp/mip/{ => controllers}/NotFoundException.java (90%)
rename src/main/java/org/hbp/mip/{ => controllers}/VariablesApi.java (99%)
delete mode 100644 src/main/java/org/hbp/mip/mock/ArticleMock.java
delete mode 100644 src/main/java/org/hbp/mip/mock/ModelMock.java
delete mode 100644 src/main/java/org/hbp/mip/mock/UserMock.java
diff --git a/src/main/java/org/hbp/mip/MIPApplication.java b/src/main/java/org/hbp/mip/MIPApplication.java
index 49d12c4e6..cddf54dac 100644
--- a/src/main/java/org/hbp/mip/MIPApplication.java
+++ b/src/main/java/org/hbp/mip/MIPApplication.java
@@ -23,6 +23,7 @@ package org.hbp.mip;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
+import org.hbp.mip.controllers.HibernateUtil;
import org.hbp.mip.model.User;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/hbp/mip/ApiException.java b/src/main/java/org/hbp/mip/controllers/ApiException.java
similarity index 90%
rename from src/main/java/org/hbp/mip/ApiException.java
rename to src/main/java/org/hbp/mip/controllers/ApiException.java
index 1db90dc1b..d0281b38a 100644
--- a/src/main/java/org/hbp/mip/ApiException.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiException.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-07T07:38:20.227Z")
public class ApiException extends Exception {
diff --git a/src/main/java/org/hbp/mip/ApiOriginFilter.java b/src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
similarity index 96%
rename from src/main/java/org/hbp/mip/ApiOriginFilter.java
rename to src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
index 947af9b6a..5e44e05b6 100644
--- a/src/main/java/org/hbp/mip/ApiOriginFilter.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiOriginFilter.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
diff --git a/src/main/java/org/hbp/mip/ApiResponseMessage.java b/src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
similarity index 97%
rename from src/main/java/org/hbp/mip/ApiResponseMessage.java
rename to src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
index 13659d6b9..a1f9ee33f 100644
--- a/src/main/java/org/hbp/mip/ApiResponseMessage.java
+++ b/src/main/java/org/hbp/mip/controllers/ApiResponseMessage.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import javax.xml.bind.annotation.XmlTransient;
diff --git a/src/main/java/org/hbp/mip/ArticlesApi.java b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/ArticlesApi.java
rename to src/main/java/org/hbp/mip/controllers/ArticlesApi.java
index c2f06bb2a..9f361a382 100644
--- a/src/main/java/org/hbp/mip/ArticlesApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ArticlesApi.java
@@ -1,7 +1,8 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
+import org.hbp.mip.MIPApplication;
import org.hbp.mip.model.Article;
import org.hbp.mip.model.User;
import org.hibernate.Session;
diff --git a/src/main/java/org/hbp/mip/DatasetsApi.java b/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/DatasetsApi.java
rename to src/main/java/org/hbp/mip/controllers/DatasetsApi.java
index 35a24ba7b..5d9b69e04 100644
--- a/src/main/java/org/hbp/mip/DatasetsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/DatasetsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/GroupsApi.java b/src/main/java/org/hbp/mip/controllers/GroupsApi.java
similarity index 98%
rename from src/main/java/org/hbp/mip/GroupsApi.java
rename to src/main/java/org/hbp/mip/controllers/GroupsApi.java
index 83d7e04c9..f0e281cda 100644
--- a/src/main/java/org/hbp/mip/GroupsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/GroupsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.Api;
diff --git a/src/main/java/org/hbp/mip/HibernateUtil.java b/src/main/java/org/hbp/mip/controllers/HibernateUtil.java
similarity index 97%
rename from src/main/java/org/hbp/mip/HibernateUtil.java
rename to src/main/java/org/hbp/mip/controllers/HibernateUtil.java
index 4732c8acd..2c2f6b4ed 100644
--- a/src/main/java/org/hbp/mip/HibernateUtil.java
+++ b/src/main/java/org/hbp/mip/controllers/HibernateUtil.java
@@ -2,7 +2,7 @@
* Created by mirco on 07.12.15.
*/
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
diff --git a/src/main/java/org/hbp/mip/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
similarity index 99%
rename from src/main/java/org/hbp/mip/ModelsApi.java
rename to src/main/java/org/hbp/mip/controllers/ModelsApi.java
index b32be220c..8f645508b 100644
--- a/src/main/java/org/hbp/mip/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/NotFoundException.java b/src/main/java/org/hbp/mip/controllers/NotFoundException.java
similarity index 90%
rename from src/main/java/org/hbp/mip/NotFoundException.java
rename to src/main/java/org/hbp/mip/controllers/NotFoundException.java
index d017a2525..6952e9d52 100644
--- a/src/main/java/org/hbp/mip/NotFoundException.java
+++ b/src/main/java/org/hbp/mip/controllers/NotFoundException.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-07T07:38:20.227Z")
public class NotFoundException extends ApiException {
diff --git a/src/main/java/org/hbp/mip/VariablesApi.java b/src/main/java/org/hbp/mip/controllers/VariablesApi.java
similarity index 99%
rename from src/main/java/org/hbp/mip/VariablesApi.java
rename to src/main/java/org/hbp/mip/controllers/VariablesApi.java
index 75a3cfa9f..0813f073f 100644
--- a/src/main/java/org/hbp/mip/VariablesApi.java
+++ b/src/main/java/org/hbp/mip/controllers/VariablesApi.java
@@ -1,4 +1,4 @@
-package org.hbp.mip;
+package org.hbp.mip.controllers;
import io.swagger.annotations.*;
diff --git a/src/main/java/org/hbp/mip/mock/ArticleMock.java b/src/main/java/org/hbp/mip/mock/ArticleMock.java
deleted file mode 100644
index 472f7f009..000000000
--- a/src/main/java/org/hbp/mip/mock/ArticleMock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.Article;
-import org.hbp.mip.model.User;
-
-import java.util.Date;
-
-public class ArticleMock extends Article {
- public ArticleMock(int id) {
- Date currentDate = new Date();
- User currentUser = new UserMock(1);
- switch (id) {
- case 1:
- this.setTitle("Test1");
- this.setStatus("published");
- this.setSlug("test1");
- /*this.setPublishedAt(currentDate);
- this.setUpdatedAt(currentDate);
- this.setTags(new LinkedList<>());*/
- this.setAbstract("This is a first test article.");
- this.setContent("<!DOCTYPE html><html><head></head><body><p>This is the content of my first test article.</p></body></html>");
- /*this.setCreatedAt(currentDate);
- this.setCreatedBy(currentUser);
- this.setUpdatedBy(currentUser);*/
- break;
- case 2:
- this.setTitle("Test2");
- this.setStatus("published");
- this.setSlug("test2");
- /*this.setPublishedAt(currentDate);
- this.setUpdatedAt(currentDate);
- this.setTags(new LinkedList<>());*/
- this.setAbstract("This is a second test article.");
- this.setContent("<!DOCTYPE html><html><head></head><body><p>This is the content of my second test article.</p></body></html>");
- /*this.setCreatedAt(currentDate);
- this.setCreatedBy(currentUser);
- this.setUpdatedBy(currentUser);*/
- break;
- }
- }
-}
diff --git a/src/main/java/org/hbp/mip/mock/ModelMock.java b/src/main/java/org/hbp/mip/mock/ModelMock.java
deleted file mode 100644
index 144274b64..000000000
--- a/src/main/java/org/hbp/mip/mock/ModelMock.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.Model;
-
-
-public class ModelMock extends Model {
- public ModelMock(int id) {
- switch (id) {
- case 1:
- this.setTitle("Model1");
- break;
- }
- }
-}
diff --git a/src/main/java/org/hbp/mip/mock/UserMock.java b/src/main/java/org/hbp/mip/mock/UserMock.java
deleted file mode 100644
index 1d6656adf..000000000
--- a/src/main/java/org/hbp/mip/mock/UserMock.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Created by mirco on 04.12.15.
- */
-
-package org.hbp.mip.mock;
-
-import org.hbp.mip.model.User;
-
-public class UserMock extends User {
- public UserMock(int id) {
- switch (id) {
- case 1:
- this.setFirstname("Linda");
- this.setFullname("Linda DIB");
- this.setLastname("DIB");
- this.setPicture("images/users/Linda.jpg");
- this.setWeb("http://www.hbpproject.eu");
- this.setPhone("+33 6 00 00 00 00");
- this.setBirthday("1982-01-22");
- this.setGender("Female");
- this.addLanguage("French");
- this.addLanguage("English");
- this.setPassword("user");
- this.setEmail("l.dib@hbpproject.eu");
- this.setIsActive(true);
- this.setApikey("kiliaanapikey");
- this.setTeam("Scientist");
- this.addRole("ROLE_ADMIN");
- this.addRole("ROLE_SCIENTIST");
- break;
- }
- }
-}
--
GitLab