Implement PR suggestions.

Signed-off-by: Joey Kleingers <[email protected]>

Author: joeykleingers

src/Plugins/SimplnxCore/test/DREAM3DFileTest.cpp

@@ -278,7 +278,7 @@ TEST_CASE("DREAM3DFileTest:DREAM3D File IO Test")
   {
     auto fileData = CreateFileData();
     Result<HDF5::FileWriter> result = HDF5::FileWriter::CreateFile(GetIODataPath());
-    REQUIRE(result.valid());
+    SIMPLNX_RESULT_REQUIRE_VALID(result);
 
     auto writeResult = DREAM3D::WriteFile(result.value(), fileData);
     SIMPLNX_RESULT_REQUIRE_VALID(writeResult);
@@ -374,7 +374,7 @@ TEST_CASE("DREAM3DFileTest: Existing Data Objects Test")
     args.insert(CreateImageGeometryFilter::k_Origin_Key, std::make_any<std::vector<float32>>(std::vector<float32>{0, 0, 0}));
     args.insert(CreateImageGeometryFilter::k_Spacing_Key, std::make_any<std::vector<float32>>(std::vector<float32>{0.5, 0.5, 0.12}));
     auto executeResult = filter.execute(ds, args);
-    REQUIRE(executeResult.result.valid());
+    SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result);
   }
 
   {
@@ -385,7 +385,7 @@ TEST_CASE("DREAM3DFileTest: Existing Data Objects Test")
     args.insert(CreateDataArrayFilter::k_DataPath_Key, std::make_any<DataPath>(DataPath({"New Geometry", "Cell Data", "Array 1"})));
     args.insert(CreateDataArrayFilter::k_InitializationValue_Key, std::make_any<std::string>("0"));
     auto executeResult = filter.execute(ds, args);
-    REQUIRE(executeResult.result.valid());
+    SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result);
   }
 
   {
@@ -396,7 +396,7 @@ TEST_CASE("DREAM3DFileTest: Existing Data Objects Test")
     args.insert(CreateDataArrayFilter::k_DataPath_Key, std::make_any<DataPath>(DataPath({"New Geometry", "Cell Data", "Array 2"})));
     args.insert(CreateDataArrayFilter::k_InitializationValue_Key, std::make_any<std::string>("0"));
     auto executeResult = filter.execute(ds, args);
-    REQUIRE(executeResult.result.valid());
+    SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result);
   }
 
   {
@@ -407,7 +407,7 @@ TEST_CASE("DREAM3DFileTest: Existing Data Objects Test")
     Dream3dImportParameter::ImportData importData(fs::path(fmt::format("{}/Small_IN100.dream3d", unit_test::k_TestFilesDir)));
     args.insert(ReadDREAM3DFilter::k_ImportFileData, importData);
     auto executeResult = filter.execute(ds, args);
-    REQUIRE(executeResult.result.valid());
+    SIMPLNX_RESULT_REQUIRE_VALID(executeResult.result);
   }
 }
 

src/simplnx/Parameters/Dream3dImportParameter.cpp

@@ -43,7 +43,7 @@ IParameter::AcceptedTypes Dream3dImportParameter::acceptedTypes() const
 //------------------------------------------------------------------------------
 IParameter::VersionType Dream3dImportParameter::getVersion() const
 {
-  return 1;
+  return 2;
 }
 
 //-----------------------------------------------------------------------------
@@ -130,7 +130,7 @@ Result<std::any> Dream3dImportParameter::fromJsonImpl(const nlohmann::json& json
   }
 
   PathImportPolicy pathImportPolicy = PathImportPolicy::All;
-  if(json.contains(k_PathImportPolicyKey))
+  if(version == 2)
   {
     const auto& pathImportPolicyJson = json[k_PathImportPolicyKey];
     if(!pathImportPolicyJson.is_number_integer())