Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-545: Code cleanup

This commit is contained in:
Mark Payne 2015-06-22 09:21:44 -04:00
parent b22a1261c3
commit 979671ca97
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/flow/impl/DataFlowDaoImpl.java
View File

@ -188,7 +188,7 @@ public class DataFlowDaoImpl implements DataFlowDao {
return; return;
} }
if ((primaryEntry == null && restoreEntry != null) || (primaryEntry != null && restoreEntry == null)) { if (primaryEntry == null && restoreEntry != null || primaryEntry != null && restoreEntry == null) {
throw new IllegalStateException(String.format("Primary file '%s' is different than restore file '%s'", throw new IllegalStateException(String.format("Primary file '%s' is different than restore file '%s'",
primaryFile.getAbsoluteFile(), restoreFile.getAbsolutePath())); primaryFile.getAbsoluteFile(), restoreFile.getAbsolutePath()));
} }
@ -352,7 +352,7 @@ public class DataFlowDaoImpl implements DataFlowDao {
final File[] files = dir.listFiles(new FilenameFilter() { final File[] files = dir.listFiles(new FilenameFilter() {
@Override @Override
public boolean accept(File dir, String name) { public boolean accept(File dir, String name) {
return (name.equals(FLOW_PACKAGE) || name.endsWith(STALE_EXT) || name.endsWith(UNKNOWN_EXT)); return name.equals(FLOW_PACKAGE) || name.endsWith(STALE_EXT) || name.endsWith(UNKNOWN_EXT);
} }
}); });
@ -515,19 +515,10 @@ public class DataFlowDaoImpl implements DataFlowDao {
final StandardDataFlow dataFlow = new StandardDataFlow(flowBytes, templateBytes, snippetBytes); final StandardDataFlow dataFlow = new StandardDataFlow(flowBytes, templateBytes, snippetBytes);
dataFlow.setAutoStartProcessors(autoStart); dataFlow.setAutoStartProcessors(autoStart);
return new ClusterDataFlow(dataFlow, (clusterMetadata == null) ? null : clusterMetadata.getPrimaryNodeId(), controllerServiceBytes, reportingTaskBytes); return new ClusterDataFlow(dataFlow, clusterMetadata == null ? null : clusterMetadata.getPrimaryNodeId(), controllerServiceBytes, reportingTaskBytes);
} }
private void writeDataFlow(final File file, final ClusterDataFlow clusterDataFlow) throws IOException, JAXBException { private void writeDataFlow(final File file, final ClusterDataFlow clusterDataFlow) throws IOException, JAXBException {
// get the data flow
DataFlow dataFlow = clusterDataFlow.getDataFlow();
// if no dataflow, then write a new dataflow
if (dataFlow == null) {
dataFlow = new StandardDataFlow(new byte[0], new byte[0], new byte[0]);
}
// setup the cluster metadata // setup the cluster metadata
final ClusterMetadata clusterMetadata = new ClusterMetadata(); final ClusterMetadata clusterMetadata = new ClusterMetadata();
clusterMetadata.setPrimaryNodeId(clusterDataFlow.getPrimaryNodeId()); clusterMetadata.setPrimaryNodeId(clusterDataFlow.getPrimaryNodeId());