Refactor rename internal methods only

Author: rbygrave

ebean-datasource-api/src/main/java/io/ebean/datasource/DSManager.java

@@ -1,6 +1,5 @@
 package io.ebean.datasource;
 
-import java.util.Iterator;
 import java.util.ServiceLoader;
 
 /**
@@ -11,11 +10,9 @@ final class DSManager {
   private static final DataSourceFactory factory = init();
 
   private static DataSourceFactory init() {
-    Iterator<DataSourceFactory> loader = ServiceLoader.load(DataSourceFactory.class).iterator();
-    if (loader.hasNext()) {
-      return loader.next();
-    }
-    throw new IllegalStateException("No service implementation found for DataSourceFactory in the classpath, please add ebean-datasource to the classpath.");
+    return ServiceLoader.load(DataSourceFactory.class)
+      .findFirst()
+      .orElseThrow(() -> new IllegalStateException("No DataSourceFactory, add ebean-datasource to the classpath."));
   }
 
   static DataSourceFactory get() {

ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceConfig.java

@@ -884,8 +884,8 @@ private void loadSettings(ConfigPropertiesHelper properties) {
     poolListener = properties.get("poolListener", poolListener);
     offline = properties.getBoolean("offline", offline);
 
-    String isoLevel = properties.get("isolationLevel", getTransactionIsolationLevel(isolationLevel));
-    this.isolationLevel = getTransactionIsolationLevel(isoLevel);
+    String isoLevel = properties.get("isolationLevel", isolationLevel(isolationLevel));
+    this.isolationLevel = isolationLevel(isoLevel);
     this.initSql = parseSql(properties.get("initSql", null));
     this.failOnStart = properties.getBoolean("failOnStart", failOnStart);
 
@@ -934,7 +934,7 @@ Map<String, String> parseCustom(String customProperties) {
   /**
    * Return the isolation level description from the associated Connection int value.
    */
-  private String getTransactionIsolationLevel(int level) {
+  private String isolationLevel(int level) {
     switch (level) {
       case Connection.TRANSACTION_NONE:
         return "NONE";
@@ -954,7 +954,7 @@ private String getTransactionIsolationLevel(int level) {
   /**
    * Return the isolation level for a given string description.
    */
-  private int getTransactionIsolationLevel(String level) {
+  private int isolationLevel(String level) {
     level = level.toUpperCase();
     if (level.startsWith("TRANSACTION")) {
       level = level.substring("TRANSACTION".length());