Skip to content

Commit 287d66d

Browse files
devlightsdevlights
committed
Fix warnings
1 parent e549c02 commit 287d66d

12 files changed

Lines changed: 36 additions & 36 deletions

‎TryCSharp.Samples/Linq/LinqSamples21.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,21 @@ public void Execute()
4949
// 実行時には、最後のselectの部分がSelectManyに置換される。
5050
//
5151
Output.WriteLine("===== Func<TSource, IEnumerable<TResult>>のサンプル =====");
52-
foreach (var member in teams.SelectMany(team => team.Members))
52+
foreach (var member in teams.SelectMany(team => team.Members!))
5353
{
5454
Output.WriteLine(member);
5555
}
5656

5757
Output.WriteLine("===== Func<TSource, int, IEnumerable<TResult>>のサンプル =====");
58-
foreach (var member in teams.SelectMany((team, index) => index%2 == 0 ? team.Members : new List<string>()))
58+
foreach (var member in teams.SelectMany((team, index) => index%2 == 0 ? team.Members! : new List<string>()))
5959
{
6060
Output.WriteLine(member);
6161
}
6262

6363
Output.WriteLine("===== collectionSelectorとresultSelectorを利用しているサンプル (1) =====");
6464
var query = teams.SelectMany
6565
(
66-
team => team.Members, // collectionSelector
66+
team => team.Members!, // collectionSelector
6767
(team, member) => new {Team = team.Name, Name = member} // resultSelector
6868
);
6969

@@ -75,7 +75,7 @@ public void Execute()
7575
Output.WriteLine("===== collectionSelectorとresultSelectorを利用しているサンプル (2) =====");
7676
var query2 = teams.SelectMany
7777
(
78-
(team, index) => index%2 != 0 ? team.Members : new List<string>(), // collectionSelector
78+
(team, index) => index%2 != 0 ? team.Members! : new List<string>(), // collectionSelector
7979
(team, member) => new {Team = team.Name, Name = member} // resultSelector
8080
);
8181

‎TryCSharp.Samples/Linq/LinqSamples22.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void Execute()
7171
private class Person
7272
{
7373
public int Id { get; set; }
74-
public string Name { get; set; }
74+
public string? Name { get; set; }
7575

7676
public override string ToString()
7777
{

‎TryCSharp.Samples/Linq/LinqSamples23.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public void Execute()
5454
//
5555
var sortByIdAndNameAsc = persons
5656
.OrderBy(aPerson => aPerson.Id)
57-
.ThenBy(aPerson => aPerson.Name.Last().ToString().ToInt());
57+
.ThenBy(aPerson => aPerson.Name!.Last().ToString().ToInt());
5858

5959
Output.WriteLine("================= IDの昇順で、且つ、Nameの数字部分の昇順でソート. =================");
6060
Output.WriteLine(string.Join(Environment.NewLine, sortByIdAndNameAsc));
@@ -69,7 +69,7 @@ public void Execute()
6969
//
7070
var sortByIdAndNameDesc = persons
7171
.OrderBy(aPerson => aPerson.Id)
72-
.ThenByDescending(aPerson => aPerson.Name.Last().ToString().ToInt());
72+
.ThenByDescending(aPerson => aPerson.Name!.Last().ToString().ToInt());
7373

7474
Output.WriteLine("================= IDの昇順で、且つ、Nameの数字部分の降順でソート. =================");
7575
Output.WriteLine(string.Join(Environment.NewLine, sortByIdAndNameDesc));
@@ -78,7 +78,7 @@ public void Execute()
7878
private class Person
7979
{
8080
public int Id { get; set; }
81-
public string Name { get; set; }
81+
public string? Name { get; set; }
8282

8383
public override string ToString()
8484
{

‎TryCSharp.Samples/Linq/LinqSamples24.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void Execute()
3939
private class Person
4040
{
4141
public int Id { get; set; }
42-
public string Name { get; set; }
42+
public string? Name { get; set; }
4343

4444
public override string ToString()
4545
{

‎TryCSharp.Samples/Linq/LinqSamples25.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void Execute()
9898
// group thePerson by new { thePerson.Project, thePerson.Team }
9999
//
100100
Output.WriteLine("\n============ 複合キーを指定したGroupBy ==============");
101-
var query3 = persons.GroupBy(thePerson => new {thePerson.Project, thePerson.Team});
101+
var query3 = persons.GroupBy(thePerson => new {Project = thePerson.Project!, Team = thePerson.Team!});
102102
foreach (var group in query3)
103103
{
104104
Output.WriteLine("=== {0}", group.Key);
@@ -117,7 +117,7 @@ public void Execute()
117117
//
118118
Output.WriteLine("\n============ 複合キーとorderbyを指定したGroupBy ==============");
119119
var query4 = persons
120-
.GroupBy(thePerson => new {thePerson.Project, thePerson.Team})
120+
.GroupBy(thePerson => new {Project = thePerson.Project!, Team = thePerson.Team!})
121121
.OrderByDescending(group => group.Key.Project)
122122
.ThenByDescending(group => group.Key.Team);
123123

@@ -134,9 +134,9 @@ public void Execute()
134134
private class Person
135135
{
136136
public int Id { get; set; }
137-
public string Name { get; set; }
138-
public string Team { get; set; }
139-
public string Project { get; set; }
137+
public string? Name { get; set; }
138+
public string? Team { get; set; }
139+
public string? Project { get; set; }
140140

141141
public override string ToString()
142142
{

‎TryCSharp.Samples/Linq/LinqSamples26.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,13 @@ public void Execute()
4949

5050
private class Person
5151
{
52-
public string Name { get; set; }
53-
public Team Team { get; set; }
52+
public string? Name { get; set; }
53+
public Team? Team { get; set; }
5454
}
5555

5656
private class Team
5757
{
58-
public string Name { get; set; }
58+
public string? Name { get; set; }
5959
}
6060
}
6161
}

‎TryCSharp.Samples/Linq/LinqSamples27.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public void Execute()
5555

5656
private class Person
5757
{
58-
public string Name { get; set; }
59-
public Team Team { get; set; }
58+
public string? Name { get; set; }
59+
public Team? Team { get; set; }
6060
}
6161

6262
private class Team
6363
{
64-
public string Name { get; set; }
64+
public string? Name { get; set; }
6565
}
6666
}
6767
}

‎TryCSharp.Samples/Linq/LinqSamples28.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void Execute()
4242

4343
private string JoinElements<T>(IEnumerable<T> elements)
4444
{
45-
return string.Join(",", elements.Select(item => item.ToString()));
45+
return string.Join(",", elements.Select(item => item!.ToString()));
4646
}
4747

4848
private class Person
4949
{
50-
public string Name { get; set; }
50+
public string? Name { get; set; }
5151

5252
public override string ToString()
5353
{
@@ -57,7 +57,7 @@ public override string ToString()
5757

5858
private class PersonComparer : EqualityComparer<Person>
5959
{
60-
public override bool Equals(Person p1, Person p2)
60+
public override bool Equals(Person? p1, Person? p2)
6161
{
6262
if (object.Equals(p1, p2))
6363
{
@@ -74,7 +74,7 @@ public override bool Equals(Person p1, Person p2)
7474

7575
public override int GetHashCode(Person p)
7676
{
77-
return p.Name.GetHashCode();
77+
return p.Name!.GetHashCode();
7878
}
7979
}
8080
}

‎TryCSharp.Samples/Linq/LinqSamples29.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ public void Execute()
6161

6262
private string JoinElements<T>(IEnumerable<T> elements)
6363
{
64-
return string.Join(",", elements.Select(item => item.ToString()));
64+
return string.Join(",", elements.Select(item => item!.ToString()));
6565
}
6666

6767
private class Person
6868
{
69-
public string Name { get; set; }
69+
public string? Name { get; set; }
7070

7171
public override string ToString()
7272
{
@@ -76,7 +76,7 @@ public override string ToString()
7676

7777
private class PersonComparer : EqualityComparer<Person>
7878
{
79-
public override bool Equals(Person p1, Person p2)
79+
public override bool Equals(Person? p1, Person? p2)
8080
{
8181
if (object.Equals(p1, p2))
8282
{

‎TryCSharp.Samples/Linq/LinqSamples30.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ public void Execute()
5757

5858
private string JoinElements<T>(IEnumerable<T> elements)
5959
{
60-
return string.Join(",", elements.Select(item => item.ToString()));
60+
return string.Join(",", elements.Select(item => item!.ToString()));
6161
}
6262

6363
private class Person
6464
{
65-
public string Name { get; set; }
65+
public string? Name { get; set; }
6666

6767
public override string ToString()
6868
{
@@ -72,7 +72,7 @@ public override string ToString()
7272

7373
private class PersonComparer : EqualityComparer<Person>
7474
{
75-
public override bool Equals(Person p1, Person p2)
75+
public override bool Equals(Person? p1, Person? p2)
7676
{
7777
if (object.Equals(p1, p2))
7878
{

0 commit comments

Comments
 (0)