Repository: beam Updated Branches: refs/heads/master 0f7736dff -> de7cc05cc
Clearer getOrDefault style in RehydratedComponents Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/01103c2c Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/01103c2c Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/01103c2c Branch: refs/heads/master Commit: 01103c2cfdb8976fcf086a4d18f050a9fda41d1a Parents: d684ca0 Author: Kenneth Knowles <[email protected]> Authored: Tue Oct 17 12:42:05 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Tue Oct 17 12:45:11 2017 -0700 ---------------------------------------------------------------------- .../runners/core/construction/RehydratedComponents.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/01103c2c/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/RehydratedComponents.java ---------------------------------------------------------------------- diff --git a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/RehydratedComponents.java b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/RehydratedComponents.java index fdb6cea..09457a3 100644 --- a/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/RehydratedComponents.java +++ b/runners/core-construction-java/src/main/java/org/apache/beam/runners/core/construction/RehydratedComponents.java @@ -71,13 +71,8 @@ public class RehydratedComponents { new CacheLoader<String, Coder<?>>() { @Override public Coder<?> load(String id) throws Exception { - RunnerApi.Coder coder; - try { - coder = components.getCodersOrThrow(id); - } catch (IllegalArgumentException exc) { - throw new IllegalStateException( - String.format("No coder with id '%s' in serialized components", id), exc); - } + @Nullable RunnerApi.Coder coder = components.getCodersOrDefault(id, null); + checkState(coder != null, "No coder with id '%s' in serialized components", id); return CoderTranslation.fromProto(coder, RehydratedComponents.this); } });
