fix bug #2

fix some uncheck null issue
add 2017,2018 holiday info

Author: aaronshan

README.md

@@ -35,7 +35,7 @@ It will generate hive-third-functions-${version}-shaded.jar in target directory.
 
 You can also directly download file from [release page](https://github.com/aaronshan/hive-third-functions/releases).
 
-> current latest version is `2.1.1`
+> current latest version is `2.1.2`
 
 ## Functions
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cc.shanruifeng</groupId>
     <artifactId>hive-third-functions</artifactId>
-    <version>2.1.1</version>
+    <version>2.1.2</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardArea.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardArea() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getIdCardArea(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardBirthday.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardBirthday() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getIdCardBirthday(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardCity.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardCity() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getIdCardCity(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardGender.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardGender() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getIdCardGender(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardInfo.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardInfo() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getJsonOfChinaIdCard(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardProvince.java

@@ -20,6 +20,9 @@ public UDFChinaIdCardProvince() {
     }
 
     public Text evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.getIdCardProvince(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/card/UDFChinaIdCardValid.java

@@ -21,6 +21,9 @@ public UDFChinaIdCardValid() {
     }
 
     public BooleanWritable evaluate(Text idCard) {
+        if (idCard == null) {
+            return null;
+        }
         result.set(CardUtils.isValidIdCard(idCard.toString()));
         return result;
     }

src/main/java/cc/shanruifeng/functions/date/UDFZodiacSignCn.java

@@ -24,6 +24,9 @@ public UDFZodiacSignCn() {
     }
 
     public Text evaluate(Text birthday) {
+        if (birthday == null) {
+            return null;
+        }
         DateTime dateTime = null;
         try {
             dateTime = DateTime.parse(birthday.toString(), DEFAULT_DATE_FORMATTER);
@@ -35,11 +38,17 @@ public Text evaluate(Text birthday) {
     }
 
     public Text evaluate(Date birthday) {
+        if (birthday == null) {
+            return null;
+        }
         DateTime dateTime = new DateTime(birthday);
         return evaluate(new IntWritable(dateTime.getMonthOfYear()), new IntWritable(dateTime.getDayOfMonth()));
     }
 
     public Text evaluate(IntWritable month, IntWritable day) {
+        if (month == null || day == null) {
+            return null;
+        }
         result.set(getZodiac(month.get(), day.get()));
         return result;
     }