Merge pull request #22 from mogilefs-moji/longerFid

Longer fid
mogilefs-moji · Jun 15, 2016 · 58bb171 · 58bb171
2 parents 531857e + b9b0ed1
commit 58bb171
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/fm/last/moji/MojiFileAttributes.java b/src/main/java/fm/last/moji/MojiFileAttributes.java
@@ -8,7 +8,7 @@ public interface MojiFileAttributes {
 
   long getLength();
 
-  int getFid();
+  long getFid();
 
   String getDomain();
 

diff --git a/src/main/java/fm/last/moji/impl/MojiFileAttributesImpl.java b/src/main/java/fm/last/moji/impl/MojiFileAttributesImpl.java
@@ -9,14 +9,14 @@ class MojiFileAttributesImpl implements MojiFileAttributes {
   private final String storageClass;
   private final int deviceCount;
   private final long length;
-  private final int fid;
+  private final long fid;
   private final String domain;
   private final String key;
 
   MojiFileAttributesImpl(Map<String, String> valueMap) {
     length = Long.parseLong(valueMap.get("length"));
     domain = valueMap.get("domain");
-    fid = Integer.parseInt(valueMap.get("fid"));
+    fid = Long.parseLong(valueMap.get("fid"));
     deviceCount = Integer.parseInt(valueMap.get("devcount"));
     storageClass = valueMap.get("class");
     key = valueMap.get("key");
@@ -38,7 +38,7 @@ public long getLength() {
   }
 
   @Override
-  public int getFid() {
+  public long getFid() {
     return fid;
   }
 

diff --git a/src/main/java/fm/last/moji/local/LocalMojiFileAttributes.java b/src/main/java/fm/last/moji/local/LocalMojiFileAttributes.java
@@ -34,7 +34,7 @@ public long getLength() {
   }
 
   @Override
-  public int getFid() {
+  public long getFid() {
     return 0;
   }
 

diff --git a/src/main/java/fm/last/moji/tracker/Destination.java b/src/main/java/fm/last/moji/tracker/Destination.java
@@ -24,9 +24,9 @@ public class Destination {
 
   private final URL path;
   private final int devId;
-  private final int fid;
+  private final long fid;
 
-  public Destination(URL path, int devId, int fid) {
+  public Destination(URL path, int devId, long fid) {
     this.path = path;
     this.devId = devId;
     this.fid = fid;
@@ -40,7 +40,7 @@ public int getDevId() {
     return devId;
   }
 
-  public int getFid() {
+  public long getFid() {
     return fid;
   }
 

diff --git a/src/main/java/fm/last/moji/tracker/impl/CreateOpenOperation.java b/src/main/java/fm/last/moji/tracker/impl/CreateOpenOperation.java
@@ -78,7 +78,7 @@ private Request buildRequest() {
   }
 
   private void extractReturnValues(Response response) throws TrackerException {
-    int fid = Integer.parseInt(response.getValue("fid"));
+    long fid = Long.parseLong(response.getValue("fid"));
     int pathCount = Integer.parseInt(response.getValue("dev_count"));
     destinations = new ArrayList<Destination>(pathCount);
 

diff --git a/src/test/java/fm/last/moji/tracker/impl/CreateOpenOperationTest.java b/src/test/java/fm/last/moji/tracker/impl/CreateOpenOperationTest.java
@@ -140,12 +140,12 @@ public void responseNormal() throws TrackerException, MalformedURLException {
 
     Destination destination1 = destinations.get(0);
     assertThat(destination1.getDevId(), is(1));
-    assertThat(destination1.getFid(), is(5));
+    assertThat(destination1.getFid(), is(5L));
     assertThat(destination1.getPath(), is(new URL(PATH_1)));
 
     Destination destination2 = destinations.get(1);
     assertThat(destination2.getDevId(), is(2));
-    assertThat(destination2.getFid(), is(5));
+    assertThat(destination2.getFid(), is(5L));
     assertThat(destination2.getPath(), is(new URL(PATH_2)));
   }