Repository: incubator-gobblin Updated Branches: refs/heads/master 9b91fa1b3 -> 10318fe9b
[GOBBLIN-511] Fix Findbugs warnings in Gobblin Service.[] Closes #2381 from sv2000/flowGraphFindBugs Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/10318fe9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/10318fe9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/10318fe9 Branch: refs/heads/master Commit: 10318fe9b40f634d3a95f0b3f84d2afbfa8120a8 Parents: 9b91fa1 Author: suvasude <[email protected]> Authored: Thu Jun 7 10:44:56 2018 -0700 Committer: Hung Tran <[email protected]> Committed: Thu Jun 7 10:44:56 2018 -0700 ---------------------------------------------------------------------- .../service/modules/dataset/BaseHdfsDatasetDescriptor.java | 5 ++--- .../gobblin/service/modules/flowgraph/BaseFlowEdge.java | 2 ++ .../gobblin/service/modules/template/StaticFlowTemplate.java | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/10318fe9/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/BaseHdfsDatasetDescriptor.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/BaseHdfsDatasetDescriptor.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/BaseHdfsDatasetDescriptor.java index f7cf99f..7d7e2b4 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/BaseHdfsDatasetDescriptor.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/dataset/BaseHdfsDatasetDescriptor.java @@ -34,8 +34,6 @@ import lombok.Getter; */ @Alpha public class BaseHdfsDatasetDescriptor implements HdfsDatasetDescriptor { - public static final String HDFS_PLATFORM_NAME = "hdfs"; - @Getter private final String path; @Getter @@ -43,7 +41,7 @@ public class BaseHdfsDatasetDescriptor implements HdfsDatasetDescriptor { @Getter private final String description; @Getter - private final String platform = HDFS_PLATFORM_NAME; + private final String platform; public BaseHdfsDatasetDescriptor(Config config) { Preconditions.checkArgument(config.hasPath(DatasetDescriptorConfigKeys.PATH_KEY), String.format("Missing required property %s", DatasetDescriptorConfigKeys.PATH_KEY)); @@ -52,6 +50,7 @@ public class BaseHdfsDatasetDescriptor implements HdfsDatasetDescriptor { this.path = ConfigUtils.getString(config, DatasetDescriptorConfigKeys.PATH_KEY, null); this.format = ConfigUtils.getString(config, DatasetDescriptorConfigKeys.FORMAT_KEY, null); this.description = ConfigUtils.getString(config, DatasetDescriptorConfigKeys.DESCRIPTION_KEY, ""); + this.platform = "hdfs"; } /** http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/10318fe9/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/BaseFlowEdge.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/BaseFlowEdge.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/BaseFlowEdge.java index ccce62e..12b6222 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/BaseFlowEdge.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flowgraph/BaseFlowEdge.java @@ -169,6 +169,8 @@ public class BaseFlowEdge implements FlowEdge { } FlowTemplate flowTemplate = flowCatalog.getFlowTemplate(new URI(flowTemplateUri)); return new BaseFlowEdge(endPoints, edgeName, flowTemplate, specExecutors, edgeProps, isActive); + } catch(RuntimeException e) { + throw e; } catch (Exception e) { throw new FlowEdgeCreationException(e); } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/10318fe9/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/StaticFlowTemplate.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/StaticFlowTemplate.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/StaticFlowTemplate.java index 8347022..46f99d3 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/StaticFlowTemplate.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/StaticFlowTemplate.java @@ -45,6 +45,8 @@ import lombok.Getter; */ @Alpha public class StaticFlowTemplate implements FlowTemplate { + private static final long serialVersionUID = 84641624233978L; + public static final String INPUT_DATASET_DESCRIPTOR_PREFIX = "gobblin.flow.dataset.descriptor.input"; public static final String OUTPUT_DATASET_DESCRIPTOR_PREFIX = "gobblin.flow.dataset.descriptor.output"; public static final String DATASET_DESCRIPTOR_CLASS_KEY = "class"; @@ -56,15 +58,15 @@ public class StaticFlowTemplate implements FlowTemplate { @Getter private String description; @Getter - private FlowCatalogWithTemplates catalog; + private transient FlowCatalogWithTemplates catalog; @Getter private List<Pair<DatasetDescriptor, DatasetDescriptor>> inputOutputDatasetDescriptors; @Getter private List<JobTemplate> jobTemplates; - private Dag<JobTemplate> dag; + private transient Dag<JobTemplate> dag; - private Config rawConfig; + private transient Config rawConfig; private boolean isTemplateMaterialized; public StaticFlowTemplate(URI uri, String version, String description, Config config,
