Rebased remove_db_build branch

src/main/java/de/rwth/idsg/steve/Application.java

@@ -18,6 +18,7 @@
  */
 package de.rwth.idsg.steve;
 
+import de.rwth.idsg.steve.utils.FlywayMigrationRunner;
 import lombok.extern.slf4j.Slf4j;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
@@ -44,6 +45,8 @@ public Application() {
         DateTimeZone.setDefault(DateTimeZone.forID(sc.getTimeZoneId()));
         log.info("Date/time zone of the application is set to {}. Current date/time: {}", sc.getTimeZoneId(), DateTime.now());
 
+        FlywayMigrationRunner.run(sc);
+
         switch (sc.getProfile()) {
             case DEV:
                 delegate = new SteveDevStarter();

src/main/java/de/rwth/idsg/steve/SteveConfiguration.java

@@ -180,6 +180,10 @@ public static class DB {
         private final String userName;
         private final String password;
         private final boolean sqlLogging;
+
+        public String getJdbcUrl() {
+            return "jdbc:mysql://" + ip + ":" + port + "/" + schema;
+        }
     }
 
     // Credentials for Web interface access

src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java

@@ -94,7 +94,7 @@ private void initDataSource() {
         HikariConfig hc = new HikariConfig();
 
         // set standard params
-        hc.setJdbcUrl("jdbc:mysql://" + dbConfig.getIp() + ":" + dbConfig.getPort() + "/" + dbConfig.getSchema());
+        hc.setJdbcUrl(dbConfig.getJdbcUrl());
         hc.setUsername(dbConfig.getUserName());
         hc.setPassword(dbConfig.getPassword());
 

src/main/java/de/rwth/idsg/steve/utils/CountryCodesProvider.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify

src/main/java/de/rwth/idsg/steve/utils/FlywayMigrationRunner.java

@@ -0,0 +1,61 @@
+/*
+ * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.rwth.idsg.steve.utils;
+
+import de.rwth.idsg.steve.SteveConfiguration;
+import org.flywaydb.core.api.configuration.FluentConfiguration;
+
+/**
+ * @author Sevket Goekay <[email protected]>
+ * @since 08.08.2021
+ */
+public class FlywayMigrationRunner {
+
+    private static final String INIT_SQL = "SET default_storage_engine=InnoDB;";
+    private static final String BOOKKEEPING_TABLE = "schema_version";
+    private static final String LOCATION_OF_MIGRATIONS = "db/migration";
+
+    public static void run(SteveConfiguration sc) {
+        try {
+            getConfig(sc.getDb()).load().migrate();
+        } catch (RuntimeException e) {
+            throw e;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * This configuration should be kept in-sync with the one of the flyway-maven-plugin in pom.xml
+     */
+    private static FluentConfiguration getConfig(SteveConfiguration.DB dbConfig) {
+        FluentConfiguration c = new FluentConfiguration();
+
+        c.initSql(INIT_SQL);
+        c.outOfOrder(true);
+        c.table(BOOKKEEPING_TABLE);
+        c.cleanDisabled(true);
+        c.schemas(dbConfig.getSchema());
+        c.defaultSchema(dbConfig.getSchema());
+        c.locations(LOCATION_OF_MIGRATIONS);
+        c.dataSource(dbConfig.getJdbcUrl(), dbConfig.getUserName(), dbConfig.getPassword());
+
+        return c;
+    }
+}

src/main/java/de/rwth/idsg/steve/utils/mapper/AddressMapper.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify

src/main/java/de/rwth/idsg/steve/utils/mapper/ChargePointDetailsMapper.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify

src/main/java/de/rwth/idsg/steve/utils/mapper/ChargingProfileDetailsMapper.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify

src/main/java/de/rwth/idsg/steve/utils/mapper/OcppTagFormMapper.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify

src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java

@@ -1,6 +1,6 @@
 /*
  * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
- * Copyright (C) 2013-2019 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
+ * Copyright (C) 2013-2021 RWTH Aachen University - Information Systems - Intelligent Distributed Systems Group (IDSG).
  * All Rights Reserved.
  *
  * This program is free software: you can redistribute it and/or modify