diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-10-15 09:12:32 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-10-15 09:12:32 +0200 |
commit | bdf6f557807cd747f36156ce6acb7800c259fcd3 (patch) | |
tree | f38d28e2c6cc771cd318f82bd6d3e90289934f47 /node-repository/src | |
parent | 287bd61eefe75550133969abb5a33c3f44662db4 (diff) |
Remove dead code
Diffstat (limited to 'node-repository/src')
2 files changed, 0 insertions, 74 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializer.java deleted file mode 100644 index 058b5a45d8c..00000000000 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializer.java +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.persistence; - -import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.NodeType; -import com.yahoo.slime.Cursor; -import com.yahoo.slime.Inspector; -import com.yahoo.slime.ObjectTraverser; -import com.yahoo.slime.Slime; -import com.yahoo.slime.SlimeUtils; - -import java.io.IOException; -import java.io.UncheckedIOException; -import java.util.Map; -import java.util.TreeMap; - -/** - * Serializer for docker images that are set per node type. - * - * @author freva - */ -public class NodeTypeContainerImagesSerializer { - - private NodeTypeContainerImagesSerializer() {} - - public static byte[] toJson(Map<NodeType, DockerImage> dockerImages) { - Slime slime = new Slime(); - Cursor object = slime.setObject(); - dockerImages.forEach((nodeType, dockerImage) -> - object.setString(NodeSerializer.toString(nodeType), dockerImage.asString())); - try { - return SlimeUtils.toJsonBytes(slime); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - - public static Map<NodeType, DockerImage> fromJson(byte[] data) { - Map<NodeType, DockerImage> images = new TreeMap<>(); // Use TreeMap to sort by node type - Inspector inspector = SlimeUtils.jsonToSlime(data).get(); - inspector.traverse((ObjectTraverser) (key, value) -> - images.put(NodeSerializer.nodeTypeFromString(key), DockerImage.fromString(value.asString()))); - return images; - } - -} diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializerTest.java deleted file mode 100644 index 4d4669f0b42..00000000000 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/NodeTypeContainerImagesSerializerTest.java +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.hosted.provision.persistence; - -import com.yahoo.config.provision.DockerImage; -import com.yahoo.config.provision.NodeType; -import org.junit.Test; - -import java.util.Map; -import java.util.TreeMap; - -import static org.junit.Assert.assertEquals; - -/** - * @author freva - */ -public class NodeTypeContainerImagesSerializerTest { - - @Test - public void test_serialization() { - Map<NodeType, DockerImage> images = new TreeMap<>(); - images.put(NodeType.host, DockerImage.fromString("docker.domain.tld/my/repo:1.2.3")); - images.put(NodeType.confighost, DockerImage.fromString("docker.domain.tld/my/image:2.1")); - - Map<NodeType, DockerImage> serialized = NodeTypeContainerImagesSerializer.fromJson(NodeTypeContainerImagesSerializer.toJson(images)); - assertEquals(images, serialized); - } - -} |