diff options
| author |  cpeyser <cpeyser@google.com> | 2018-02-02 10:51:48 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-02 10:54:14 -0800 |
| commit | a93e4223dedd920a20b9de69bb5274b072de97cd (patch) | |
| tree | 931c76220bdcfc8444644a69725483694ce4c352 /src/main/java/com/google/devtools/build/lib/vfs | |
| parent | 43d23a2f33814e7e555980026f8ec60de0572503 (diff) | |
Remove Root#getCodec, to bring Root in line with general style for codec
declaration.
PiperOrigin-RevId: 184304653
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/vfs')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/vfs/Root.java | 6 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/vfs/RootedPath.java | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/vfs/Root.java b/src/main/java/com/google/devtools/build/lib/vfs/Root.java index fb2996cf08..0df98c0c9c 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/Root.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/Root.java @@ -16,8 +16,6 @@ package com.google.devtools.build.lib.vfs; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodec; -import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodecAdapter; -import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; import com.google.protobuf.CodedInputStream; import com.google.protobuf.CodedOutputStream; @@ -37,10 +35,6 @@ public interface Root extends Comparable<Root>, Serializable { InjectingObjectCodec<Root, FileSystemProvider> CODEC = new RootCodec(); - static ObjectCodec<Root> getCodec(FileSystem fileSystem) { - return new InjectingObjectCodecAdapter<>(CODEC, () -> fileSystem); - } - /** Constructs a root from a path. */ static Root fromPath(Path path) { return new PathRoot(path); diff --git a/src/main/java/com/google/devtools/build/lib/vfs/RootedPath.java b/src/main/java/com/google/devtools/build/lib/vfs/RootedPath.java index 03e763fa29..9182f10c0f 100644 --- a/src/main/java/com/google/devtools/build/lib/vfs/RootedPath.java +++ b/src/main/java/com/google/devtools/build/lib/vfs/RootedPath.java @@ -14,6 +14,7 @@ package com.google.devtools.build.lib.vfs; import com.google.common.base.Preconditions; +import com.google.devtools.build.lib.skyframe.serialization.InjectingObjectCodecAdapter; import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec; import com.google.devtools.build.lib.skyframe.serialization.SerializationException; import com.google.protobuf.CodedInputStream; @@ -135,7 +136,7 @@ public class RootedPath implements Serializable { /** Create an instance which will deserialize RootedPaths on {@code fileSystem}. */ public RootedPathCodec(FileSystem fileSystem) { - this.rootCodec = Root.getCodec(fileSystem); + this.rootCodec = new InjectingObjectCodecAdapter<>(Root.CODEC, () -> fileSystem); } @Override |