diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-24 20:49:33 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-11-24 20:49:33 +0100 |
commit | 4ceba0e313d0ee0a24116ecf97081ab054531f1c (patch) | |
tree | 922e51a7e2ce2cbb43121be86a6a2347090c48c0 /config-application-package | |
parent | bd3835e628508f679727e15961088edb3fd2706f (diff) |
Move to container core due to OSGI, keep a copy in testutil for use in tests in no OSGI modules.
Diffstat (limited to 'config-application-package')
-rw-r--r-- | config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java index 6ec8829de00..160b8a3d43b 100644 --- a/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java +++ b/config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java @@ -1,7 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.config.model.application.provider; -import ai.vespa.json.Jackson; +import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.io.IOUtils; import com.yahoo.path.Path; @@ -29,6 +29,7 @@ public class FilesApplicationFile extends ApplicationFile { private static final Logger log = Logger.getLogger("FilesApplicationFile"); private final File file; + private final ObjectMapper mapper = new ObjectMapper(); public FilesApplicationFile(Path path, File file) { super(path); @@ -174,7 +175,7 @@ public class FilesApplicationFile extends ApplicationFile { } else { hash = ConfigUtils.getMd5(data); } - Jackson.mapper().writeValue(metaFile, new MetaData(status, hash)); + mapper.writeValue(metaFile, new MetaData(status, hash)); } private File createMetaDir() { @@ -197,7 +198,7 @@ public class FilesApplicationFile extends ApplicationFile { log.log(Level.FINE, () -> "Getting metadata for " + metaFile); if (metaFile.exists()) { try { - return Jackson.mapper().readValue(metaFile, MetaData.class); + return mapper.readValue(metaFile, MetaData.class); } catch (IOException e) { System.out.println("whot:" + Exceptions.toMessageString(e)); // return below |