update year

Signed-off-by: Sergei Malafeev <sergeymalafeev@gmail.com>
opentracing-contrib · Jan 2, 2020 · dfb8f3e · dfb8f3e
1 parent 90e6b8c
commit dfb8f3e
Show file tree

Hide file tree

Showing 27 changed files with 202 additions and 200 deletions.
diff --git a/.settings.xml b/.settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017-2019 The OpenTracing Authors
+    Copyright 2017-2020 The OpenTracing Authors
 
     Licensed 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

diff --git a/pom.xml b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2017-2019 The OpenTracing Authors
+    Copyright 2017-2020 The OpenTracing Authors
 
     Licensed 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
@@ -23,7 +23,7 @@
   <name>${project.groupId}:${project.artifactId}</name>
   <description>OpenTracing Instrumentation for JDBC API</description>
   <url>https://github.com/opentracing-contrib/java-jdbc</url>
-  <inceptionYear>2017-2019</inceptionYear>
+  <inceptionYear>2017-2020</inceptionYear>
 
   <scm>
     <url>http://github.com/opentracing-contrib/java-jdbc</url>

diff --git a/src/main/java/io/opentracing/contrib/jdbc/ConnectionInfo.java b/src/main/java/io/opentracing/contrib/jdbc/ConnectionInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/JdbcTracingUtils.java b/src/main/java/io/opentracing/contrib/jdbc/JdbcTracingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/TracingCallableStatement.java b/src/main/java/io/opentracing/contrib/jdbc/TracingCallableStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/TracingConnection.java b/src/main/java/io/opentracing/contrib/jdbc/TracingConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/TracingDriver.java b/src/main/java/io/opentracing/contrib/jdbc/TracingDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/TracingPreparedStatement.java b/src/main/java/io/opentracing/contrib/jdbc/TracingPreparedStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/TracingStatement.java b/src/main/java/io/opentracing/contrib/jdbc/TracingStatement.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/AbstractURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/AbstractURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/ConnectionURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/ConnectionURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/H2URLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/H2URLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/MariadbURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/MariadbURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/MysqlURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/MysqlURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/OracleURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/OracleURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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
@@ -13,140 +13,140 @@
  */
 package io.opentracing.contrib.jdbc.parser;
 
+import io.opentracing.contrib.jdbc.ConnectionInfo;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import io.opentracing.contrib.jdbc.ConnectionInfo;
-
 public class OracleURLParser implements ConnectionURLParser {
-    public static final String DB_TYPE = "oracle";
-    public static final String PREFIX = "jdbc:oracle:thin:";
-    public static final int DEFAULT_PORT = 1521;
-    private static Pattern EASY_CONNECT_PATTERN = Pattern.compile(
-        "(?<username>.*)@(//)?(?<host>[^:/]+)(?<port>:[0-9]+)?(?<service>[:/][^:/]+)?(?<server>:[^:/]+)?(?<instance>/[^:/]+)?");
+  public static final String DB_TYPE = "oracle";
+  public static final String PREFIX = "jdbc:oracle:thin:";
+  public static final int DEFAULT_PORT = 1521;
+  private static Pattern EASY_CONNECT_PATTERN = Pattern.compile(
+      "(?<username>.*)@(//)?(?<host>[^:/]+)(?<port>:[0-9]+)?(?<service>[:/][^:/]+)?(?<server>:[^:/]+)?(?<instance>/[^:/]+)?");
 
-    @Override
-    public ConnectionInfo parse(final String url) {
-        if (url != null && url.startsWith(PREFIX)) {
-            OracleConnectionInfo connectionInfo = parseTnsName(url.substring(PREFIX.length()));
-            if (connectionInfo == null) {
-                connectionInfo = parseEasyConnect(url.substring(PREFIX.length()));
-            }
-            if (connectionInfo != null) {
-                return new ConnectionInfo.Builder(connectionInfo.getDbPeer()) //
-                    .dbType(DB_TYPE) //
-                    .dbInstance(connectionInfo.getDbInstance()) //
-                    .build();
-            }
-        }
-        return null;
+  @Override
+  public ConnectionInfo parse(final String url) {
+    if (url != null && url.startsWith(PREFIX)) {
+      OracleConnectionInfo connectionInfo = parseTnsName(url.substring(PREFIX.length()));
+      if (connectionInfo == null) {
+        connectionInfo = parseEasyConnect(url.substring(PREFIX.length()));
+      }
+      if (connectionInfo != null) {
+        return new ConnectionInfo.Builder(connectionInfo.getDbPeer()) //
+            .dbType(DB_TYPE) //
+            .dbInstance(connectionInfo.getDbInstance()) //
+            .build();
+      }
     }
+    return null;
+  }
 
-    private OracleConnectionInfo parseTnsName(final String url) {
-        final String hosts = parseDatabaseHostsFromTnsUrl(url);
-        if (hosts != null) {
-            final int idxServiceName = url.indexOf("SERVICE_NAME");
-            final int start = url.indexOf('=', idxServiceName) + 1;
-            final int end = url.indexOf(")", start);
-            final String serviceName = url.substring(start, end);
-            return new OracleConnectionInfo() //
-                .setDbPeer(hosts) //
-                .setDbInstance(serviceName);
-        }
-        return null;
+  private OracleConnectionInfo parseTnsName(final String url) {
+    final String hosts = parseDatabaseHostsFromTnsUrl(url);
+    if (hosts != null) {
+      final int idxServiceName = url.indexOf("SERVICE_NAME");
+      final int start = url.indexOf('=', idxServiceName) + 1;
+      final int end = url.indexOf(")", start);
+      final String serviceName = url.substring(start, end);
+      return new OracleConnectionInfo() //
+          .setDbPeer(hosts) //
+          .setDbInstance(serviceName);
     }
+    return null;
+  }
 
-    public static String parseDatabaseHostsFromTnsUrl(String url) {
-        int beginIndex = url.indexOf("DESCRIPTION");
-        if (beginIndex == -1) {
-            return null;
-        }
-        List<String> hosts = new ArrayList<String>();
-        do {
-            int hostStartIndex = url.indexOf("HOST", beginIndex);
-            if (hostStartIndex == -1) {
-                break;
-            }
-            int equalStartIndex = url.indexOf("=", hostStartIndex);
-            int hostEndIndex = url.indexOf(")", hostStartIndex);
-            String host = url.substring(equalStartIndex + 1, hostEndIndex);
-
-            int port = DEFAULT_PORT;
-            int portStartIndex = url.indexOf("PORT", hostEndIndex);
-            int portEndIndex = url.length();
-            if (portStartIndex != -1) {
-                int portEqualStartIndex = url.indexOf("=", portStartIndex);
-                portEndIndex = url.indexOf(")", portEqualStartIndex);
-                port = Integer.parseInt(url.substring(portEqualStartIndex + 1, portEndIndex).trim());
-            }
-            hosts.add(host.trim() + ":" + port);
-            beginIndex = portEndIndex;
-        } while (true);
-        return join(",", hosts);
+  public static String parseDatabaseHostsFromTnsUrl(String url) {
+    int beginIndex = url.indexOf("DESCRIPTION");
+    if (beginIndex == -1) {
+      return null;
     }
+    List<String> hosts = new ArrayList<String>();
+    do {
+      int hostStartIndex = url.indexOf("HOST", beginIndex);
+      if (hostStartIndex == -1) {
+        break;
+      }
+      int equalStartIndex = url.indexOf("=", hostStartIndex);
+      int hostEndIndex = url.indexOf(")", hostStartIndex);
+      String host = url.substring(equalStartIndex + 1, hostEndIndex);
+
+      int port = DEFAULT_PORT;
+      int portStartIndex = url.indexOf("PORT", hostEndIndex);
+      int portEndIndex = url.length();
+      if (portStartIndex != -1) {
+        int portEqualStartIndex = url.indexOf("=", portStartIndex);
+        portEndIndex = url.indexOf(")", portEqualStartIndex);
+        port = Integer.parseInt(url.substring(portEqualStartIndex + 1, portEndIndex).trim());
+      }
+      hosts.add(host.trim() + ":" + port);
+      beginIndex = portEndIndex;
+    } while (true);
+    return join(",", hosts);
+  }
 
-    private static String join(String delimiter, List<String> list) {
-        if (list == null || list.isEmpty()) {
-            return "";
-        }
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0, len = list.size(); i < len; i++) {
-            if (i == (len - 1)) {
-                builder.append(list.get(i));
-            } else {
-                builder.append(list.get(i)).append(delimiter);
-            }
-        }
-        return builder.toString();
+  private static String join(String delimiter, List<String> list) {
+    if (list == null || list.isEmpty()) {
+      return "";
     }
+    StringBuilder builder = new StringBuilder();
+    for (int i = 0, len = list.size(); i < len; i++) {
+      if (i == (len - 1)) {
+        builder.append(list.get(i));
+      } else {
+        builder.append(list.get(i)).append(delimiter);
+      }
+    }
+    return builder.toString();
+  }
 
-    /**
-     * Implementation according to https://www.oracle.com/technetwork/database/enterprise-edition/oraclenetservices-neteasyconnect-133058.pdf
-     *
-     * @param url the url without the oracle jdbc prefix
-     * @return the oracle connection info if the url could be parsed, or null otherwise.
-     */
-    public static OracleConnectionInfo parseEasyConnect(final String url) {
-        final Matcher matcher = EASY_CONNECT_PATTERN.matcher(url);
-        if (matcher.matches()) {
-            final OracleConnectionInfo result = new OracleConnectionInfo();
-            final String host = matcher.group("host");
-            final String portGroup = matcher.group("port");
-            final int dbPort = portGroup != null ? Integer.parseInt(portGroup.substring(1)) : DEFAULT_PORT;
-            result.setDbPeer(host + ":" + dbPort);
-            final String service = matcher.group("service");
-            if (service != null) {
-                result.setDbInstance(service.substring(1));
-            } else {
-                result.setDbInstance(host);
-            }
-            return result;
-        }
-        return null;
+  /**
+   * Implementation according to https://www.oracle.com/technetwork/database/enterprise-edition/oraclenetservices-neteasyconnect-133058.pdf
+   *
+   * @param url the url without the oracle jdbc prefix
+   * @return the oracle connection info if the url could be parsed, or null otherwise.
+   */
+  public static OracleConnectionInfo parseEasyConnect(final String url) {
+    final Matcher matcher = EASY_CONNECT_PATTERN.matcher(url);
+    if (matcher.matches()) {
+      final OracleConnectionInfo result = new OracleConnectionInfo();
+      final String host = matcher.group("host");
+      final String portGroup = matcher.group("port");
+      final int dbPort =
+          portGroup != null ? Integer.parseInt(portGroup.substring(1)) : DEFAULT_PORT;
+      result.setDbPeer(host + ":" + dbPort);
+      final String service = matcher.group("service");
+      if (service != null) {
+        result.setDbInstance(service.substring(1));
+      } else {
+        result.setDbInstance(host);
+      }
+      return result;
     }
+    return null;
+  }
 
-    public static class OracleConnectionInfo {
-        private String dbInstance;
-        private String dbPeer;
+  public static class OracleConnectionInfo {
+    private String dbInstance;
+    private String dbPeer;
 
-        public String getDbInstance() {
-            return dbInstance;
-        }
+    public String getDbInstance() {
+      return dbInstance;
+    }
 
-        public OracleConnectionInfo setDbInstance(final String dbInstance) {
-            this.dbInstance = dbInstance;
-            return this;
-        }
+    public OracleConnectionInfo setDbInstance(final String dbInstance) {
+      this.dbInstance = dbInstance;
+      return this;
+    }
 
-        public String getDbPeer() {
-            return dbPeer;
-        }
+    public String getDbPeer() {
+      return dbPeer;
+    }
 
-        public OracleConnectionInfo setDbPeer(final String dbPeer) {
-            this.dbPeer = dbPeer;
-            return this;
-        }
+    public OracleConnectionInfo setDbPeer(final String dbPeer) {
+      this.dbPeer = dbPeer;
+      return this;
     }
+  }
 }
diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/PostgreSQLURLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/PostgreSQLURLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/URLLocation.java b/src/main/java/io/opentracing/contrib/jdbc/parser/URLLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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

diff --git a/src/main/java/io/opentracing/contrib/jdbc/parser/URLParser.java b/src/main/java/io/opentracing/contrib/jdbc/parser/URLParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 The OpenTracing Authors
+ * Copyright 2017-2020 The OpenTracing Authors
  *
  * Licensed 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