Make /version endpoint to return version in major.minor.patch format (#864)

Author: rpanchyk

src/main/java/org/prebid/server/handler/VersionHandler.java

@@ -14,6 +14,8 @@
 import org.prebid.server.util.ResourceUtil;
 
 import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Handles HTTP request for pbs project version.
@@ -22,7 +24,7 @@ public class VersionHandler implements Handler<RoutingContext> {
 
     private static final Logger logger = LoggerFactory.getLogger(VersionHandler.class);
 
-    private static final String NOT_SET = "not-set";
+    private static final String UNDEFINED = "undefined";
 
     private final String revisionResponseBody;
 
@@ -36,22 +38,29 @@ public static VersionHandler create(String revisionFilePath, JacksonMapper mappe
             revision = mapper.mapper().readValue(ResourceUtil.readFromClasspath(revisionFilePath), Revision.class);
         } catch (IllegalArgumentException | IOException e) {
             logger.error("Was not able to read revision file {0}. Reason: {1}", revisionFilePath, e.getMessage());
-            revision = Revision.of(NOT_SET, NOT_SET);
+            revision = Revision.EMPTY;
         }
         return new VersionHandler(createRevisionResponseBody(revision, mapper));
     }
 
     private static String createRevisionResponseBody(Revision revision, JacksonMapper mapper) {
         try {
             return mapper.mapper().writeValueAsString(RevisionResponse.of(
-                    revision.commitHash != null ? revision.commitHash : NOT_SET,
-                    revision.pbsVersion != null ? revision.pbsVersion : NOT_SET));
+                    revision.commitHash != null ? revision.commitHash : UNDEFINED,
+                    revision.pbsVersion != null ? extractVersion(revision.pbsVersion) : UNDEFINED));
         } catch (JsonProcessingException e) {
             logger.error("/version Critical error when trying to marshal revision response: %s", e.getMessage());
             return null;
         }
     }
 
+    private static String extractVersion(String buildVersion) {
+        final Pattern versionPattern = Pattern.compile("\\d+\\.\\d+\\.\\d");
+        final Matcher versionMatcher = versionPattern.matcher(buildVersion);
+
+        return versionMatcher.lookingAt() ? versionMatcher.group() : null;
+    }
+
     /**
      * Responds with commit revision.
      */
@@ -68,6 +77,8 @@ public void handle(RoutingContext context) {
     @Value
     private static class Revision {
 
+        private static final Revision EMPTY = Revision.of(null, null);
+
         @JsonProperty("git.commit.id")
         String commitHash;
 

src/test/java/org/prebid/server/handler/VersionHandlerTest.java

@@ -37,7 +37,7 @@ public void shouldCreateRevisionWithNoSetVersionValueWhenFileWasNotFound() throw
         versionHandler.handle(routingContext);
 
         // then
-        verify(httpResponse).end(mapper.writeValueAsString(RevisionResponse.of("not-set", "not-set")));
+        verify(httpResponse).end(mapper.writeValueAsString(RevisionResponse.of("undefined", "undefined")));
     }
 
     @Test
@@ -50,7 +50,7 @@ public void handleShouldRespondWithNotSetWhenPropertyIsNotInFile() throws JsonPr
         versionHandler.handle(routingContext);
 
         // then
-        verify(httpResponse).end(mapper.writeValueAsString(RevisionResponse.of("not-set", "not-set")));
+        verify(httpResponse).end(mapper.writeValueAsString(RevisionResponse.of("undefined", "undefined")));
     }
 
     @Test

src/test/resources/org/prebid/server/handler/version/version.json

@@ -1,4 +1,4 @@
 {
   "git.commit.id": "4df3f6192d7938ccdaac04df783c46c7e8847d08",
-  "git.build.version": "1.41.0"
+  "git.build.version": "1.41.0-SNAPSHOT"
 }