重构,将LunarDate与SolarDate统一为CalendarDate.

jstarcraft-core-common/src/main/java/com/jstarcraft/core/common/instant/CalendarDate.java

@@ -0,0 +1,39 @@
+package com.jstarcraft.core.common.instant;
+
+/**
+ * 历法日期
+ * 
+ * @author Birdy
+ *
+ */
+public interface CalendarDate {
+
+    /**
+     * 获取历法年
+     * 
+     * @return
+     */
+    int getYear();
+
+    /***
+     * 获取历法月
+     * 
+     * @return
+     */
+    int getMonth();
+
+    /**
+     * 获取历法日
+     * 
+     * @return
+     */
+    int getDay();
+
+    /**
+     * 是否闰
+     * 
+     * @return
+     */
+    boolean isLeap();
+
+}

jstarcraft-core-common/src/main/java/com/jstarcraft/core/common/instant/LunarDate.java

@@ -9,7 +9,7 @@
  * @author Birdy
  *
  */
-public class LunarDate {
+public class LunarDate implements CalendarDate {
 
     /**
      * 支持的最小年份
@@ -415,6 +415,7 @@ public LunarDate(int year, boolean leap, int month, int day) {
      * 
      * @return
      */
+    @Override
     public int getYear() {
         return year;
     }
@@ -424,6 +425,7 @@ public int getYear() {
      * 
      * @return
      */
+    @Override
     public int getMonth() {
         return month;
     }
@@ -433,6 +435,7 @@ public int getMonth() {
      * 
      * @return
      */
+    @Override
     public int getDay() {
         return day;
     }
@@ -442,6 +445,7 @@ public int getDay() {
      * 
      * @return
      */
+    @Override
     public boolean isLeap() {
         return leap;
     }

jstarcraft-core-common/src/main/java/com/jstarcraft/core/common/instant/SolarDate.java

@@ -8,7 +8,7 @@
  * @author Birdy
  *
  */
-public class SolarDate {
+public class SolarDate implements CalendarDate {
 
     private LocalDate date;
 
@@ -33,6 +33,7 @@ public SolarDate(int year, int month, int day) {
      * 
      * @return
      */
+    @Override
     public int getYear() {
         return date.getYear();
     }
@@ -42,6 +43,7 @@ public int getYear() {
      * 
      * @return
      */
+    @Override
     public int getMonth() {
         return date.getMonthValue();
     }
@@ -51,6 +53,7 @@ public int getMonth() {
      * 
      * @return
      */
+    @Override
     public int getDay() {
         return date.getDayOfMonth();
     }
@@ -60,6 +63,7 @@ public int getDay() {
      * 
      * @return
      */
+    @Override
     public boolean isLeap() {
         return date.isLeapYear();
     }

jstarcraft-core-common/src/test/java/com/jstarcraft/core/common/instant/Lunar2SolarTestCase.java

@@ -1,14 +1,9 @@
 package com.jstarcraft.core.common.instant;
 
-import java.time.LocalDate;
-
 import org.hamcrest.CoreMatchers;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.jstarcraft.core.common.instant.LunarDate;
-import com.jstarcraft.core.common.instant.SolarDate;
-
 public class Lunar2SolarTestCase {
 
     @Test