HDFS-6565. Use jackson instead jetty json in hdfs-client. Contributed by Akira AJISAKA.
This commit is contained in:
Haohui Mai
parent
5af693fde2
commit
e2262d3d18
|
|
@ -1077,6 +1077,9 @@ Release 2.7.0 - UNRELEASED
|
|||
HDFS-7757. Misleading error messages in FSImage.java. (Brahma Reddy Battula
|
||||
via Arpit Agarwal)
|
||||
|
||||
HDFS-6565. Use jackson instead jetty json in hdfs-client.
|
||||
(Akira Ajisaka via wheat9)
|
||||
|
||||
BREAKDOWN OF HDFS-7584 SUBTASKS AND RELATED JIRAS
|
||||
|
||||
HDFS-7720. Quota by Storage Type API, tools and ClientNameNode
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@
|
|||
import org.apache.hadoop.fs.permission.AclEntry;
|
||||
import org.apache.hadoop.fs.permission.AclStatus;
|
||||
import org.apache.hadoop.fs.permission.FsPermission;
|
||||
import org.apache.hadoop.hdfs.protocol.BlockStoragePolicy;
|
||||
import org.apache.hadoop.hdfs.DFSUtil;
|
||||
import org.apache.hadoop.hdfs.XAttrHelper;
|
||||
import org.apache.hadoop.hdfs.protocol.*;
|
||||
|
|
@ -35,7 +34,8 @@
|
|||
import org.apache.hadoop.security.token.TokenIdentifier;
|
||||
import org.apache.hadoop.util.DataChecksum;
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
import org.mortbay.util.ajax.JSON;
|
||||
import org.codehaus.jackson.map.ObjectMapper;
|
||||
import org.codehaus.jackson.map.ObjectReader;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import com.google.common.collect.Maps;
|
||||
|
|
@ -95,59 +95,6 @@ private static Token<BlockTokenIdentifier> toBlockToken(
|
|||
return (Token<BlockTokenIdentifier>)toToken(m);
|
||||
}
|
||||
|
||||
/** Convert a Token[] to a JSON array. */
|
||||
private static Object[] toJsonArray(final Token<? extends TokenIdentifier>[] array
|
||||
) throws IOException {
|
||||
if (array == null) {
|
||||
return null;
|
||||
} else if (array.length == 0) {
|
||||
return EMPTY_OBJECT_ARRAY;
|
||||
} else {
|
||||
final Object[] a = new Object[array.length];
|
||||
for(int i = 0; i < array.length; i++) {
|
||||
a[i] = toJsonMap(array[i]);
|
||||
}
|
||||
return a;
|
||||
}
|
||||
}
|
||||
|
||||
/** Convert a token object to a JSON string. */
|
||||
public static String toJsonString(final Token<? extends TokenIdentifier>[] tokens
|
||||
) throws IOException {
|
||||
if (tokens == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final Map<String, Object> m = new TreeMap<String, Object>();
|
||||
m.put(Token.class.getSimpleName(), toJsonArray(tokens));
|
||||
return toJsonString(Token.class.getSimpleName() + "s", m);
|
||||
}
|
||||
|
||||
/** Convert an Object[] to a List<Token<?>>. */
|
||||
private static List<Token<?>> toTokenList(final Object[] objects) throws IOException {
|
||||
if (objects == null) {
|
||||
return null;
|
||||
} else if (objects.length == 0) {
|
||||
return Collections.emptyList();
|
||||
} else {
|
||||
final List<Token<?>> list = new ArrayList<Token<?>>(objects.length);
|
||||
for(int i = 0; i < objects.length; i++) {
|
||||
list.add(toToken((Map<?, ?>)objects[i]));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
}
|
||||
|
||||
/** Convert a JSON map to a List<Token<?>>. */
|
||||
public static List<Token<?>> toTokenList(final Map<?, ?> json) throws IOException {
|
||||
if (json == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final Map<?, ?> m = (Map<?, ?>)json.get(Token.class.getSimpleName() + "s");
|
||||
return toTokenList((Object[])m.get(Token.class.getSimpleName()));
|
||||
}
|
||||
|
||||
/** Convert an exception object to a Json string. */
|
||||
public static String toJsonString(final Exception e) {
|
||||
final Map<String, Object> m = new TreeMap<String, Object>();
|
||||
|
|
@ -173,7 +120,12 @@ private static String toJsonString(final Class<?> clazz, final Object value) {
|
|||
public static String toJsonString(final String key, final Object value) {
|
||||
final Map<String, Object> m = new TreeMap<String, Object>();
|
||||
m.put(key, value);
|
||||
return JSON.toString(m);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
try {
|
||||
return mapper.writeValueAsString(m);
|
||||
} catch (IOException ignored) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Convert a FsPermission object to a string. */
|
||||
|
|
@ -233,7 +185,13 @@ public static String toJsonString(final HdfsFileStatus status,
|
|||
m.put("fileId", status.getFileId());
|
||||
m.put("childrenNum", status.getChildrenNum());
|
||||
m.put("storagePolicy", status.getStoragePolicy());
|
||||
return includeType ? toJsonString(FileStatus.class, m): JSON.toString(m);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
try {
|
||||
return includeType ?
|
||||
toJsonString(FileStatus.class, m) : mapper.writeValueAsString(m);
|
||||
} catch (IOException ignored) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Convert a Json map to a HdfsFileStatus object. */
|
||||
|
|
@ -249,25 +207,23 @@ public static HdfsFileStatus toFileStatus(final Map<?, ?> json, boolean includes
|
|||
final byte[] symlink = type != PathType.SYMLINK? null
|
||||
: DFSUtil.string2Bytes((String)m.get("symlink"));
|
||||
|
||||
final long len = (Long) m.get("length");
|
||||
final long len = ((Number) m.get("length")).longValue();
|
||||
final String owner = (String) m.get("owner");
|
||||
final String group = (String) m.get("group");
|
||||
final FsPermission permission = toFsPermission((String) m.get("permission"),
|
||||
(Boolean)m.get("aclBit"), (Boolean)m.get("encBit"));
|
||||
final long aTime = (Long) m.get("accessTime");
|
||||
final long mTime = (Long) m.get("modificationTime");
|
||||
final long blockSize = (Long) m.get("blockSize");
|
||||
final long aTime = ((Number) m.get("accessTime")).longValue();
|
||||
final long mTime = ((Number) m.get("modificationTime")).longValue();
|
||||
final long blockSize = ((Number) m.get("blockSize")).longValue();
|
||||
final boolean isLazyPersist = m.containsKey("lazyPersist")
|
||||
? (Boolean) m.get("lazyPersist") : false;
|
||||
final short replication = (short) (long) (Long) m.get("replication");
|
||||
final long fileId = m.containsKey("fileId") ? (Long) m.get("fileId")
|
||||
: INodeId.GRANDFATHER_INODE_ID;
|
||||
Long childrenNumLong = (Long) m.get("childrenNum");
|
||||
final int childrenNum = (childrenNumLong == null) ? -1
|
||||
: childrenNumLong.intValue();
|
||||
final short replication = ((Number) m.get("replication")).shortValue();
|
||||
final long fileId = m.containsKey("fileId") ?
|
||||
((Number) m.get("fileId")).longValue() : INodeId.GRANDFATHER_INODE_ID;
|
||||
final int childrenNum = getInt(m, "childrenNum", -1);
|
||||
final byte storagePolicy = m.containsKey("storagePolicy") ?
|
||||
(byte) (long) (Long) m.get("storagePolicy") :
|
||||
BlockStoragePolicySuite.ID_UNSPECIFIED;
|
||||
(byte) ((Number) m.get("storagePolicy")).longValue() :
|
||||
BlockStoragePolicySuite.ID_UNSPECIFIED;
|
||||
return new HdfsFileStatus(len, type == PathType.DIRECTORY, replication,
|
||||
blockSize, mTime, aTime, permission, owner, group,
|
||||
symlink, DFSUtil.string2Bytes(localName), fileId, childrenNum, null,
|
||||
|
|
@ -295,9 +251,10 @@ private static ExtendedBlock toExtendedBlock(final Map<?, ?> m) {
|
|||
}
|
||||
|
||||
final String blockPoolId = (String)m.get("blockPoolId");
|
||||
final long blockId = (Long)m.get("blockId");
|
||||
final long numBytes = (Long)m.get("numBytes");
|
||||
final long generationStamp = (Long)m.get("generationStamp");
|
||||
final long blockId = ((Number) m.get("blockId")).longValue();
|
||||
final long numBytes = ((Number) m.get("numBytes")).longValue();
|
||||
final long generationStamp =
|
||||
((Number) m.get("generationStamp")).longValue();
|
||||
return new ExtendedBlock(blockPoolId, blockId, numBytes, generationStamp);
|
||||
}
|
||||
|
||||
|
|
@ -338,7 +295,7 @@ private static int getInt(Map<?, ?> m, String key, final int defaultValue) {
|
|||
if (value == null) {
|
||||
return defaultValue;
|
||||
}
|
||||
return (int) (long) (Long) value;
|
||||
return ((Number) value).intValue();
|
||||
}
|
||||
|
||||
private static long getLong(Map<?, ?> m, String key, final long defaultValue) {
|
||||
|
|
@ -346,7 +303,7 @@ private static long getLong(Map<?, ?> m, String key, final long defaultValue) {
|
|||
if (value == null) {
|
||||
return defaultValue;
|
||||
}
|
||||
return (Long) value;
|
||||
return ((Number) value).longValue();
|
||||
}
|
||||
|
||||
private static String getString(Map<?, ?> m, String key,
|
||||
|
|
@ -358,6 +315,15 @@ private static String getString(Map<?, ?> m, String key,
|
|||
return (String) value;
|
||||
}
|
||||
|
||||
static List<?> getList(Map<?, ?> m, String key) {
|
||||
Object list = m.get(key);
|
||||
if (list instanceof List<?>) {
|
||||
return (List<?>) list;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/** Convert a Json map to an DatanodeInfo object. */
|
||||
static DatanodeInfo toDatanodeInfo(final Map<?, ?> m)
|
||||
throws IOException {
|
||||
|
|
@ -402,9 +368,9 @@ static DatanodeInfo toDatanodeInfo(final Map<?, ?> m)
|
|||
(String)m.get("hostName"),
|
||||
(String)m.get("storageID"),
|
||||
xferPort,
|
||||
(int)(long)(Long)m.get("infoPort"),
|
||||
((Number) m.get("infoPort")).intValue(),
|
||||
getInt(m, "infoSecurePort", 0),
|
||||
(int)(long)(Long)m.get("ipcPort"),
|
||||
((Number) m.get("ipcPort")).intValue(),
|
||||
|
||||
getLong(m, "capacity", 0l),
|
||||
getLong(m, "dfsUsed", 0l),
|
||||
|
|
@ -434,16 +400,17 @@ private static Object[] toJsonArray(final DatanodeInfo[] array) {
|
|||
}
|
||||
|
||||
/** Convert an Object[] to a DatanodeInfo[]. */
|
||||
private static DatanodeInfo[] toDatanodeInfoArray(final Object[] objects)
|
||||
private static DatanodeInfo[] toDatanodeInfoArray(final List<?> objects)
|
||||
throws IOException {
|
||||
if (objects == null) {
|
||||
return null;
|
||||
} else if (objects.length == 0) {
|
||||
} else if (objects.isEmpty()) {
|
||||
return EMPTY_DATANODE_INFO_ARRAY;
|
||||
} else {
|
||||
final DatanodeInfo[] array = new DatanodeInfo[objects.length];
|
||||
for(int i = 0; i < array.length; i++) {
|
||||
array[i] = toDatanodeInfo((Map<?, ?>) objects[i]);
|
||||
final DatanodeInfo[] array = new DatanodeInfo[objects.size()];
|
||||
int i = 0;
|
||||
for (Object object : objects) {
|
||||
array[i++] = toDatanodeInfo((Map<?, ?>) object);
|
||||
}
|
||||
return array;
|
||||
}
|
||||
|
|
@ -474,11 +441,11 @@ private static LocatedBlock toLocatedBlock(final Map<?, ?> m) throws IOException
|
|||
|
||||
final ExtendedBlock b = toExtendedBlock((Map<?, ?>)m.get("block"));
|
||||
final DatanodeInfo[] locations = toDatanodeInfoArray(
|
||||
(Object[])m.get("locations"));
|
||||
final long startOffset = (Long)m.get("startOffset");
|
||||
getList(m, "locations"));
|
||||
final long startOffset = ((Number) m.get("startOffset")).longValue();
|
||||
final boolean isCorrupt = (Boolean)m.get("isCorrupt");
|
||||
final DatanodeInfo[] cachedLocations = toDatanodeInfoArray(
|
||||
(Object[])m.get("cachedLocations"));
|
||||
getList(m, "cachedLocations"));
|
||||
|
||||
final LocatedBlock locatedblock = new LocatedBlock(b, locations,
|
||||
null, null, startOffset, isCorrupt, cachedLocations);
|
||||
|
|
@ -502,17 +469,17 @@ private static Object[] toJsonArray(final List<LocatedBlock> array
|
|||
}
|
||||
}
|
||||
|
||||
/** Convert an Object[] to a List of LocatedBlock. */
|
||||
private static List<LocatedBlock> toLocatedBlockList(final Object[] objects
|
||||
) throws IOException {
|
||||
/** Convert an List of Object to a List of LocatedBlock. */
|
||||
private static List<LocatedBlock> toLocatedBlockList(
|
||||
final List<?> objects) throws IOException {
|
||||
if (objects == null) {
|
||||
return null;
|
||||
} else if (objects.length == 0) {
|
||||
} else if (objects.isEmpty()) {
|
||||
return Collections.emptyList();
|
||||
} else {
|
||||
final List<LocatedBlock> list = new ArrayList<LocatedBlock>(objects.length);
|
||||
for(int i = 0; i < objects.length; i++) {
|
||||
list.add(toLocatedBlock((Map<?, ?>)objects[i]));
|
||||
final List<LocatedBlock> list = new ArrayList<>(objects.size());
|
||||
for (Object object : objects) {
|
||||
list.add(toLocatedBlock((Map<?, ?>) object));
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
|
@ -543,10 +510,10 @@ public static LocatedBlocks toLocatedBlocks(final Map<?, ?> json
|
|||
}
|
||||
|
||||
final Map<?, ?> m = (Map<?, ?>)json.get(LocatedBlocks.class.getSimpleName());
|
||||
final long fileLength = (Long)m.get("fileLength");
|
||||
final long fileLength = ((Number) m.get("fileLength")).longValue();
|
||||
final boolean isUnderConstruction = (Boolean)m.get("isUnderConstruction");
|
||||
final List<LocatedBlock> locatedBlocks = toLocatedBlockList(
|
||||
(Object[])m.get("locatedBlocks"));
|
||||
getList(m, "locatedBlocks"));
|
||||
final LocatedBlock lastLocatedBlock = toLocatedBlock(
|
||||
(Map<?, ?>)m.get("lastLocatedBlock"));
|
||||
final boolean isLastBlockComplete = (Boolean)m.get("isLastBlockComplete");
|
||||
|
|
@ -577,12 +544,12 @@ public static ContentSummary toContentSummary(final Map<?, ?> json) {
|
|||
}
|
||||
|
||||
final Map<?, ?> m = (Map<?, ?>)json.get(ContentSummary.class.getSimpleName());
|
||||
final long length = (Long)m.get("length");
|
||||
final long fileCount = (Long)m.get("fileCount");
|
||||
final long directoryCount = (Long)m.get("directoryCount");
|
||||
final long quota = (Long)m.get("quota");
|
||||
final long spaceConsumed = (Long)m.get("spaceConsumed");
|
||||
final long spaceQuota = (Long)m.get("spaceQuota");
|
||||
final long length = ((Number) m.get("length")).longValue();
|
||||
final long fileCount = ((Number) m.get("fileCount")).longValue();
|
||||
final long directoryCount = ((Number) m.get("directoryCount")).longValue();
|
||||
final long quota = ((Number) m.get("quota")).longValue();
|
||||
final long spaceConsumed = ((Number) m.get("spaceConsumed")).longValue();
|
||||
final long spaceQuota = ((Number) m.get("spaceQuota")).longValue();
|
||||
|
||||
return new ContentSummary(length, fileCount, directoryCount,
|
||||
quota, spaceConsumed, spaceQuota);
|
||||
|
|
@ -610,7 +577,7 @@ public static MD5MD5CRC32FileChecksum toMD5MD5CRC32FileChecksum(
|
|||
|
||||
final Map<?, ?> m = (Map<?, ?>)json.get(FileChecksum.class.getSimpleName());
|
||||
final String algorithm = (String)m.get("algorithm");
|
||||
final int length = (int)(long)(Long)m.get("length");
|
||||
final int length = ((Number) m.get("length")).intValue();
|
||||
final byte[] bytes = StringUtils.hexStringToByte((String)m.get("bytes"));
|
||||
|
||||
final DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
|
||||
|
|
@ -654,7 +621,13 @@ public static String toJsonString(final AclStatus status) {
|
|||
m.put("owner", status.getOwner());
|
||||
m.put("group", status.getGroup());
|
||||
m.put("stickyBit", status.isStickyBit());
|
||||
m.put("entries", status.getEntries());
|
||||
|
||||
final List<String> stringEntries = new ArrayList<>();
|
||||
for (AclEntry entry : status.getEntries()) {
|
||||
stringEntries.add(entry.toString());
|
||||
}
|
||||
m.put("entries", stringEntries);
|
||||
|
||||
FsPermission perm = status.getPermission();
|
||||
if (perm != null) {
|
||||
m.put("permission", toString(perm));
|
||||
|
|
@ -668,7 +641,13 @@ public static String toJsonString(final AclStatus status) {
|
|||
final Map<String, Map<String, Object>> finalMap =
|
||||
new TreeMap<String, Map<String, Object>>();
|
||||
finalMap.put(AclStatus.class.getSimpleName(), m);
|
||||
return JSON.toString(finalMap);
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
try {
|
||||
return mapper.writeValueAsString(finalMap);
|
||||
} catch (IOException ignored) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** Convert a Json map to a AclStatus object. */
|
||||
|
|
@ -689,11 +668,11 @@ public static AclStatus toAclStatus(final Map<?, ?> json) {
|
|||
(Boolean) m.get("aclBit"), (Boolean) m.get("encBit"));
|
||||
aclStatusBuilder.setPermission(permission);
|
||||
}
|
||||
final Object[] entries = (Object[]) m.get("entries");
|
||||
final List<?> entries = (List<?>) m.get("entries");
|
||||
|
||||
List<AclEntry> aclEntryList = new ArrayList<AclEntry>();
|
||||
for (int i = 0; i < entries.length; i++) {
|
||||
AclEntry aclEntry = AclEntry.parseAclEntry((String) entries[i], true);
|
||||
for (Object entry : entries) {
|
||||
AclEntry aclEntry = AclEntry.parseAclEntry((String) entry, true);
|
||||
aclEntryList.add(aclEntry);
|
||||
}
|
||||
aclStatusBuilder.addEntries(aclEntryList);
|
||||
|
|
@ -732,7 +711,8 @@ public static String toJsonString(final List<XAttr> xAttrs,
|
|||
final XAttrCodec encoding) throws IOException {
|
||||
final Map<String, Object> finalMap = new TreeMap<String, Object>();
|
||||
finalMap.put("XAttrs", toJsonArray(xAttrs, encoding));
|
||||
return JSON.toString(finalMap);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
return mapper.writeValueAsString(finalMap);
|
||||
}
|
||||
|
||||
public static String toJsonString(final List<XAttr> xAttrs)
|
||||
|
|
@ -741,10 +721,11 @@ public static String toJsonString(final List<XAttr> xAttrs)
|
|||
for (XAttr xAttr : xAttrs) {
|
||||
names.add(XAttrHelper.getPrefixName(xAttr));
|
||||
}
|
||||
String ret = JSON.toString(names);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
String ret = mapper.writeValueAsString(names);
|
||||
final Map<String, Object> finalMap = new TreeMap<String, Object>();
|
||||
finalMap.put("XAttrNames", ret);
|
||||
return JSON.toString(finalMap);
|
||||
return mapper.writeValueAsString(finalMap);
|
||||
}
|
||||
|
||||
public static byte[] getXAttr(final Map<?, ?> json, final String name)
|
||||
|
|
@ -760,14 +741,13 @@ public static byte[] getXAttr(final Map<?, ?> json, final String name)
|
|||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
public static Map<String, byte[]> toXAttrs(final Map<?, ?> json)
|
||||
throws IOException {
|
||||
if (json == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return toXAttrMap((Object[])json.get("XAttrs"));
|
||||
return toXAttrMap(getList(json, "XAttrs"));
|
||||
}
|
||||
|
||||
public static List<String> toXAttrNames(final Map<?, ?> json)
|
||||
|
|
@ -777,26 +757,27 @@ public static List<String> toXAttrNames(final Map<?, ?> json)
|
|||
}
|
||||
|
||||
final String namesInJson = (String) json.get("XAttrNames");
|
||||
final Object[] xattrs = (Object[]) JSON.parse(namesInJson);
|
||||
ObjectReader reader = new ObjectMapper().reader(List.class);
|
||||
final List<Object> xattrs = reader.readValue(namesInJson);
|
||||
final List<String> names =
|
||||
Lists.newArrayListWithCapacity(json.keySet().size());
|
||||
|
||||
for (int i = 0; i < xattrs.length; i++) {
|
||||
names.add((String) (xattrs[i]));
|
||||
for (Object xattr : xattrs) {
|
||||
names.add((String) xattr);
|
||||
}
|
||||
return names;
|
||||
}
|
||||
|
||||
private static Map<String, byte[]> toXAttrMap(final Object[] objects)
|
||||
private static Map<String, byte[]> toXAttrMap(final List<?> objects)
|
||||
throws IOException {
|
||||
if (objects == null) {
|
||||
return null;
|
||||
} else if (objects.length == 0) {
|
||||
} else if (objects.isEmpty()) {
|
||||
return Maps.newHashMap();
|
||||
} else {
|
||||
final Map<String, byte[]> xAttrs = Maps.newHashMap();
|
||||
for(int i = 0; i < objects.length; i++) {
|
||||
Map<?, ?> m = (Map<?, ?>) objects[i];
|
||||
for (Object object : objects) {
|
||||
Map<?, ?> m = (Map<?, ?>) object;
|
||||
String name = (String) m.get("name");
|
||||
String value = (String) m.get("value");
|
||||
xAttrs.put(name, decodeXAttrValue(value));
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.MalformedURLException;
|
||||
|
|
@ -81,10 +80,9 @@
|
|||
import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSelector;
|
||||
import org.apache.hadoop.util.Progressable;
|
||||
import org.apache.hadoop.util.StringUtils;
|
||||
import org.mortbay.util.ajax.JSON;
|
||||
import org.codehaus.jackson.map.ObjectMapper;
|
||||
|
||||
import com.google.common.annotations.VisibleForTesting;
|
||||
import com.google.common.base.Charsets;
|
||||
import com.google.common.base.Preconditions;
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
|
|
@ -323,7 +321,8 @@ private Path makeAbsolute(Path f) {
|
|||
+ "\" (parsed=\"" + parsed + "\")");
|
||||
}
|
||||
}
|
||||
return (Map<?, ?>)JSON.parse(new InputStreamReader(in, Charsets.UTF_8));
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
return mapper.reader(Map.class).readValue(in);
|
||||
} finally {
|
||||
in.close();
|
||||
}
|
||||
|
|
@ -1291,13 +1290,15 @@ public FileStatus[] listStatus(final Path f) throws IOException {
|
|||
@Override
|
||||
FileStatus[] decodeResponse(Map<?,?> json) {
|
||||
final Map<?, ?> rootmap = (Map<?, ?>)json.get(FileStatus.class.getSimpleName() + "es");
|
||||
final Object[] array = (Object[])rootmap.get(FileStatus.class.getSimpleName());
|
||||
final List<?> array = JsonUtil.getList(
|
||||
rootmap, FileStatus.class.getSimpleName());
|
||||
|
||||
//convert FileStatus
|
||||
final FileStatus[] statuses = new FileStatus[array.length];
|
||||
for (int i = 0; i < array.length; i++) {
|
||||
final Map<?, ?> m = (Map<?, ?>)array[i];
|
||||
statuses[i] = makeQualified(JsonUtil.toFileStatus(m, false), f);
|
||||
final FileStatus[] statuses = new FileStatus[array.size()];
|
||||
int i = 0;
|
||||
for (Object object : array) {
|
||||
final Map<?, ?> m = (Map<?, ?>) object;
|
||||
statuses[i++] = makeQualified(JsonUtil.toFileStatus(m, false), f);
|
||||
}
|
||||
return statuses;
|
||||
}
|
||||
|
|
@ -1348,7 +1349,7 @@ public synchronized long renewDelegationToken(final Token<?> token
|
|||
new TokenArgumentParam(token.encodeToUrlString())) {
|
||||
@Override
|
||||
Long decodeResponse(Map<?,?> json) throws IOException {
|
||||
return (Long) json.get("long");
|
||||
return ((Number) json.get("long")).longValue();
|
||||
}
|
||||
}.run();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,10 @@
|
|||
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
|
||||
import org.apache.hadoop.hdfs.server.namenode.INodeId;
|
||||
import org.apache.hadoop.util.Time;
|
||||
import org.codehaus.jackson.map.ObjectMapper;
|
||||
import org.codehaus.jackson.map.ObjectReader;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
import org.mortbay.util.ajax.JSON;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
|
|
@ -58,7 +59,7 @@ static FileStatus toFileStatus(HdfsFileStatus f, String parent) {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testHdfsFileStatus() {
|
||||
public void testHdfsFileStatus() throws IOException {
|
||||
final long now = Time.now();
|
||||
final String parent = "/dir";
|
||||
final HdfsFileStatus status = new HdfsFileStatus(1001L, false, 3, 1L << 26,
|
||||
|
|
@ -70,7 +71,9 @@ public void testHdfsFileStatus() {
|
|||
System.out.println("fstatus = " + fstatus);
|
||||
final String json = JsonUtil.toJsonString(status, true);
|
||||
System.out.println("json = " + json.replace(",", ",\n "));
|
||||
final HdfsFileStatus s2 = JsonUtil.toFileStatus((Map<?, ?>)JSON.parse(json), true);
|
||||
ObjectReader reader = new ObjectMapper().reader(Map.class);
|
||||
final HdfsFileStatus s2 =
|
||||
JsonUtil.toFileStatus((Map<?, ?>) reader.readValue(json), true);
|
||||
final FileStatus fs2 = toFileStatus(s2, parent);
|
||||
System.out.println("s2 = " + s2);
|
||||
System.out.println("fs2 = " + fs2);
|
||||
|
|
@ -153,10 +156,11 @@ public void testToDatanodeInfoWithName() throws Exception {
|
|||
}
|
||||
|
||||
@Test
|
||||
public void testToAclStatus() {
|
||||
public void testToAclStatus() throws IOException {
|
||||
String jsonString =
|
||||
"{\"AclStatus\":{\"entries\":[\"user::rwx\",\"user:user1:rw-\",\"group::rw-\",\"other::r-x\"],\"group\":\"supergroup\",\"owner\":\"testuser\",\"stickyBit\":false}}";
|
||||
Map<?, ?> json = (Map<?, ?>) JSON.parse(jsonString);
|
||||
ObjectReader reader = new ObjectMapper().reader(Map.class);
|
||||
Map<?, ?> json = reader.readValue(jsonString);
|
||||
|
||||
List<AclEntry> aclSpec =
|
||||
Lists.newArrayList(aclEntry(ACCESS, USER, ALL),
|
||||
|
|
@ -215,7 +219,8 @@ public void testToXAttrMap() throws IOException {
|
|||
String jsonString =
|
||||
"{\"XAttrs\":[{\"name\":\"user.a1\",\"value\":\"0x313233\"}," +
|
||||
"{\"name\":\"user.a2\",\"value\":\"0x313131\"}]}";
|
||||
Map<?, ?> json = (Map<?, ?>)JSON.parse(jsonString);
|
||||
ObjectReader reader = new ObjectMapper().reader(Map.class);
|
||||
Map<?, ?> json = reader.readValue(jsonString);
|
||||
XAttr xAttr1 = (new XAttr.Builder()).setNameSpace(XAttr.NameSpace.USER).
|
||||
setName("a1").setValue(XAttrCodec.decodeValue("0x313233")).build();
|
||||
XAttr xAttr2 = (new XAttr.Builder()).setNameSpace(XAttr.NameSpace.USER).
|
||||
|
|
@ -240,8 +245,9 @@ public void testGetXAttrFromJson() throws IOException {
|
|||
String jsonString =
|
||||
"{\"XAttrs\":[{\"name\":\"user.a1\",\"value\":\"0x313233\"}," +
|
||||
"{\"name\":\"user.a2\",\"value\":\"0x313131\"}]}";
|
||||
Map<?, ?> json = (Map<?, ?>) JSON.parse(jsonString);
|
||||
|
||||
ObjectReader reader = new ObjectMapper().reader(Map.class);
|
||||
Map<?, ?> json = reader.readValue(jsonString);
|
||||
|
||||
// Get xattr: user.a2
|
||||
byte[] value = JsonUtil.getXAttr(json, "user.a2");
|
||||
Assert.assertArrayEquals(XAttrCodec.decodeValue("0x313131"), value);
|
||||
|
|
|
|||
Loading…
Reference in New Issue