Merge pull request #103 from iExecBlockchainComputing/bugfix/clean-version-service

Remove `VersionService#isSnapshot`

Author: jbern0rd

CHANGELOG.md

@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 - Describe upload limits configuration in README.md. (#99)
 ### Quality
 - Upgrade to Gradle 8.2.1 with up-to-date plugins. (#97)
+- Remove `VersionService#isSnapshot`. (#103)
 ### Dependency Upgrades
 - Upgrade to `eclipse-temurin` 11.0.20. (#95)
 - Upgrade to Spring Boot 2.7.14. (#96)

src/main/java/com/iexec/resultproxy/version/VersionService.java

@@ -1,6 +1,20 @@
-package com.iexec.resultproxy.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.
+ */
 
-import com.iexec.common.utils.VersionUtils;
+package com.iexec.resultproxy.version;
 
 import org.springframework.boot.info.BuildProperties;
 import org.springframework.stereotype.Service;
@@ -18,8 +32,4 @@ public String getVersion() {
         return buildProperties.getVersion();
     }
 
-    public boolean isSnapshot() {
-        return VersionUtils.isSnapshot(getVersion());
-    }
-
 }

src/test/java/com/iexec/resultproxy/version/VersionServiceTests.java

@@ -0,0 +1,49 @@
+/*
+ * 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.resultproxy.version;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.springframework.boot.info.BuildProperties;
+
+class VersionServiceTests {
+
+    @Mock
+    private BuildProperties buildProperties;
+
+    @InjectMocks
+    private VersionService versionService;
+
+    @BeforeEach
+    public void preflight() {
+        MockitoAnnotations.openMocks(this);
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings={"x.y.z", "x.y.z-rc", "x.y.z-NEXT-SNAPSHOT"})
+    void testNonSnapshotVersion(String version) {
+        Mockito.when(buildProperties.getVersion()).thenReturn(version);
+        Assertions.assertEquals(version, versionService.getVersion());
+    }
+
+}