Merge pull request #50 from hiroxpepe/develop

refactor: #35 keeping codes clean.

README.md

@@ -1,4 +1,4 @@
-# blog-examproject
+# expt-blog
 
 ---
 ## What's this?
@@ -35,17 +35,17 @@ to stop the application hit ctrl + c
 
 ---
 ## Repository on Github.
-[hiroxpepe/blog-examproject](https://github.com/hiroxpepe/blog-examproject)
+[hiroxpepe/expt-blog](https://github.com/hiroxpepe/expt-blog)
 
 ---
 ## Running on Heroku.
-http://blog-examproject.herokuapp.com/
+http://expt-blog.herokuapp.com/
 
 ---
 ## Author
 [hiroxpepe](mailto:[email protected])
 
 ---
 ## License
-The examproject is released under version 2.0 of the
+The expt is released under version 2.0 of the
 [Apache License](http://www.apache.org/licenses/LICENSE-2.0).

model/pom.xml

@@ -2,15 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.examproject.blog</groupId>
-    <artifactId>exmp-model</artifactId>
+    <groupId>org.expt.blog</groupId>
+    <artifactId>expt-model</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>model</name>
 
     <properties>
-        <exmp-blog.version>${version}</exmp-blog.version>
+        <expt-blog.version>${version}</expt-blog.version>
         <spring.data.jpa.version>2.3.0.RELEASE</spring.data.jpa.version>
         <spring.version>5.2.6.RELEASE</spring.version>
         <hibernate.version>5.4.17.Final</hibernate.version>
@@ -178,5 +177,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

model/src/main/java/org/examproject/blog/entity/Category.java → model/src/main/java/org/expt/blog/entity/Category.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.entity;
+package org.expt.blog.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;
@@ -43,5 +43,4 @@ public class Category implements Serializable {
 
     @Column(name="text", unique=true, length=24)
     String text;
-
-}
+}

model/src/main/java/org/examproject/blog/entity/Entry.java → model/src/main/java/org/expt/blog/entity/Entry.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.entity;
+package org.expt.blog.entity;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -76,5 +76,4 @@ public class Entry implements Serializable {
 
 //    @OneToMany(mappedBy="entry", fetch=FetchType.EAGER)
 //    Set<EntryTag> entryTagSet = new HashSet<>();
-
 }

model/src/main/java/org/examproject/blog/entity/EntryTag.java → model/src/main/java/org/expt/blog/entity/EntryTag.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.entity;
+package org.expt.blog.entity;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -51,5 +51,4 @@ public class EntryTag {
     @ManyToOne
     @JoinColumn(name="tag_id")
     Tag tag;
-
-}
+}

model/src/main/java/org/examproject/blog/entity/Tag.java → model/src/main/java/org/expt/blog/entity/Tag.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.entity;
+package org.expt.blog.entity;
 
 import java.io.Serializable;
 import java.util.HashSet;
@@ -50,5 +50,4 @@ public class Tag implements Serializable {
 
 //    @OneToMany(mappedBy="tag", fetch=FetchType.EAGER)
 //    Set<EntryTag> entrySet = new HashSet<>();
-
 }

model/src/main/java/org/examproject/blog/entity/User.java → model/src/main/java/org/expt/blog/entity/User.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.entity;
+package org.expt.blog.entity;
 
 import java.io.Serializable;
 import javax.persistence.Column;
@@ -52,5 +52,4 @@ public class User implements Serializable {
 
     @Column(name="enable")
     Boolean enable = true;
-
-}
+}

model/src/main/java/org/examproject/blog/repository/CategoryRepository.java → model/src/main/java/org/expt/blog/repository/CategoryRepository.java

@@ -12,17 +12,17 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.repository;
+package org.expt.blog.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import org.examproject.blog.entity.Category;
+import org.expt.blog.entity.Category;
 
 /**
  * @author h.adachi
  */
 public interface CategoryRepository extends JpaRepository<Category, Long> {
 
     Category findByText(String text);
-
 }
+

model/src/main/java/org/examproject/blog/repository/EntryRepository.java → model/src/main/java/org/expt/blog/repository/EntryRepository.java

@@ -12,14 +12,14 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.repository;
+package org.expt.blog.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import org.examproject.blog.entity.Entry;
-import org.examproject.blog.entity.User;
+import org.expt.blog.entity.Entry;
+import org.expt.blog.entity.User;
 
 /**
  * @author h.adachi
@@ -29,5 +29,4 @@ public interface EntryRepository extends JpaRepository<Entry, Long> {
     List<Entry> findByCode(String code);
 
     List<Entry> findByUser(User user);
-
 }

model/src/main/java/org/examproject/blog/repository/EntryTagRepository.java → model/src/main/java/org/expt/blog/repository/EntryTagRepository.java

@@ -12,15 +12,15 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.repository;
+package org.expt.blog.repository;
 
 import java.util.List;
-import org.examproject.blog.entity.Entry;
+import org.expt.blog.entity.Entry;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import org.examproject.blog.entity.EntryTag;
-import org.examproject.blog.entity.Tag;
+import org.expt.blog.entity.EntryTag;
+import org.expt.blog.entity.Tag;
 
 /**
  * @author h.adachi
@@ -30,5 +30,4 @@ public interface EntryTagRepository extends JpaRepository<EntryTag, Long> {
     List<EntryTag> findByEntryAndTag(Entry entry, Tag tag);
 
     List<EntryTag> findByEntry(Entry entry);
-
 }

model/src/main/java/org/examproject/blog/repository/TagRepository.java → model/src/main/java/org/expt/blog/repository/TagRepository.java

@@ -12,17 +12,16 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.repository;
+package org.expt.blog.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import org.examproject.blog.entity.Tag;
+import org.expt.blog.entity.Tag;
 
 /**
  * @author h.adachi
  */
 public interface TagRepository extends JpaRepository<Tag, Long> {
 
     Tag findByText(String text);
-
 }

model/src/main/java/org/examproject/blog/repository/UserRepository.java → model/src/main/java/org/expt/blog/repository/UserRepository.java

@@ -12,19 +12,18 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.repository;
+package org.expt.blog.repository;
 
 import java.lang.Long;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import org.examproject.blog.entity.User;
+import org.expt.blog.entity.User;
 
 /**
  * @author h.adachi
  */
 public interface UserRepository extends JpaRepository<User, Long> {
 
     User findByUsername(String username);
-
 }

model/src/test/resources/META-INF/persistence.xml

@@ -7,7 +7,7 @@
         <provider>org.hibernate.ejb.HibernatePersistence</provider>
         <non-jta-data-source/>
         <mapping-file>META-INF/orm.xml</mapping-file>
-        <class>org.examproject.blog.entity.Person</class>
+        <class>org.expt.blog.entity.Person</class>
         <properties>
             <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/>
             <property name="hibernate.cache.provider_class" value="org.hibernate.cache.NoCacheProvider"/>

model/src/test/resources/log4j.xml

@@ -26,7 +26,7 @@
         <priority value="info"/>
     </category>
 
-    <category name="org.examproject" >
+    <category name="org.expt" >
         <priority value="trace"/>
     </category>
 

model/src/test/resources/org/examproject/blog/data-config.xml → model/src/test/resources/org/expt/blog/data-config.xml

@@ -14,7 +14,7 @@
         http://www.springframework.org/schema/data/jpa 
         http://www.springframework.org/schema/data/jpa/spring-jpa.xsd">
 
-    <context:component-scan base-package="org.examproject"/>
+    <context:component-scan base-package="org.expt"/>
 
     <!--///////////////////////////////////////////////////////////////////////////////-->
     <!-- ORM JPA configure -->
@@ -51,6 +51,6 @@
     <bean class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
 
     <!-- for Spring Data JPA configure -->
-    <jpa:repositories base-package="org.examproject.repository" />
+    <jpa:repositories base-package="org.expt.repository" />
 
 </beans>

mvc/pom.xml

@@ -2,11 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.examproject.blog</groupId>
-    <artifactId>exmp-mvc</artifactId>
+    <groupId>org.expt.blog</groupId>
+    <artifactId>expt-mvc</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.3</version>
+    <version>1.0.4</version>
     <name>mvc</name>
 
     <properties>
@@ -23,10 +22,10 @@
         <!--//////////////////////////////////////////////////////////////////////////-->
         <!-- USER LIB -->
 
-        <!-- exmp-service -->
+        <!-- expt-service -->
         <dependency>
-            <groupId>org.examproject.blog</groupId>
-            <artifactId>exmp-service</artifactId>
+            <groupId>org.expt.blog</groupId>
+            <artifactId>expt-service</artifactId>
             <version>${version}</version>
         </dependency>
 

mvc/src/main/java/org/examproject/blog/controller/EntryController.java → mvc/src/main/java/org/expt/blog/controller/EntryController.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.controller;
+package org.expt.blog.controller;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,11 +35,11 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import org.examproject.blog.dto.EntryDto;
-import org.examproject.blog.form.EntryForm;
-import org.examproject.blog.model.EntryModel;
-import org.examproject.blog.service.EntryService;
-import org.examproject.blog.response.EntryResponse;
+import org.expt.blog.dto.EntryDto;
+import org.expt.blog.form.EntryForm;
+import org.expt.blog.model.EntryModel;
+import org.expt.blog.service.EntryService;
+import org.expt.blog.response.EntryResponse;
 
 /**
  * the entry controller class of the application.
@@ -75,11 +75,11 @@ public class EntryController {
         method=RequestMethod.GET
     )
     public void doForm(
-        @CookieValue(value="__exmp_blog_username", defaultValue="anonymous")
+        @CookieValue(value="__expt_blog_username", defaultValue="anonymous")
         String username,
-        @CookieValue(value="__exmp_blog_password", defaultValue="password")
+        @CookieValue(value="__expt_blog_password", defaultValue="password")
         String password,
-        @CookieValue(value="__exmp_blog_email", defaultValue="[email protected]")
+        @CookieValue(value="__expt_blog_email", defaultValue="[email protected]")
         String email,
         Model model
     ) {
@@ -341,5 +341,4 @@ private void addToResponse(
             false
         );
     }
-
 }

mvc/src/main/java/org/examproject/blog/controller/FeedController.java → mvc/src/main/java/org/expt/blog/controller/FeedController.java

@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-package org.examproject.blog.controller;
+package org.expt.blog.controller;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,9 +28,9 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import org.examproject.blog.dto.EntryDto;
-import org.examproject.blog.model.FeedModel;
-import org.examproject.blog.service.FeedService;
+import org.expt.blog.dto.EntryDto;
+import org.expt.blog.model.FeedModel;
+import org.expt.blog.service.FeedService;
 
 /**
  * the feed controller class of the application.
@@ -158,5 +158,4 @@ private List<FeedModel> getFeedModelList() {
 
         return feedModelList;
     }
-
 }