summaryrefslogtreecommitdiffstats
path: root/config-application-package
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-11-23 22:47:01 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2023-11-23 22:47:01 +0100
commit9abb8ba9af34ce9e689c1efca6e1ee69e2d18fe9 (patch)
tree43429c229776225b47d20cb0ab01e81f09cfb02f /config-application-package
parente6cf8d652840f73d14d79c08ff6ff37935b4ff2c (diff)
Bring in ackson-core too
Diffstat (limited to 'config-application-package')
-rw-r--r--config-application-package/pom.xml4
-rw-r--r--config-application-package/src/main/java/com/yahoo/config/model/application/provider/FilesApplicationFile.java6
2 files changed, 6 insertions, 4 deletions
diff --git a/config-application-package/pom.xml b/config-application-package/pom.xml
index 75513dba544..a3d8b549493 100644
--- a/config-application-package/pom.xml
+++ b/config-application-package/pom.xml
@@ -96,6 +96,10 @@
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
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 3391af1a4e0..6ec8829de00 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
@@ -2,7 +2,6 @@
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;
@@ -30,7 +29,6 @@ public class FilesApplicationFile extends ApplicationFile {
private static final Logger log = Logger.getLogger("FilesApplicationFile");
private final File file;
- private final ObjectMapper mapper = Jackson.mapper();
public FilesApplicationFile(Path path, File file) {
super(path);
@@ -176,7 +174,7 @@ public class FilesApplicationFile extends ApplicationFile {
} else {
hash = ConfigUtils.getMd5(data);
}
- mapper.writeValue(metaFile, new MetaData(status, hash));
+ Jackson.mapper().writeValue(metaFile, new MetaData(status, hash));
}
private File createMetaDir() {
@@ -199,7 +197,7 @@ public class FilesApplicationFile extends ApplicationFile {
log.log(Level.FINE, () -> "Getting metadata for " + metaFile);
if (metaFile.exists()) {
try {
- return mapper.readValue(metaFile, MetaData.class);
+ return Jackson.mapper().readValue(metaFile, MetaData.class);
} catch (IOException e) {
System.out.println("whot:" + Exceptions.toMessageString(e));
// return below