/*
 * 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.commons.dbcp2;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;

/**
 * A {@link Driver}-based implementation of {@link ConnectionFactory}.
 *
 * @author Rodney Waldhoff
 * @version $Revision$ $Date$
 */
public class DriverConnectionFactory implements ConnectionFactory {
    public DriverConnectionFactory(Driver driver, String connectUri, Properties props) {
        _driver = driver;
        _connectUri = connectUri;
        _props = props;
    }

    @Override
    public Connection createConnection() throws SQLException {
        return _driver.connect(_connectUri,_props);
    }

    protected Driver _driver = null; // TODO make final and private
    protected String _connectUri = null; // TODO make final and private
    protected Properties _props = null; // TODO make final and private

    @Override
    public String toString() {
        return this.getClass().getName() + " [" + String.valueOf(_driver) + ";" + String.valueOf(_connectUri) + ";"  + String.valueOf(_props) + "]";
    }
}

@@ -798,17 +798,16 @@
 se.%0A */%0A
-%0A
 package 
@@ -1473,23 +1473,27 @@
 %0A%0A    pr
-otected
+ivate final
  Driver 
@@ -1503,190 +1503,84 @@
 iver
- = null; // TODO make final and private%0A    protected String _connectUri = null; // TODO make final and private%0A    protected Properties _props = null; // TODO make final and private
+;%0A    private final String _connectUri;%0A    private final Properties _props;
 %0A%0A  
@@ -1703,16 +1703,32 @@
  + %22;%22 +
+%0A               
  String.

Fix some easy TODOs