Merge pull request #2028 from nothingzhl/pr_optimization

Combined return value

Author: harawata

src/main/java/org/apache/ibatis/parsing/XNode.java

@@ -130,71 +130,47 @@ public String getStringBody() {
   }
 
   public String getStringBody(String def) {
-    if (body == null) {
-      return def;
-    } else {
-      return body;
-    }
+    return body == null ? def : body;
   }
 
   public Boolean getBooleanBody() {
     return getBooleanBody(null);
   }
 
   public Boolean getBooleanBody(Boolean def) {
-    if (body == null) {
-      return def;
-    } else {
-      return Boolean.valueOf(body);
-    }
+    return body == null ? def : Boolean.valueOf(body);
   }
 
   public Integer getIntBody() {
     return getIntBody(null);
   }
 
   public Integer getIntBody(Integer def) {
-    if (body == null) {
-      return def;
-    } else {
-      return Integer.parseInt(body);
-    }
+    return body == null ? def : Integer.valueOf(body);
   }
 
   public Long getLongBody() {
     return getLongBody(null);
   }
 
   public Long getLongBody(Long def) {
-    if (body == null) {
-      return def;
-    } else {
-      return Long.parseLong(body);
-    }
+    return body == null ? def : Long.valueOf(body);
   }
 
   public Double getDoubleBody() {
     return getDoubleBody(null);
   }
 
   public Double getDoubleBody(Double def) {
-    if (body == null) {
-      return def;
-    } else {
-      return Double.parseDouble(body);
-    }
+    return body == null ? def : Double.valueOf(body);
   }
 
   public Float getFloatBody() {
     return getFloatBody(null);
   }
 
   public Float getFloatBody(Float def) {
-    if (body == null) {
-      return def;
-    } else {
-      return Float.parseFloat(body);
-    }
+    return body == null ? def : Float.valueOf(body);
   }
 
   public <T extends Enum<T>> T getEnumAttribute(Class<T> enumType, String name) {
@@ -203,11 +179,7 @@ public <T extends Enum<T>> T getEnumAttribute(Class<T> enumType, String name) {
 
   public <T extends Enum<T>> T getEnumAttribute(Class<T> enumType, String name, T def) {
     String value = getStringAttribute(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Enum.valueOf(enumType, value);
-    }
+    return value == null ? def : Enum.valueOf(enumType,value);
   }
 
   /**
@@ -234,11 +206,7 @@ public String getStringAttribute(String name) {
 
   public String getStringAttribute(String name, String def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return value;
-    }
+    return value == null ? def : value;
   }
 
   public Boolean getBooleanAttribute(String name) {
@@ -247,11 +215,7 @@ public Boolean getBooleanAttribute(String name) {
 
   public Boolean getBooleanAttribute(String name, Boolean def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Boolean.valueOf(value);
-    }
+    return value == null ? def : Boolean.valueOf(value);
   }
 
   public Integer getIntAttribute(String name) {
@@ -260,11 +224,7 @@ public Integer getIntAttribute(String name) {
 
   public Integer getIntAttribute(String name, Integer def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Integer.parseInt(value);
-    }
+    return value == null ? def : Integer.valueOf(value);
   }
 
   public Long getLongAttribute(String name) {
@@ -273,11 +233,7 @@ public Long getLongAttribute(String name) {
 
   public Long getLongAttribute(String name, Long def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Long.parseLong(value);
-    }
+    return value == null ? def : Long.valueOf(value);
   }
 
   public Double getDoubleAttribute(String name) {
@@ -286,11 +242,7 @@ public Double getDoubleAttribute(String name) {
 
   public Double getDoubleAttribute(String name, Double def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Double.parseDouble(value);
-    }
+    return value == null ? def : Double.valueOf(value);
   }
 
   public Float getFloatAttribute(String name) {
@@ -299,11 +251,7 @@ public Float getFloatAttribute(String name) {
 
   public Float getFloatAttribute(String name, Float def) {
     String value = attributes.getProperty(name);
-    if (value == null) {
-      return def;
-    } else {
-      return Float.parseFloat(value);
-    }
+    return value == null ? def : Float.valueOf(value);
   }
 
   public List<XNode> getChildren() {