Change Server init conditional (#3169)

* change server conditional * correct test airbyte/commons/version * remove confusing var * remove code
airbytehq · May 3, 2021 · cd7a4f7 · cd7a4f7
1 parent 99f1448
commit cd7a4f7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/airbyte-commons/src/main/java/io/airbyte/commons/version/AirbyteVersion.java b/airbyte-commons/src/main/java/io/airbyte/commons/version/AirbyteVersion.java
@@ -106,7 +106,7 @@ public int patchVersionCompareTo(final AirbyteVersion another) {
   }
 
   public static void assertIsCompatible(final String version1, final String version2) throws IllegalStateException {
-    if (isCompatible(version1, version2)) {
+    if (!isCompatible(version1, version2)) {
       throw new IllegalStateException(getErrorMessage(version1, version2));
     }
   }
@@ -123,7 +123,7 @@ public static String getErrorMessage(final String version1, final String version
   public static boolean isCompatible(final String v1, final String v2) {
     final AirbyteVersion version1 = new AirbyteVersion(v1);
     final AirbyteVersion version2 = new AirbyteVersion(v2);
-    return version1.compatibleVersionCompareTo(version2) != 0;
+    return version1.compatibleVersionCompareTo(version2) == 0;
   }
 
   @Override

diff --git a/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java b/airbyte-server/src/main/java/io/airbyte/server/ServerApp.java
@@ -206,13 +206,13 @@ public static void main(String[] args) throws Exception {
     final JobPersistence jobPersistence = new DefaultJobPersistence(database);
 
     final String airbyteVersion = configs.getAirbyteVersion();
-    final Optional<String> airbyteDatabaseVersion = jobPersistence.getVersion();
-    if (airbyteDatabaseVersion.isEmpty()) {
+    if (jobPersistence.getVersion().isEmpty()) {
       LOGGER.info(String.format("Setting Database version to %s...", airbyteVersion));
       jobPersistence.setVersion(airbyteVersion);
     }
+    final Optional<String> airbyteDatabaseVersion = jobPersistence.getVersion();
 
-    if (airbyteDatabaseVersion.isEmpty() || AirbyteVersion.isCompatible(airbyteVersion, airbyteDatabaseVersion.get())) {
+    if (airbyteDatabaseVersion.isPresent() && AirbyteVersion.isCompatible(airbyteVersion, airbyteDatabaseVersion.get())) {
       LOGGER.info("Starting server...");
       new ServerApp(configRepository, jobPersistence, configs).start();
     } else {