Revert changes on PropertParser for applying review comment of mybati…

…sgh-2886
kazuki43zoo · Jun 10, 2023 · c8ff596 · c8ff596
1 parent 2b3f932
commit c8ff596
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java b/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java
@@ -381,10 +381,9 @@ private <T> T parseStringValue(String valueString, T fallbackValue, Function<Str
     if (valueString.isEmpty()) {
       return fallbackValue;
     } else {
-      Properties defaults = new Properties();
+      Properties variables = new Properties();
       Optional.ofNullable(fallbackValue).map(String::valueOf)
-          .ifPresent(x -> defaults.setProperty(TOKEN_PARSER.parse(valueString), x));
-      Properties variables = new Properties(defaults);
+          .ifPresent(x -> variables.setProperty(TOKEN_PARSER.parse(valueString), x));
       variables.putAll(configuration.getVariables());
       return Optional.ofNullable(PropertyParser.parse(valueString, variables)).map(valueTypeConverter)
           .orElse(fallbackValue);

diff --git a/src/main/java/org/apache/ibatis/parsing/PropertyParser.java b/src/main/java/org/apache/ibatis/parsing/PropertyParser.java
@@ -88,9 +88,8 @@ public String handleToken(String content) {
             return variables.getProperty(key, defaultValue);
           }
         }
-        String value = variables.getProperty(key);
-        if (value != null) {
-          return value;
+        if (variables.containsKey(key)) {
+          return variables.getProperty(key);
         }
       }
       return "${" + content + "}";