/*******************************************************************************
 * Copyright © 2015 EMBL - European Bioinformatics Institute
 * <p/>
 * 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
 * http://www.apache.org/licenses/LICENSE-2.0
 * <p/>
 * 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.mousephenotype.cda.loads.derived;

import org.mousephenotype.cda.db.utilities.SqlUtils;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

import javax.sql.DataSource;

@Configuration
@EnableJpaRepositories(basePackages = {"org.mousephenotype.cda.db.repositories"})
@EntityScan("org.mousephenotype.cda.db.pojo")
@ComponentScan(basePackages = {"org.mousephenotype.cda.loads.derived"})
public class GenerateDerivedParametersConfig {

    private final org.slf4j.Logger logger = LoggerFactory.getLogger(this.getClass());

    @Value("${datasource.komp2_derived.jdbc-url}")
    String komp2Url;

    @Value("${datasource.komp2_derived.username}")
    String komp2Username;

    @Value("${datasource.komp2_derived.password}")
    String komp2Password;


    @Bean(name = "komp2DataSource")
    @Primary
    public DataSource komp2DataSource() {
        return SqlUtils.getConfiguredDatasource(komp2Url, komp2Username, komp2Password);
    }
}
@@ -1741,37 +1741,35 @@
 e(%22$%7Bdatasource.
-komp2
+cda
 _derived.jdbc-ur
@@ -1812,37 +1812,35 @@
 e(%22$%7Bdatasource.
-komp2
+cda
 _derived.usernam
@@ -1896,21 +1896,19 @@
 asource.
-komp2
+cda
 _derived

Update GenerateDerivedParametersConfig, replacing komp2_derived with cda_derived.