-
Notifications
You must be signed in to change notification settings - Fork 934
Fix code style issues #2265
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Fix code style issues #2265
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6abf752
to
bdf3a3b
Compare
bdf3a3b
to
5d0ac8c
Compare
5d0ac8c
to
f02b89f
Compare
Changes against master with whitespaces and blank lines ignoreddiff --git a/src/NHibernate.DomainModel/Northwind/Entities/Role.cs b/src/NHibernate.DomainModel/Northwind/Entities/Role.cs
index 362eaf0f5..2643c03d2 100644
--- a/src/NHibernate.DomainModel/Northwind/Entities/Role.cs
+++ b/src/NHibernate.DomainModel/Northwind/Entities/Role.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.DomainModel.Northwind.Entities
+namespace NHibernate.DomainModel.Northwind.Entities
{
public class Role
{
diff --git a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
index 8e092f962..c93a92bf1 100644
--- a/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
+++ b/src/NHibernate.Test/Criteria/Lambda/CriteriaAssertFixture.cs
@@ -1,5 +1,4 @@
-
-using System;
+using System;
using NUnit.Framework;
diff --git a/src/NHibernate.Test/FetchLazyProperties/Animal.cs b/src/NHibernate.Test/FetchLazyProperties/Animal.cs
index f18a8b76f..a4b9dde5a 100644
--- a/src/NHibernate.Test/FetchLazyProperties/Animal.cs
+++ b/src/NHibernate.Test/FetchLazyProperties/Animal.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.FetchLazyProperties
+namespace NHibernate.Test.FetchLazyProperties
{
public abstract class Animal
{
diff --git a/src/NHibernate.Test/FetchLazyProperties/Cat.cs b/src/NHibernate.Test/FetchLazyProperties/Cat.cs
index 790b23098..7a95f212a 100644
--- a/src/NHibernate.Test/FetchLazyProperties/Cat.cs
+++ b/src/NHibernate.Test/FetchLazyProperties/Cat.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.FetchLazyProperties
+namespace NHibernate.Test.FetchLazyProperties
{
public class Cat : Animal
{
diff --git a/src/NHibernate.Test/FetchLazyProperties/Dog.cs b/src/NHibernate.Test/FetchLazyProperties/Dog.cs
index 1019be4df..82d0dc5ec 100644
--- a/src/NHibernate.Test/FetchLazyProperties/Dog.cs
+++ b/src/NHibernate.Test/FetchLazyProperties/Dog.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.FetchLazyProperties
+namespace NHibernate.Test.FetchLazyProperties
{
public class Dog : Animal
{
diff --git a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs
index 2a6f1377a..5fa24d6e9 100644
--- a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs
+++ b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/Dog.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728
+namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728
{
public class Dog : IAnimal
{
diff --git a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs
index 7548cd1a2..1ab3f3ac7 100644
--- a/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs
+++ b/src/NHibernate.Test/MappingByCode/IntegrationTests/NH2728/IAnimal.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728
+namespace NHibernate.Test.MappingByCode.IntegrationTests.NH2728
{
public interface IAnimal
{
diff --git a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs
index 63138e0a3..a4f8d84ac 100644
--- a/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs
+++ b/src/NHibernate.Test/NHSpecificTest/EntityWithUserTypeCanHaveLinqGenerators/EntityWithUserTypeProperty.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators
+namespace NHibernate.Test.NHSpecificTest.EntityWithUserTypeCanHaveLinqGenerators
{
public class EntityWithUserTypeProperty
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs b/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs
index 5af03aca8..c2f39162d 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1533/Person.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.NHSpecificTest.NH1533
+namespace NHibernate.Test.NHSpecificTest.NH1533
{
public class Person
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs b/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs
index 3db39a0ca..573cb9946 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1601/Project.cs
@@ -28,7 +28,9 @@ public IList<Scenario> ScenarioList1
public IList<Scenario> ScenarioList2
{
get { return scenarioList2; }
- set { scenarioList2 = value;
+ set
+ {
+ scenarioList2 = value;
int i = scenarioList2.Count;
}
}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs
index ab00447a7..d6c1ab1d4 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1689/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH1689
+namespace NHibernate.Test.NHSpecificTest.NH1689
{
using System.Collections.Generic;
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs
index fbf713c63..4378ee170 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1714/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH1714
+namespace NHibernate.Test.NHSpecificTest.NH1714
{
public class DomainClass
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs
index 34ca1c11a..1770a4ff7 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1818/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH1818
+namespace NHibernate.Test.NHSpecificTest.NH1818
{
public class DomainClass
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs
index d94501578..315e10da5 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1899/DomainClass.cs
@@ -1,7 +1,6 @@
-
-
-using System.Collections;
+using System.Collections;
using System.Collections.Generic;
+
namespace NHibernate.Test.NHSpecificTest.NH1899
{
public class Parent
@@ -15,18 +14,21 @@ public int Id
set { id = value; }
}
- public IDictionary<Key, Value> Relations {
+ public IDictionary<Key, Value> Relations
+ {
get { return _relations; }
set { _relations = value; }
}
}
- public enum Key {
+ public enum Key
+ {
One,
Two
}
- public enum Value {
+ public enum Value
+ {
ValOne,
ValTwo
}
diff --git a/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs
index 37a7f4031..ff6f279aa 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH1963/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH1963
+namespace NHibernate.Test.NHSpecificTest.NH1963
{
public class DomainClass
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs
index c49b336ad..8b39bece6 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2044/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH2044
+namespace NHibernate.Test.NHSpecificTest.NH2044
{
public class DomainClass
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs
index a85eeb978..234b581d2 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2049/Model.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH2049
+namespace NHibernate.Test.NHSpecificTest.NH2049
{
public abstract class Customer
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs b/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs
index 4ff5d2fdf..cfb78a2c6 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2386/Organisation.cs
@@ -15,32 +15,32 @@ public class Organisation
/// <summary>
///
/// </summary>
-
-
- public virtual ISet<ResponsibleLegalPerson> ResponsibleLegalPersons {
- get {
- if (responsibleLegalPersons == null) {
+ public virtual ISet<ResponsibleLegalPerson> ResponsibleLegalPersons
+ {
+ get
+ {
+ if (responsibleLegalPersons == null)
+ {
responsibleLegalPersons = new HashSet<ResponsibleLegalPerson>();
}
- return responsibleLegalPersons;
- }
- protected set {
- responsibleLegalPersons = value;
+ return responsibleLegalPersons;
}
+ protected set { responsibleLegalPersons = value; }
}
- public virtual ISet<TradingName> TradingNames {
- get {
- if (tradingNames == null) {
+ public virtual ISet<TradingName> TradingNames
+ {
+ get
+ {
+ if (tradingNames == null)
+ {
tradingNames = new HashSet<TradingName>();
}
- return tradingNames;
- }
- protected set {
- tradingNames = value;
+ return tradingNames;
}
+ protected set { tradingNames = value; }
}
protected internal virtual byte[] RowVersion { get; protected set; }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs b/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs
index 25056895d..c474369c1 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2693/Model.cs
@@ -1,10 +1,12 @@
-
-namespace NHibernate.Test.NHSpecificTest.NH2693 {
- using System;
+using System;
using System.Collections.Generic;
- public class FirstLevel {
- public FirstLevel() {
+namespace NHibernate.Test.NHSpecificTest.NH2693
+{
+ public class FirstLevel
+ {
+ public FirstLevel()
+ {
SecondLevels = new HashSet<SecondLevelComponent>();
}
@@ -12,26 +14,31 @@ public class FirstLevel {
public virtual ICollection<SecondLevelComponent> SecondLevels { get; set; }
}
- public class SecondLevelComponent {
+ public class SecondLevelComponent
+ {
public virtual FirstLevel FirstLevel { get; set; }
public virtual ThirdLevel ThirdLevel { get; set; }
public virtual SpecificThirdLevel SpecificThirdLevel { get; set; }
public virtual bool SomeBool { get; set; }
}
- public abstract class ThirdLevel {
+ public abstract class ThirdLevel
+ {
public virtual Guid Id { get; set; }
}
- public class SpecificThirdLevel : ThirdLevel {
- public SpecificThirdLevel() {
+ public class SpecificThirdLevel : ThirdLevel
+ {
+ public SpecificThirdLevel()
+ {
FourthLevels = new HashSet<FourthLevel>();
}
public virtual ICollection<FourthLevel> FourthLevels { get; set; }
}
- public class FourthLevel {
+ public class FourthLevel
+ {
public virtual Guid Id { get; set; }
public virtual SpecificThirdLevel SpecificThirdLevel { get; set; }
public virtual string SomeString { get; set; }
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs b/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs
index cadff6f74..09f9a877b 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2697/ArticleItem.cs
@@ -1,8 +1,6 @@
-
+using System;
-using System;
namespace NHibernate.Test.NHSpecificTest.NH2697
-
{
public class ArticleItem
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs b/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs
index bb4affb05..b5964e94e 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH2779/LineItem.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.NHSpecificTest.NH2779
+namespace NHibernate.Test.NHSpecificTest.NH2779
{
public class LineItem
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs b/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs
index 2b81ffe7b..eb12306b1 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH3567/DomainClass.cs
@@ -1,6 +1,4 @@
-
-
-namespace NHibernate.Test.NHSpecificTest.NH3567
+namespace NHibernate.Test.NHSpecificTest.NH3567
{
public class Site
{
diff --git a/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs b/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs
index b58449c04..9f96ca1d2 100644
--- a/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs
+++ b/src/NHibernate.Test/NHSpecificTest/NH3641/Domain.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Test.NHSpecificTest.NH3641
+namespace NHibernate.Test.NHSpecificTest.NH3641
{
public interface IEntity
{
diff --git a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs
index ee0a7969d..ca5fd8c43 100644
--- a/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs
+++ b/src/NHibernate/Linq/Visitors/ResultOperatorProcessors/ProcessFetchLazyProperties.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
+namespace NHibernate.Linq.Visitors.ResultOperatorProcessors
{
internal class ProcessFetchLazyProperties : IResultOperatorProcessor<FetchLazyPropertiesResultOperator>
{
diff --git a/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs b/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs
index 71f07d689..a2a1f2c58 100644
--- a/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs
+++ b/src/NHibernate/Transform/ITupleSubsetResultTransformer.cs
@@ -1,5 +1,4 @@
-
-namespace NHibernate.Transform
+namespace NHibernate.Transform
{
/// <summary>
/// A ResultTransformer that operates on "well-defined" and consistent |
@@ -1,6 +1,4 @@ | |||
namespace NHibernate.Cfg.MappingSchema { | |||
|
|||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This one is generated. Should we really fix it? I do not fix so, unless we also fix the generator.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, shouldn't
Mainly fix redundant spaces before end-of-line comment. (Which should be converted to comment on previous line I think, but that is another subject.)
fredericDelaporte
approved these changes
Nov 10, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only white-space and blank-lines changes