SONAR-17152 removed deprecated license format support

2 files changed, 5 insertions, 9 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/platform/ServerId.java b/sonar-core/src/main/java/org/sonar/core/platform/ServerId.java
index d5bc81e54c5..30861f3d600 100644
--- a/sonar-core/src/main/java/org/sonar/core/platform/ServerId.java
+++ b/sonar-core/src/main/java/org/sonar/core/platform/ServerId.java
@@ -28,7 +28,6 @@ import java.util.Set;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.CoreProperties;
-import org.sonar.core.util.UuidFactory;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.sonar.core.platform.ServerId.Format.DEPRECATED;
@@ -110,8 +109,8 @@ public final class ServerId {
 
   public static ServerId of(@Nullable String databaseId, String datasetId) {
     if (databaseId != null) {
-      int databaseIdLength = databaseId.length();
-      checkArgument(databaseIdLength == DATABASE_ID_LENGTH, "Illegal databaseId length (%s)", databaseIdLength);
+    int databaseIdLength = databaseId.length();
+    checkArgument(databaseIdLength == DATABASE_ID_LENGTH, "Illegal databaseId length (%s)", databaseIdLength);
     }
     int datasetIdLength = datasetId.length();
     checkArgument(datasetIdLength == DEPRECATED_SERVER_ID_LENGTH
@@ -120,9 +119,6 @@ public final class ServerId {
     return new ServerId(databaseId, datasetId);
   }
 
-  public static ServerId create(UuidFactory uuidFactory) {
-    return new ServerId(null, uuidFactory.create());
-  }
 
   /**
    * Checks whether the specified value is a date according to the old format of the {@link CoreProperties#SERVER_ID}.
diff --git a/sonar-core/src/test/java/org/sonar/core/platform/ServerIdTest.java b/sonar-core/src/test/java/org/sonar/core/platform/ServerIdTest.java
index 57a7c2eae87..a63a3bff968 100644
--- a/sonar-core/src/test/java/org/sonar/core/platform/ServerIdTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/platform/ServerIdTest.java
@@ -37,12 +37,12 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.sonar.core.platform.ServerId.DATABASE_ID_LENGTH;
 import static org.sonar.core.platform.ServerId.DEPRECATED_SERVER_ID_LENGTH;
-import static org.sonar.core.platform.ServerId.NOT_UUID_DATASET_ID_LENGTH;
-import static org.sonar.core.platform.ServerId.SPLIT_CHARACTER;
-import static org.sonar.core.platform.ServerId.UUID_DATASET_ID_LENGTH;
 import static org.sonar.core.platform.ServerId.Format.DEPRECATED;
 import static org.sonar.core.platform.ServerId.Format.NO_DATABASE_ID;
 import static org.sonar.core.platform.ServerId.Format.WITH_DATABASE_ID;
+import static org.sonar.core.platform.ServerId.NOT_UUID_DATASET_ID_LENGTH;
+import static org.sonar.core.platform.ServerId.SPLIT_CHARACTER;
+import static org.sonar.core.platform.ServerId.UUID_DATASET_ID_LENGTH;
 
 @RunWith(DataProviderRunner.class)
 public class ServerIdTest {