Make Pattern instance variables and avoid re calculating each time.

liquibase · Jan 9, 2023 · 2d94c47 · 2d94c47
1 parent 3d8e949
commit 2d94c47
Show file tree

Hide file tree

Showing 15 changed files with 149 additions and 140 deletions.
diff --git a/liquibase-core/src/main/java/liquibase/changelog/ChangelogRewriter.java b/liquibase-core/src/main/java/liquibase/changelog/ChangelogRewriter.java
@@ -15,6 +15,12 @@
 import java.util.regex.Pattern;
 
 public class ChangelogRewriter {
+
+    public static final String XSD_PATTERN_STRING = "([dbchangelog|liquibase-pro])-3.[0-9]?[0-9]?.xsd";
+    public static final Pattern XSD_PATTERN = Pattern.compile(XSD_PATTERN_STRING);
+    private static final String PATTERN_STRING = "(?ms).*<databaseChangeLog[^>]*>";
+    private static final Pattern PATTERN = Pattern.compile(PATTERN_STRING);
+
     /**
      *
      * Remove the changelog ID from the changelog file
@@ -117,17 +123,13 @@ public static ChangeLogRewriterResult addChangeLogId(String changeLogFile, Strin
             String encoding = GlobalConfiguration.OUTPUT_FILE_ENCODING.getCurrentValue();
             String changeLogString = StreamUtil.readStreamAsString(is, encoding);
             if (changeLogFile.toLowerCase().endsWith(".xml")) {
-                String patternString = "(?ms).*<databaseChangeLog[^>]*>";
-                Pattern pattern = Pattern.compile(patternString);
-                Matcher matcher = pattern.matcher(changeLogString);
+                Matcher matcher = PATTERN.matcher(changeLogString);
                 if (matcher.find()) {
                     //
                     // Update the XSD versions
                     //
                     String header = changeLogString.substring(matcher.start(), matcher.end() - 1);
-                    String xsdPatternString = "([dbchangelog|liquibase-pro])-3.[0-9]?[0-9]?.xsd";
-                    Pattern xsdPattern = Pattern.compile(xsdPatternString);
-                    Matcher xsdMatcher = xsdPattern.matcher(header);
+                    Matcher xsdMatcher = XSD_PATTERN.matcher(header);
                     String editedString = xsdMatcher.replaceAll("$1-" + XMLChangeLogSAXParser.getSchemaVersion() + ".xsd");
 
                     //
@@ -138,7 +140,7 @@ public static ChangeLogRewriterResult addChangeLogId(String changeLogFile, Strin
                         changeLogString = changeLogString.replaceFirst("/>", outputChangeLogString + "/>");
                     } else {
                         String outputHeader = editedString + outputChangeLogString + ">";
-                        changeLogString = changeLogString.replaceFirst(patternString, outputHeader);
+                        changeLogString = changeLogString.replaceFirst(PATTERN_STRING, outputHeader);
                     }
                 }
             } else if (changeLogFile.toLowerCase().endsWith(".sql")) {

diff --git a/liquibase-core/src/main/java/liquibase/database/OfflineConnection.java b/liquibase-core/src/main/java/liquibase/database/OfflineConnection.java
@@ -47,11 +47,13 @@ public class OfflineConnection implements DatabaseConnection {
     private boolean sendsStringParametersAsUnicode = true;
     private String connectionUserName;
 
+    private static final Pattern PATTERN = Pattern.compile("offline:(\\w+)\\??(.*)");
+
     public OfflineConnection() {}
 
     public OfflineConnection(String url, ResourceAccessor resourceAccessor) {
         this.url = url;
-        Matcher matcher = Pattern.compile("offline:(\\w+)\\??(.*)").matcher(url);
+        Matcher matcher = PATTERN.matcher(url);
         if (!matcher.matches()) {
             throw new UnexpectedLiquibaseException("Could not parse offline url " + url);
         }

diff --git a/liquibase-core/src/main/java/liquibase/database/core/CockroachDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/CockroachDatabase.java
@@ -19,6 +19,8 @@ public class CockroachDatabase extends PostgresDatabase {
     private Integer databaseMajorVersion;
     private Integer databaseMinorVersion;
 
+    private static final Pattern VERSION_PATTERN = Pattern.compile("v(\\d+)\\.(\\d+)\\.(\\d+)");
+
     public CockroachDatabase() {
         super.setCurrentDateTimeFunction("NOW()");
     }
@@ -107,7 +109,7 @@ public void setConnection(DatabaseConnection conn) {
                 String version = Scope.getCurrentScope().getSingleton(ExecutorService.class).
                         getExecutor("jdbc", this).queryForObject(new RawSqlStatement("SELECT version()"), String.class);
 
-                final Matcher versionMatcher = Pattern.compile("v(\\d+)\\.(\\d+)\\.(\\d+)").matcher(version);
+                final Matcher versionMatcher = VERSION_PATTERN.matcher(version);
                 if (versionMatcher.find()) {
                     this.databaseMajorVersion = Integer.parseInt(versionMatcher.group(1));
                     this.databaseMinorVersion = Integer.parseInt(versionMatcher.group(2));

diff --git a/liquibase-core/src/main/java/liquibase/database/core/H2Database.java b/liquibase-core/src/main/java/liquibase/database/core/H2Database.java
@@ -29,6 +29,7 @@
 
 public class H2Database extends AbstractJdbcDatabase {
 
+    private static final Pattern PATCH_VERSION_PATTERN = Pattern.compile("^(?:\\d+\\.)(?:\\d+\\.)(\\d+).*$");
     private static String START_CONCAT = "CONCAT(";
     private static String END_CONCAT = ")";
     private static String SEP_CONCAT = ", ";
@@ -384,8 +385,7 @@ && getBuildVersion() >= BUILD_VERSION_FOR_MINMAX_IN_SEQUENCES) {
 
     private int getBuildVersion() throws DatabaseException {
 
-        Pattern patchVersionPattern = Pattern.compile("^(?:\\d+\\.)(?:\\d+\\.)(\\d+).*$");
-        Matcher matcher = patchVersionPattern.matcher(getDatabaseProductVersion());
+        Matcher matcher = PATCH_VERSION_PATTERN.matcher(getDatabaseProductVersion());
 
         if (matcher.matches()) {
             return Integer.parseInt(matcher.group(1));

diff --git a/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java b/liquibase-core/src/main/java/liquibase/database/core/OracleDatabase.java
@@ -38,6 +38,8 @@
 public class OracleDatabase extends AbstractJdbcDatabase {
 	public static final Pattern PROXY_USER = Pattern.compile(".*(?:thin|oci)\\:(.+)/@.*");
 
+    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\..*");
+
     public static final String PRODUCT_NAME = "oracle";
     private static ResourceBundle coreBundle = getBundle("liquibase/i18n/liquibase-core");
     protected final int SHORT_IDENTIFIERS_LENGTH = 30;
@@ -156,7 +158,7 @@ public void setConnection(DatabaseConnection conn) {
 
                     String compatibleVersion = statement.getString(2);
                     if (compatibleVersion != null) {
-                        Matcher majorVersionMatcher = Pattern.compile("(\\d+)\\.(\\d+)\\..*").matcher(compatibleVersion);
+                        Matcher majorVersionMatcher = VERSION_PATTERN.matcher(compatibleVersion);
                         if (majorVersionMatcher.matches()) {
                             this.databaseMajorVersion = Integer.valueOf(majorVersionMatcher.group(1));
                             this.databaseMinorVersion = Integer.valueOf(majorVersionMatcher.group(2));

diff --git a/liquibase-core/src/main/java/liquibase/datatype/core/TimeType.java b/liquibase-core/src/main/java/liquibase/datatype/core/TimeType.java
@@ -20,6 +20,7 @@
 public class TimeType extends LiquibaseDataType {
 
     protected static final int MSSQL_TYPE_TIME_DEFAULT_PRECISION = 7;
+    public static final Pattern PATTERN = Pattern.compile("(\\(\\d+\\))");
 
     @Override
     public DatabaseDataType toDatabaseDataType(Database database) {
@@ -63,7 +64,7 @@ public DatabaseDataType toDatabaseDataType(Database database) {
 
             final Object[] parameters = getParameters();
             if (parameters == null || parameters.length == 0) {
-                final Matcher precisionMatcher = Pattern.compile("(\\(\\d+\\))").matcher(rawDefinition);
+                final Matcher precisionMatcher = PATTERN.matcher(rawDefinition);
                 if (precisionMatcher.find()) {
                     datatype = new DatabaseDataType(datatype.getType() + precisionMatcher.group(1));
                 }