Merge pull request #895 from lonvia/rename-version-properties

Fix accidental rename of version field in database

#890 accidentally renamed the version field in the properties entry from 'databaseVersion' to 'version'. Revert that.

Author: lonvia

app/es_embedded/src/main/java/de/komoot/photon/Server.java

@@ -269,7 +269,7 @@ public DatabaseProperties loadFromDatabase() {
 
         final var dbProps = new DatabaseProperties();
 
-        dbProps.setVersion(properties.get(FIELD_VERSION));
+        dbProps.setDatabaseVersion(properties.get(FIELD_VERSION));
 
         final String langString = properties.get(FIELD_LANGUAGES);
         dbProps.setLanguages(langString == null ? null : langString.split(","));

src/main/java/de/komoot/photon/DatabaseProperties.java

@@ -21,15 +21,15 @@ public class DatabaseProperties {
     private boolean supportGeometries = false;
     private ConfigExtraTags extraTags = new ConfigExtraTags();
 
-    public void setVersion(String version) {
+    public void setDatabaseVersion(String version) {
         if (!DATABASE_VERSION.equals(version)) {
             LOGGER.error("Database has incompatible version '{}'. Expected: {}",
                     version, DATABASE_VERSION);
             throw new UsageException("Incompatible database.");
         }
     }
 
-    public String getVersion() {
+    public String getDatabaseVersion() {
         return DATABASE_VERSION;
     }