Skip to content

Commit de0cdb6

Browse files
RoelantVosRoelantVos
committed
Fixed up examples (revert) and re-added JObject class.
1 parent 1f80972 commit de0cdb6

File tree

8 files changed

+35
-80
lines changed

8 files changed

+35
-80
lines changed

‎ClassLibrary/DataWarehouseAutomation/DataWarehouseAutomation.sln

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Test_Project\Tes
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Metadata", "Sample Metadata", "{242F4BD0-68F9-4193-A329-826E755C6B08}"
1919
ProjectSection(SolutionItems) = preProject
20-
Sample_Metadata\sampeVDW_Sat_Customer_v161.json = Sample_Metadata\sampeVDW_Sat_Customer_v161.json
2120
Sample_Metadata\sampleBasic.json = Sample_Metadata\sampleBasic.json
2221
Sample_Metadata\sampleBasicWithExtensions.json = Sample_Metadata\sampleBasicWithExtensions.json
2322
Sample_Metadata\sampleCalculation.json = Sample_Metadata\sampleCalculation.json
23+
Sample_Metadata\sampleFreeForm.json = Sample_Metadata\sampleFreeForm.json
2424
Sample_Metadata\sampleMultipleDataItemMappings.json = Sample_Metadata\sampleMultipleDataItemMappings.json
2525
Sample_Metadata\sampleSimpleDDL.json = Sample_Metadata\sampleSimpleDDL.json
2626
Sample_Metadata\sampleSourceQuery.json = Sample_Metadata\sampleSourceQuery.json
@@ -30,19 +30,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Metadata", "Sample M
3030
Sample_Metadata\sampleTEAMv16.json = Sample_Metadata\sampleTEAMv16.json
3131
Sample_Metadata\sampleVDW_Hub.json = Sample_Metadata\sampleVDW_Hub.json
3232
Sample_Metadata\sampleVDW_HubWithLookup.json = Sample_Metadata\sampleVDW_HubWithLookup.json
33+
Sample_Metadata\sampleVDW_Sat_Customer_v161.json = Sample_Metadata\sampleVDW_Sat_Customer_v161.json
3334
Sample_Metadata\sampleVDW_StagingArea.json = Sample_Metadata\sampleVDW_StagingArea.json
34-
Sample_Metadata\sampleFreeForm.json = Sample_Metadata\sampleFreeForm.json
3535
EndProjectSection
3636
EndProject
3737
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample Templates", "Sample Templates", "{968E4A48-A2A3-4F7E-B8D9-243D1F4CCE17}"
3838
ProjectSection(SolutionItems) = preProject
3939
Sample_Templates\TemplateSampleBasic.Handlebars = Sample_Templates\TemplateSampleBasic.Handlebars
4040
Sample_Templates\TemplateSampleBasicWithExtensions.Handlebars = Sample_Templates\TemplateSampleBasicWithExtensions.Handlebars
4141
Sample_Templates\TemplateSampleCalculation.Handlebars = Sample_Templates\TemplateSampleCalculation.Handlebars
42+
Sample_Templates\TemplateSampleFreeForm.Handlebars = Sample_Templates\TemplateSampleFreeForm.Handlebars
4243
Sample_Templates\TemplateSampleMultipleDataItemMappings.Handlebars = Sample_Templates\TemplateSampleMultipleDataItemMappings.Handlebars
4344
Sample_Templates\TemplateSampleSimpleDDL.Handlebars = Sample_Templates\TemplateSampleSimpleDDL.Handlebars
4445
Sample_Templates\TemplateSatelliteView.Handlebars = Sample_Templates\TemplateSatelliteView.Handlebars
45-
Sample_Templates\TemplateSampleFreeForm.Handlebars = Sample_Templates\TemplateSampleFreeForm.Handlebars
4646
EndProjectSection
4747
EndProject
4848
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Examples", "Example_Project\Examples.csproj", "{F77AC518-6300-4927-8775-B92CDF15CC8E}"

‎ClassLibrary/DataWarehouseAutomation/DataWarehouseAutomation/JsonHandling.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static ValidationResult ValidateJsonFileAgainstSchema(string jsonSchemaFi
6161
}
6262
catch (Exception ex)
6363
{
64-
Console.WriteLine("An error has occured. The error message is: "+ex);
64+
Console.WriteLine("An error has occurred. The error message is: "+ex);
6565
}
6666

6767
JToken jsonFileToken = "";
@@ -71,7 +71,7 @@ public static ValidationResult ValidateJsonFileAgainstSchema(string jsonSchemaFi
7171
}
7272
catch (Exception ex)
7373
{
74-
Console.WriteLine("An error has occured. The error message is: " + ex);
74+
Console.WriteLine("An error has occurred. The error message is: " + ex);
7575
}
7676

7777
// Validate the file against the schema

‎ClassLibrary/DataWarehouseAutomation/Example_Project/Examples.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
<HintPath>..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
3737
</Reference>
3838
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<HintPath>..\..\ClassLibrary\DataWarehouseAutomation\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
39+
<SpecificVersion>False</SpecificVersion>
40+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
4041
</Reference>
4142
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4243
<HintPath>..\packages\Newtonsoft.Json.Schema.3.0.13\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>

‎ClassLibrary/DataWarehouseAutomation/Example_Project/Program.cs

Lines changed: 24 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -2,96 +2,49 @@
22
using System.IO;
33
using DataWarehouseAutomation;
44
using HandlebarsDotNet;
5-
using Newtonsoft.Json;
65
using Newtonsoft.Json.Linq;
76

7+
88
namespace Example_Handlebars
99
{
1010
class Program
1111
{
1212
static void Main(string[] args)
1313
{
14-
HandleBarsHelpers.RegisterHandleBarsHelpers();;
14+
HandleBarsHelpers.RegisterHandleBarsHelpers();
15+
16+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleBasic.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleBasic.json");
17+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleBasicWithExtensions.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleBasicWithExtensions.json");
18+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleMultipleDataItemMappings.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleMultipleDataItemMappings.json");
19+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleSimpleDDL.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleSimpleDDL.json");
20+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleCalculation.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleCalculation.json");
21+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSatelliteView.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleVDW_Sat_Customer_v161.json");
22+
DisplayPatternResult(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleFreeForm.handlebars", AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleFreeForm.json");
1523

16-
// Local variables, for reuse
17-
string stringTemplate = "";
18-
string jsonInput = "";
19-
string result = "";
20-
//DataObjectMappings deserialisedMapping = new DataObjectMappings();
21-
var deserialisedMapping = new JObject();
22-
var template = Handlebars.Compile("");
24+
Console.ReadKey();
25+
}
2326

24-
// Simple example template
27+
private static void DisplayPatternResult(string patternFile, string jsonMetadataFile)
28+
{
2529
try
2630
{
27-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleBasic.handlebars");
28-
template = Handlebars.Compile(stringTemplate);
29-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleBasic.json");
31+
// Fetch and compile the template
32+
string stringTemplate = File.ReadAllText(patternFile);
33+
var template = Handlebars.Compile(stringTemplate);
34+
35+
// Fetch the content of the Json files
36+
string jsonInput = File.ReadAllText(jsonMetadataFile);
37+
3038
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
31-
deserialisedMapping = JObject.Parse(jsonInput);
32-
result = template(deserialisedMapping);
39+
var deserialisedMapping = JObject.Parse(jsonInput);
40+
41+
var result = template(deserialisedMapping);
3342
Console.WriteLine(result);
3443
}
3544
catch (Exception ex)
3645
{
3746
Console.WriteLine($"An issue was encountered: {ex}");
3847
}
39-
40-
// Example using extensions
41-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleBasicWithExtensions.handlebars");
42-
template = Handlebars.Compile(stringTemplate);
43-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleBasicWithExtensions.json");
44-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
45-
deserialisedMapping = JObject.Parse(jsonInput);
46-
result = template(deserialisedMapping);
47-
Console.WriteLine(result);
48-
49-
// Example using more than one mapping at data item level
50-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleMultipleDataItemMappings.handlebars");
51-
template = Handlebars.Compile(stringTemplate);
52-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleMultipleDataItemMappings.json");
53-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
54-
deserialisedMapping = JObject.Parse(jsonInput);
55-
result = template(deserialisedMapping);
56-
Console.WriteLine(result);
57-
58-
// Example generating DDL statements
59-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleSimpleDDL.handlebars");
60-
template = Handlebars.Compile(stringTemplate);
61-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleSimpleDDL.json");
62-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
63-
deserialisedMapping = JObject.Parse(jsonInput);
64-
result = template(deserialisedMapping);
65-
Console.WriteLine(result);
66-
67-
// Example using OneOf / swapping a source for a query
68-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleCalculation.handlebars");
69-
template = Handlebars.Compile(stringTemplate);
70-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleCalculation.json");
71-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
72-
deserialisedMapping = JObject.Parse(jsonInput);
73-
result = template(deserialisedMapping);
74-
Console.WriteLine(result);
75-
76-
// Data Vault Satellite example
77-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSatelliteView.handlebars");
78-
template = Handlebars.Compile(stringTemplate);
79-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampeVDW_Sat_Customer_v161.json");
80-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
81-
deserialisedMapping = JObject.Parse(jsonInput);
82-
result = template(deserialisedMapping);
83-
Console.WriteLine(result);
84-
85-
//Free form example
86-
stringTemplate = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Templates\TemplateSampleFreeForm.handlebars");
87-
template = Handlebars.Compile(stringTemplate);
88-
jsonInput = File.ReadAllText(AppDomain.CurrentDomain.BaseDirectory + @"..\..\..\Sample_Metadata\sampleFreeForm.json");
89-
//deserialisedMapping = JsonConvert.DeserializeObject<DataObjectMappings>(jsonInput);
90-
deserialisedMapping = JObject.Parse(jsonInput);
91-
result = template(deserialisedMapping);
92-
Console.WriteLine(result);
93-
94-
Console.ReadKey();
9548
}
9649
}
9750
}

‎ClassLibrary/DataWarehouseAutomation/RunDwhAutomation/RunDwhAutomation.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@
6363
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6464
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6565
</Reference>
66+
<Reference Include="Newtonsoft.Json.Schema, Version=3.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
67+
<HintPath>..\packages\Newtonsoft.Json.Schema.3.0.13\lib\net45\Newtonsoft.Json.Schema.dll</HintPath>
68+
</Reference>
6669
<Reference Include="System" />
6770
<Reference Include="System.Core" />
6871
<Reference Include="System.Xml.Linq" />

‎ClassLibrary/DataWarehouseAutomation/RunDwhAutomation/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
<package id="Fody" version="6.3.0" targetFramework="net472" developmentDependency="true" />
66
<package id="Handlebars.Net" version="2.0.4" targetFramework="net472" />
77
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
8+
<package id="Newtonsoft.Json.Schema" version="3.0.13" targetFramework="net472" />
89
</packages>

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleBasic.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
"sourceDataObjects": [
66
{
77
"name": "TableOneSource"
8-
},
9-
{
10-
"name": "TableTwoSource"
118
}
129
],
1310
"targetDataObject": {

‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampeVDW_Sat_Customer_v161.json renamed to ‎ClassLibrary/DataWarehouseAutomation/Sample_Metadata/sampleVDW_Sat_Customer_v161.json

File renamed without changes.

0 commit comments

Comments
 (0)