Reworked closing Git repo after failed checkout

Author: ThomasJejkal

src/main/java/edu/kit/datamanager/mappingservice/util/FileUtil.java

@@ -294,15 +294,18 @@ private static String guessFileExtension(String filename, byte[] fewKilobytesOfF
     public static Path cloneGitRepository(String repositoryUrl, String branch, String targetFolder) {
         File target = new File(targetFolder);
         if (target.exists()) {
+            Git g = null;
             try {
-                try (Git g = Git.open(target)) {
-                    LOGGER.trace("Repository already exists at {}. Active branch is: {}", target, g.getRepository().getBranch());
-                    g.getRepository().close();
-                }
+                g = Git.open(target);
+                LOGGER.trace("Repository already exists at {}. Active branch is: {}", target, g.getRepository().getBranch());
             } catch (IOException e) {
                 String message = String.format("Folder '%s' already exists but contains not Git repository.", target);
                 LOGGER.error(message, e);
                 throw new MappingServiceException("Failed to prepare plugin. Plugin code destination already exists but is empty.");
+            } finally {
+                if (g != null) {
+                    g.getRepository().close();
+                }
             }
         } else {
             target.mkdirs();

src/main/resources/gemma.properties

@@ -1,2 +1,2 @@
-version=master
+version=v1.0.0
 min.python=3.0.0

src/test/java/edu/kit/datamanager/mappingservice/rest/impl/MappingAdministrationControllerTest.java

@@ -92,7 +92,7 @@ public class MappingAdministrationControllerTest {
 
     private final static String TEMP_DIR_4_MAPPING = "/tmp/mapping-service/";
     private static final String MAPPING_ID = "my_dc";
-    private static final String MAPPING_TYPE = "GEMMA_master";
+    private static final String MAPPING_TYPE = "GEMMA_v1.0.0";
     private static final String MAPPING_TITLE = "TITEL";
     private static final String MAPPING_DESCRIPTION = "DESCRIPTION";