Update VersionService and VersionServiceTests

Author: jbern0rd

…worker/utils/version/VersionService.java …iexec/worker/version/VersionService.javasrc/main/java/com/iexec/worker/utils/version/VersionService.java renamed to src/main/java/com/iexec/worker/version/VersionService.java src/main/java/com/iexec/worker/utils/version/VersionService.java renamed to src/main/java/com/iexec/worker/version/VersionService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package com.iexec.worker.utils.version;
+package com.iexec.worker.version;
 
-import com.iexec.common.utils.VersionUtils;
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Service;
 
@@ -33,8 +32,4 @@ public String getVersion() {
         return buildProperties.getVersion();
     }
 
-    public boolean isSnapshot() {
-        return VersionUtils.isSnapshot(buildProperties.getVersion());
-    }
-
 }

src/main/java/com/iexec/worker/worker/WorkerService.java

@@ -26,7 +26,7 @@
 import com.iexec.worker.feign.CustomCoreFeignClient;
 import com.iexec.worker.tee.scone.TeeSconeService;
 import com.iexec.worker.utils.LoggingUtils;
-import com.iexec.worker.utils.version.VersionService;
+import com.iexec.worker.version.VersionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.context.restart.RestartEndpoint;
 import org.springframework.context.annotation.Bean;

…r/utils/version/VersionServiceTests.java …/worker/version/VersionServiceTests.javasrc/test/java/com/iexec/worker/utils/version/VersionServiceTests.java renamed to src/test/java/com/iexec/worker/version/VersionServiceTests.java src/test/java/com/iexec/worker/utils/version/VersionServiceTests.java renamed to src/test/java/com/iexec/worker/version/VersionServiceTests.java

@@ -1,8 +1,23 @@
-package com.iexec.worker.utils.version;
+/*
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.iexec.worker.version;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.InjectMocks;
@@ -25,18 +40,10 @@ public void preflight() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings={"x.y.z", "x.y.z-rc"})
-    void testNonSnapshotVersion(String version) {
+    @ValueSource(strings={"x.y.z", "x.y.z-rc", "x.y.z-NEXT-SNAPSHOT"})
+    void testVersions(String version) {
         Mockito.when(buildProperties.getVersion()).thenReturn(version);
         Assertions.assertEquals(version, versionService.getVersion());
-        Assertions.assertFalse(versionService.isSnapshot());
-    }
-
-    @Test
-    void testSnapshotVersion() {
-        Mockito.when(buildProperties.getVersion()).thenReturn("x.y.z-NEXT-SNAPSHOT");
-        Assertions.assertEquals("x.y.z-NEXT-SNAPSHOT", versionService.getVersion());
-        Assertions.assertTrue(versionService.isSnapshot());
     }
 
 }

src/test/java/com/iexec/worker/worker/WorkerServiceTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License; Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@
 import com.iexec.worker.docker.DockerService;
 import com.iexec.worker.feign.CustomCoreFeignClient;
 import com.iexec.worker.tee.scone.TeeSconeService;
-import com.iexec.worker.utils.version.VersionService;
+import com.iexec.worker.version.VersionService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;