diff options
| author |  shahan <shahan@google.com> | 2018-02-28 09:18:36 -0800 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-02-28 09:20:24 -0800 |
| commit | 1fe23126d4a30d49b7668b235ea1bfb2e2c8a39e (patch) | |
| tree | 7807839ba173ef69dd87e5933f0419767ab327e0 /src/main/java/com/google/devtools/build/skyframe | |
| parent | e959e44a4363fc12ae2df2c5bc0cd0d12f80bbd9 (diff) | |
Deletes AutoCodec.Strategy.SINGLETON now that we have @AutoCodec field tags.
This also gets rid of some static initialization cycles which we should try very hard to avoid in the future.
PiperOrigin-RevId: 187334087
Diffstat (limited to 'src/main/java/com/google/devtools/build/skyframe')
| -rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/EmptySkyValue.java | 3 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/main/java/com/google/devtools/build/skyframe/EmptySkyValue.java b/src/main/java/com/google/devtools/build/skyframe/EmptySkyValue.java index bd31c4f903..878dd67bf9 100644 --- a/src/main/java/com/google/devtools/build/skyframe/EmptySkyValue.java +++ b/src/main/java/com/google/devtools/build/skyframe/EmptySkyValue.java @@ -21,9 +21,8 @@ import java.io.ObjectOutputStream; * A SkyValue with no attached data. Preferable to a specialized empty value class to minimize * bloat. */ -@AutoCodec(strategy = AutoCodec.Strategy.SINGLETON) public final class EmptySkyValue implements SkyValue { - public static final EmptySkyValue INSTANCE = new EmptySkyValue(); + @AutoCodec public static final EmptySkyValue INSTANCE = new EmptySkyValue(); private EmptySkyValue() {} diff --git a/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java b/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java index 2d6de966bd..6d44fbe47c 100644 --- a/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java +++ b/src/main/java/com/google/devtools/build/skyframe/ErrorTransienceValue.java @@ -21,11 +21,10 @@ import java.io.ObjectOutputStream; * A value that represents "error transience", i.e. anything which may have caused an unexpected * failure. Is not equal to anything, including itself, in order to force re-evaluation. */ -@AutoCodec(strategy = AutoCodec.Strategy.SINGLETON) public final class ErrorTransienceValue implements SkyValue { public static final SkyFunctionName FUNCTION_NAME = SkyFunctionName.create("ERROR_TRANSIENCE"); public static final SkyKey KEY = LegacySkyKey.create(FUNCTION_NAME, "ERROR_TRANSIENCE"); - public static final ErrorTransienceValue INSTANCE = new ErrorTransienceValue(); + @AutoCodec public static final ErrorTransienceValue INSTANCE = new ErrorTransienceValue(); private ErrorTransienceValue() {} |