11package no .nav .foreldrepenger .abakus .dbstoette ;
22
3+ import java .io .File ;
34import java .util .Objects ;
45import java .util .concurrent .atomic .AtomicBoolean ;
56
67import javax .naming .NamingException ;
78import javax .sql .DataSource ;
89
10+ import no .nav .foreldrepenger .konfig .Environment ;
11+
912import org .eclipse .jetty .plus .jndi .EnvEntry ;
1013import org .flywaydb .core .Flyway ;
1114import org .flywaydb .core .api .FlywayException ;
1619/**
1720 * Initielt skjemaoppsett + migrering av unittest-skjemaer
1821 */
19- public final class Databaseskjemainitialisering {
22+ public final class TestDatabaseInit {
2023 private static final AtomicBoolean GUARD_UNIT_TEST_SKJEMAER = new AtomicBoolean ();
24+ private static final String DB_SCRIPT_LOCATION = "/db/migration/defaultDS/" ;
2125
22- private static final String USER = "fpabakus_unit" ;
23- private static final String DB_SCRIPT_LOCATION = "/db/migration/" ;
24-
25- private static final DataSource DS = settJdniOppslag (USER );
26-
27- public static void main (String [] args ) {
28- migrerUnittestSkjemaer ();
29- }
30-
31- @ SuppressWarnings ("resource" )
32- public static void migrerUnittestSkjemaer () {
26+ public static void settOppDatasourceOgMigrer (String jdbcUrl , String username , String password ) {
27+ var ds = createDatasource (jdbcUrl , username , password );
28+ settJdniOppslag (ds );
3329 if (GUARD_UNIT_TEST_SKJEMAER .compareAndSet (false , true )) {
34- Flyway flyway = Flyway .configure ()
35- .dataSource (createDs ( USER ) )
36- .locations (DB_SCRIPT_LOCATION )
30+ var flyway = Flyway .configure ()
31+ .dataSource (ds )
32+ .locations (getScriptLocation () )
3733 .baselineOnMigrate (true )
3834 .cleanDisabled (false )
3935 .load ();
@@ -51,47 +47,44 @@ public static void migrerUnittestSkjemaer() {
5147 }
5248 }
5349
54- private static synchronized DataSource settJdniOppslag (String user ) {
50+ private static String getScriptLocation () {
51+ return fileScriptLocation ();
52+ }
5553
56- var ds = createDs (user );
54+ private static String fileScriptLocation () {
55+ var relativePath = "/migreringer/src/main/resources" + DB_SCRIPT_LOCATION ;
56+ var baseDir = new File ("." ).getAbsoluteFile ();
57+ var location = new File (baseDir , relativePath );
58+ while (!location .exists ()) {
59+ baseDir = baseDir .getParentFile ();
60+ if (baseDir == null || !baseDir .isDirectory ()) {
61+ throw new IllegalArgumentException ("Klarte ikke finne : " + baseDir );
62+ }
63+ location = new File (baseDir , relativePath );
64+ }
65+ return "filesystem:" + location .getPath ();
66+ }
5767
68+ private static void settJdniOppslag (DataSource dataSource ) {
5869 try {
59-
60- new EnvEntry ("jdbc/defaultDS" , ds );
61- return ds ;
70+ new EnvEntry ("jdbc/defaultDS" , dataSource ); // NOSONAR
6271 } catch (NamingException e ) {
63- throw new IllegalStateException ("Feil under registrering av JDNI-entry for default datasource" , e );
72+ throw new IllegalStateException ("Feil under registrering av JDNI-entry for default datasource" , e ); // NOSONAR
6473 }
6574 }
6675
67- private static HikariDataSource createDs (String user ) {
68- Objects .requireNonNull (user , "user" );
76+ private static HikariDataSource createDatasource (String jdbcUrl , String username , String password ) {
6977 var cfg = new HikariConfig ();
70- cfg .setJdbcUrl (
71- System .getProperty ("datasource.defaultDS.url" , String .format ("jdbc:postgresql://127.0.0.1:5999/%s?reWriteBatchedInserts=true" , USER )));
72- cfg .setUsername (USER );
73- cfg .setPassword (USER );
78+ cfg .setJdbcUrl (jdbcUrl );
79+ cfg .setUsername (username );
80+ cfg .setPassword (password );
7481 cfg .setConnectionTimeout (1500 );
7582 cfg .setValidationTimeout (120L * 1000L );
7683 cfg .setMaximumPoolSize (4 );
7784 cfg .setAutoCommit (false );
7885
7986 var ds = new HikariDataSource (cfg );
80- Runtime .getRuntime ().addShutdownHook (new Thread (new Runnable () {
81- @ Override
82- public void run () {
83- ds .close ();
84- }
85- }));
87+ Runtime .getRuntime ().addShutdownHook (new Thread (ds ::close ));
8688 return ds ;
8789 }
88-
89- public static DataSource initUnitTestDataSource () {
90- if (DS != null ) {
91- return DS ;
92- }
93- settJdniOppslag (USER );
94- return DS ;
95- }
96-
9790}
![dependabot[bot]](https://avatars.githubusercontent.com/in/29110?v=4&size=40){kind=avatar}
0 commit comments