Added several new finals

added private constructors to pure utility static classes
Refactored Version class to be immutable

Author: Pazus

src/main/java/org/utplsql/api/EnvironmentVariableUtil.java

@@ -18,6 +18,8 @@
  */
 public class EnvironmentVariableUtil {
 
+    private EnvironmentVariableUtil() {}
+
     /**
      * Returns the value for a given key from environment (see class description)
      *
@@ -43,4 +45,6 @@ public static String getEnvValue(String key, String defaultValue) {
 
         return val;
     }
+
+
 }

src/main/java/org/utplsql/api/JavaApiVersionInfo.java

@@ -7,6 +7,8 @@
  */
 public class JavaApiVersionInfo {
 
+    private JavaApiVersionInfo() { }
+
     private static final String BUILD_NO = "123";
     private static final String MAVEN_PROJECT_NAME = "utPLSQL-java-api";
     private static final String MAVEN_PROJECT_VERSION = "3.1.1-SNAPSHOT";

src/main/java/org/utplsql/api/ResourceUtil.java

@@ -21,6 +21,8 @@
  */
 public class ResourceUtil {
 
+    private ResourceUtil() {}
+
     /**
      * Returns the Path to a resource so it is walkable no matter if it's inside a jar or on the file system
      *

src/main/java/org/utplsql/api/Version.java

@@ -10,44 +10,52 @@
  * @author pesse
  */
 public class Version implements Comparable<Version> {
-    private String origString;
-    private Integer major;
-    private Integer minor;
-    private Integer bugfix;
-    private Integer build;
-    private boolean valid = false;
+    private final String origString;
+    private final Integer major;
+    private final Integer minor;
+    private final Integer bugfix;
+    private final Integer build;
+    private final boolean valid;
 
     public Version( String versionString ) {
         assert versionString != null;
-        this.origString = versionString;
-        parseVersionString();
-    }
+        this.origString = versionString.trim();
 
-    private void parseVersionString()
-    {
         Pattern p = Pattern.compile("([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?\\.?([0-9]+)?");
 
         Matcher m = p.matcher(origString);
 
+        Integer major = null;
+        Integer minor = null;
+        Integer bugfix = null;
+        Integer build = null;
+        boolean valid = false;
+
         try {
             if (m.find()) {
-                if ( m.group(1) != null )
+                if (m.group(1) != null )
                     major = Integer.valueOf(m.group(1));
-                if ( m.group(2) != null )
+                if (m.group(2) != null )
                     minor = Integer.valueOf(m.group(2));
-                if ( m.group(3) != null )
+                if (m.group(3) != null )
                     bugfix = Integer.valueOf(m.group(3));
-                if ( m.group(4) != null )
+                if (m.group(4) != null )
                     build = Integer.valueOf(m.group(4));
 
-                if ( major != null ) // We need a valid major version as minimum requirement for a Version object to be valid
-                    valid = true;
+                 // We need a valid major version as minimum requirement for a Version object to be valid
+                valid = major != null;
             }
         }
         catch ( NumberFormatException e )
         {
             valid = false;
         }
+
+        this.major = major;
+        this.minor = minor;
+        this.bugfix = bugfix;
+        this.build = build;
+        this.valid = valid;
     }
 
     @Override

src/main/java/org/utplsql/api/compatibility/OptionalFeatures.java

@@ -12,15 +12,13 @@ public enum OptionalFeatures {
     FRAMEWORK_COMPATIBILITY_CHECK("3.0.3", null),
     CUSTOM_REPORTERS("3.1.0", null);
 
-    private Version minVersion;
-    private Version maxVersion;
+    private final Version minVersion;
+    private final Version maxVersion;
 
     OptionalFeatures( String minVersion, String maxVersion )
     {
-        if ( minVersion != null )
-            this.minVersion = new Version(minVersion);
-        if ( maxVersion != null)
-            this.maxVersion = new Version(maxVersion);
+        this.minVersion = minVersion != null ? new Version(minVersion) : null;
+        this.maxVersion = maxVersion != null ? new Version(maxVersion) : null;
     }
 
     public boolean isAvailableFor(Version version ) {

src/main/java/org/utplsql/api/outputBuffer/AbstractOutputBuffer.java

@@ -19,7 +19,7 @@
  */
 abstract class AbstractOutputBuffer implements OutputBuffer {
 
-    private Reporter reporter;
+    private final Reporter reporter;
     private int fetchSize = 100;
 
     /**

src/main/java/org/utplsql/api/outputBuffer/OutputBufferProvider.java

@@ -60,4 +60,7 @@ private static boolean hasOutput( Reporter reporter, OracleConnection oraConn )
             }
         }
     }
+
+    private OutputBufferProvider() {
+    }
 }

src/main/java/org/utplsql/api/testRunner/TestRunnerStatementProvider.java

@@ -37,4 +37,7 @@ else if (databaseVersion.isLessThan(new Version("3.1.2")))
 
         return stmt;
     }
+
+    private TestRunnerStatementProvider() {
+    }
 }