Don't bother parsing JVM version numbers either

bitemyapp · May 6, 2018 · 088ef73 · 088ef73
1 parent 7ba70bf
commit 088ef73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Bloodhound/Import.hs b/src/Bloodhound/Import.hs
@@ -9,6 +9,7 @@ module Bloodhound.Import
   , showText
   , deleteSeveral
   , oPath
+  , tshow
   ) where
 
 import           Control.Applicative       as X (Alternative (..), optional)

diff --git a/src/Database/V5/Bloodhound/Internal/Client.hs b/src/Database/V5/Bloodhound/Internal/Client.hs
@@ -1421,12 +1421,17 @@ data NodeJVMInfo = NodeJVMInfo {
     , nodeJVMVMVersion                   :: VMVersion
     -- ^ JVM doesn't seme to follow normal version conventions
     , nodeJVMVMName                      :: Text
-    , nodeJVMVersion                     :: VersionNumber
+    , nodeJVMVersion                     :: JVMVersion
     , nodeJVMPID                         :: PID
     } deriving (Eq, Show)
 
--- | Handles quirks in the way JVM versions are rendered (1.7.0_101 -> 1.7.0.101)
-newtype JVMVersion = JVMVersion { unJVMVersion :: VersionNumber }
+-- | We cannot parse JVM version numbers and we're not going to try.
+newtype JVMVersion =
+  JVMVersion { unJVMVersion :: Text }
+  deriving (Eq, Show)
+
+instance FromJSON JVMVersion where
+  parseJSON = withText "JVMVersion" (pure . JVMVersion)
 
 data JVMMemoryInfo = JVMMemoryInfo {
       jvmMemoryInfoDirectMax   :: Bytes
@@ -2240,14 +2245,9 @@ instance FromJSON NodeJVMInfo where
                             <*> o .: "vm_vendor"
                             <*> o .: "vm_version"
                             <*> o .: "vm_name"
-                            <*> (unJVMVersion <$> o .: "version")
+                            <*> o .: "version"
                             <*> o .: "pid"
 
-instance FromJSON JVMVersion where
-  parseJSON (String t) =
-    JVMVersion <$> parseJSON (String (T.replace "_" "." t))
-  parseJSON v = JVMVersion <$> parseJSON v
-
 instance FromJSON JVMMemoryInfo where
   parseJSON = withObject "JVMMemoryInfo" parse
     where