Merge pull request #3360 from hazendaz/pom-cleanup

Fix casing

Author: hazendaz

src/main/java/org/apache/ibatis/datasource/jndi/JndiDataSourceFactory.java

@@ -66,16 +66,15 @@ public DataSource getDataSource() {
   }
 
   private static Properties getEnvProperties(Properties allProps) {
-    final String PREFIX = ENV_PREFIX;
     Properties contextProperties = null;
     for (Entry<Object, Object> entry : allProps.entrySet()) {
       String key = (String) entry.getKey();
       String value = (String) entry.getValue();
-      if (key.startsWith(PREFIX)) {
+      if (key.startsWith(ENV_PREFIX)) {
         if (contextProperties == null) {
           contextProperties = new Properties();
         }
-        contextProperties.put(key.substring(PREFIX.length()), value);
+        contextProperties.put(key.substring(ENV_PREFIX.length()), value);
       }
     }
     return contextProperties;

src/main/java/org/apache/ibatis/scripting/LanguageDriverRegistry.java

@@ -25,15 +25,15 @@
  */
 public class LanguageDriverRegistry {
 
-  private final Map<Class<? extends LanguageDriver>, LanguageDriver> LANGUAGE_DRIVER_MAP = new HashMap<>();
+  private final Map<Class<? extends LanguageDriver>, LanguageDriver> languageDriverMap = new HashMap<>();
 
   private Class<? extends LanguageDriver> defaultDriverClass;
 
   public void register(Class<? extends LanguageDriver> cls) {
     if (cls == null) {
       throw new IllegalArgumentException("null is not a valid Language Driver");
     }
-    MapUtil.computeIfAbsent(LANGUAGE_DRIVER_MAP, cls, k -> {
+    MapUtil.computeIfAbsent(languageDriverMap, cls, k -> {
       try {
         return k.getDeclaredConstructor().newInstance();
       } catch (Exception ex) {
@@ -47,13 +47,13 @@ public void register(LanguageDriver instance) {
       throw new IllegalArgumentException("null is not a valid Language Driver");
     }
     Class<? extends LanguageDriver> cls = instance.getClass();
-    if (!LANGUAGE_DRIVER_MAP.containsKey(cls)) {
-      LANGUAGE_DRIVER_MAP.put(cls, instance);
+    if (!languageDriverMap.containsKey(cls)) {
+      languageDriverMap.put(cls, instance);
     }
   }
 
   public LanguageDriver getDriver(Class<? extends LanguageDriver> cls) {
-    return LANGUAGE_DRIVER_MAP.get(cls);
+    return languageDriverMap.get(cls);
   }
 
   public LanguageDriver getDefaultDriver() {

src/test/java/org/apache/ibatis/autoconstructor/ExtensiveSubject.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -53,6 +53,6 @@ public ExtensiveSubject(final byte aByte, final short aShort, final char aChar,
   }
 
   public enum TestEnum {
-    AVALUE, BVALUE, CVALUE;
+    AVALUE, BVALUE, CVALUE
   }
 }

src/test/java/org/apache/ibatis/builder/XmlConfigBuilderTest.java

@@ -155,7 +155,7 @@ public E getNullableResult(CallableStatement cs, int columnIndex) throws SQLExce
 
   @Test
   void registerJavaTypeInitializingTypeHandler() {
-    final String MAPPER_CONFIG = """
+    final String mapperConfig = """
         <?xml version="1.0" encoding="UTF-8" ?>
         <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
         <configuration>
@@ -166,7 +166,7 @@ void registerJavaTypeInitializingTypeHandler() {
         </configuration>
         """;
 
-    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
+    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(mapperConfig));
     builder.parse();
 
     TypeHandlerRegistry typeHandlerRegistry = builder.getConfiguration().getTypeHandlerRegistry();
@@ -283,7 +283,7 @@ void parseIsTwice() throws Exception {
 
   @Test
   void unknownSettings() {
-    final String MAPPER_CONFIG = """
+    final String mapperConfig = """
         <?xml version="1.0" encoding="UTF-8" ?>
         <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
         <configuration>
@@ -293,15 +293,15 @@ void unknownSettings() {
         </configuration>
         """;
 
-    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
+    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(mapperConfig));
     when(builder::parse);
     then(caughtException()).isInstanceOf(BuilderException.class)
         .hasMessageContaining("The setting foo is not known.  Make sure you spelled it correctly (case sensitive).");
   }
 
   @Test
   void unknownJavaTypeOnTypeHandler() {
-    final String MAPPER_CONFIG = """
+    final String mapperConfig = """
         <?xml version="1.0" encoding="UTF-8" ?>
         <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
         <configuration>
@@ -311,23 +311,23 @@ void unknownJavaTypeOnTypeHandler() {
         </configuration>
         """;
 
-    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
+    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(mapperConfig));
     when(builder::parse);
     then(caughtException()).isInstanceOf(BuilderException.class)
         .hasMessageContaining("Error registering typeAlias for 'null'. Cause: ");
   }
 
   @Test
   void propertiesSpecifyResourceAndUrlAtSameTime() {
-    final String MAPPER_CONFIG = """
+    final String mapperConfig = """
         <?xml version="1.0" encoding="UTF-8" ?>
         <!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "https://mybatis.org/dtd/mybatis-3-config.dtd">
         <configuration>
           <properties resource="a/b/c/foo.properties" url="file:./a/b/c/jdbc.properties"/>
         </configuration>
         """;
 
-    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(MAPPER_CONFIG));
+    XMLConfigBuilder builder = new XMLConfigBuilder(new StringReader(mapperConfig));
     when(builder::parse);
     then(caughtException()).isInstanceOf(BuilderException.class).hasMessageContaining(
         "The properties element cannot specify both a URL and a resource based property file reference.  Please specify one or the other.");

src/test/java/org/apache/ibatis/submitted/camelcase/Camel.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2022 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -19,6 +19,8 @@ public class Camel {
 
   private String id;
   private String firstName;
+
+  // Required to be upper cased
   private String LAST_NAME;
 
   public String getId() {
@@ -41,8 +43,8 @@ public String getLAST_NAME() {
     return LAST_NAME;
   }
 
-  public void setLAST_NAME(String last_name) {
-    LAST_NAME = last_name;
+  public void setLAST_NAME(String lastName) {
+    LAST_NAME = lastName;
   }
 
 }