Skip to content

Allow user to check where volume is binded on host #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 2 commits into from
Aug 27, 2014
Merged

Allow user to check where volume is binded on host #49

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99424b6
Container inspect can now return where the volumes are binded
pnuz3n Aug 27, 2014
229e082
Refactored code a little and added test for parsing volume binds JSON
pnuz3n Aug 27, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Container inspect can now return where the volumes are binded
  • Loading branch information
@pnuz3n
pnuz3n committed Aug 27, 2014
commit 99424b6063b6f815927f0b3ff25cf85edcf4c0f2
16 changes: 8 additions & 8 deletions src/main/java/com/github/dockerjava/api/command/InspectContainerResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,12 @@

import java.util.Map;

import com.github.dockerjava.api.model.*;
import org.apache.commons.lang.builder.ToStringBuilder;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.github.dockerjava.api.model.ContainerConfig;
import com.github.dockerjava.api.model.LxcConf;
import com.github.dockerjava.api.model.Ports;
import com.github.dockerjava.api.model.Volume;
import com.github.dockerjava.api.model.Volumes;

/**
*
Expand Down Expand Up @@ -74,7 +70,7 @@ public class InspectContainerResponse {
private ContainerState state;

@JsonProperty("Volumes")
private Volumes volumes;
private VolumeBinds volumes;

@JsonProperty("VolumesRW")
private Volumes volumesRW;
Expand Down Expand Up @@ -120,10 +116,14 @@ public String getResolvConfPath() {
}

@JsonIgnore
public Volume[] getVolumes() {
return volumes.getVolumes();
public Bind[] getBinds() {
return volumes.getBinds();
}

@JsonIgnore
public Volume[] getVolumes() { return volumes.getVolumes(); }


@JsonIgnore
public Volume[] getVolumesRW() {
return volumesRW.getVolumes();
Expand Down
76 changes: 76 additions & 0 deletions src/main/java/com/github/dockerjava/api/model/VolumeBinds.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package com.github.dockerjava.api.model;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.ObjectCodec;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.node.NullNode;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

@JsonSerialize(using = VolumeBinds.Serializer.class)
@JsonDeserialize(using = VolumeBinds.Deserializer.class)
public class VolumeBinds {
private final Bind[] binds;
private final Volume[] volumes;

public VolumeBinds(Bind... binds) {
this.binds = binds;
this.volumes = new Volume[binds.length];
for(int i=0; i<volumes.length;i++){
volumes[i] = binds[i].getVolume();
}
}

public Bind[] getBinds() {
return binds;
}

public Volume[] getVolumes() {
return volumes;
}

public static class Serializer extends JsonSerializer<VolumeBinds> {

@Override
public void serialize(VolumeBinds binds, JsonGenerator jsonGen,
SerializerProvider serProvider) throws IOException,
JsonProcessingException {

jsonGen.writeStartObject();
for (Bind bind : binds.getBinds()) {
jsonGen.writeFieldName(bind.getPath());
jsonGen.writeString(Boolean.toString(!bind.isReadOnly()));
}
jsonGen.writeEndObject();
}

}

public static class Deserializer extends JsonDeserializer<VolumeBinds> {
@Override
public VolumeBinds deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {

List<Bind> binds = new ArrayList<Bind>();
ObjectCodec oc = jsonParser.getCodec();
JsonNode node = oc.readTree(jsonParser);
for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext();) {

Map.Entry<String, JsonNode> field = it.next();
if (!field.getValue().equals(NullNode.getInstance())) {
Bind bind = new Bind(field.getValue().toString(),Volume.parse(field.getKey()));
binds.add(bind);
}
}
return new VolumeBinds(binds.toArray(new Bind[binds.size()]));
}
}

}