kaspersorensen commented on a change in pull request #211: METAMODEL-1207: fix regex pattern in order to fetch the correct version in all cases URL: https://github.com/apache/metamodel/pull/211#discussion_r263957828
########## File path: jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/VersionParser.java ########## @@ -0,0 +1,61 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.metamodel.jdbc.dialects; + + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Responsible to parse an input string and return a substring that + * represents the version based on {@link VERSION_REGEX}. + */ +class VersionParser { + private static final String VERSION_REGEX = "[0-9]+(\\.[0-9]+)+"; + + + /** + * @param stringToParse the string that contains the version. + * @return If the version exists returns the full version else empty string. + */ + public static String getVersion(String stringToParse){ + if(stringToParse != null) { + Matcher matcher = Pattern.compile(VERSION_REGEX).matcher(stringToParse); + if (matcher.find()){ + return matcher.group(); + } + } + return ""; + } + + /** + * @param stringToParse the string that contains the version. + * @return If the version exists returns only the number(s) before the first dot else 0. + */ + public static int getMajorVersion(String stringToParse){ + String fullVersion = getVersion(stringToParse); + if(fullVersion != null) { + int firstDot = fullVersion.indexOf('.'); + if(firstDot >= 0) { + return Integer.valueOf(fullVersion.substring(0, firstDot)); + } + } + return 0; Review comment: `0` is a bad exception value I think, because versions might easily be 0-based. Better to go with `-1`. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
