From b1d35fe0b816cab115b238ab93689f59a6824008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kr=C3=BChlmann?= <andreas@kruhlmann.dev>
Date: Tue, 6 Jan 2026 10:34:52 +0100
Subject: [PATCH] Revert "Read package.json from classspath"

This reverts commit 44292eb39b83922b1d3a7d910009d2cfe97fae9c.
---
 .../imgfloat/service/VersionService.java      | 57 ++-----------------
 1 file changed, 5 insertions(+), 52 deletions(-)

diff --git a/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
index 0c890f1..813af5d 100644
--- a/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
+++ b/src/main/java/dev/kruhlmann/imgfloat/service/VersionService.java
@@ -1,5 +1,6 @@
 package dev.kruhlmann.imgfloat.service;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -144,61 +145,12 @@ public class VersionService {
     }
 
     private String resolveClientVersion() throws IOException {
-        String classpathVersion = getClasspathPackageJsonVersion();
-        if (classpathVersion != null) {
-            return classpathVersion;
-        }
-
-        String filesystemVersion = getFilesystemPackageJsonVersion();
-        if (filesystemVersion != null) {
-            return filesystemVersion;
-        }
-
-        LOG.warn(
-            "Unable to resolve client version from package.json; falling back to server version {}",
-            serverVersion
-        );
-        return serverVersion;
-    }
-
-    private String getClasspathPackageJsonVersion() {
-        try (InputStream resource = getClass().getClassLoader().getResourceAsStream("package.json")) {
-            if (resource == null) {
-                return null;
-            }
-            String version = extractPackageJsonVersion(resource);
-            if (version != null) {
-                return version;
-            }
-            LOG.warn("Unable to parse client version from classpath package.json");
-        } catch (IOException e) {
-            LOG.warn("Error while reading classpath package.json", e);
-        }
-        return null;
-    }
-
-    private String getFilesystemPackageJsonVersion() throws IOException {
         Path packageJsonPath = Paths.get("package.json");
         if (!Files.exists(packageJsonPath) || !Files.isRegularFile(packageJsonPath)) {
-            LOG.warn("package.json not found at {}", packageJsonPath.toAbsolutePath());
-            return null;
+            throw new FileNotFoundException("package.json not found at " + packageJsonPath.toAbsolutePath());
         }
 
-        try (InputStream stream = Files.newInputStream(packageJsonPath)) {
-            String version = extractPackageJsonVersion(stream);
-            if (version != null) {
-                return version;
-            }
-            LOG.warn(
-                "Unable to parse client version from filesystem package.json at {}",
-                packageJsonPath.toAbsolutePath()
-            );
-        }
-        return null;
-    }
-
-    private String extractPackageJsonVersion(InputStream packageJsonStream) throws IOException {
-        String packageJson = new String(packageJsonStream.readAllBytes(), StandardCharsets.UTF_8);
+        String packageJson = Files.readString(packageJsonPath, StandardCharsets.UTF_8);
         Matcher matcher = PACKAGE_VERSION_PATTERN.matcher(packageJson);
         if (matcher.find()) {
             String version = matcher.group(1);
@@ -206,6 +158,7 @@ public class VersionService {
                 return version.trim();
             }
         }
-        return null;
+
+        throw new IllegalStateException("Version not found or invalid in package.json");
     }
 }