Skip to content

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 5 commits into from
Nov 11, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions src/AsyncGenerator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- pattern: ^.*(Hql\.g).*$
analyzation:
methodConversion:
#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults
#TODO 6.0: Remove ignore rule for IQueryBatchItem.ProcessResults
- conversion: Ignore
name: ProcessResults
containingTypeName: IQueryBatchItem
Expand Down Expand Up @@ -121,7 +121,7 @@
- conversion: ToAsync
rule: Cache
- conversion: ToAsync
rule: TransactionCompletion
rule: TransactionCompletion
typeConversion:
- conversion: Ignore
name: EnumerableImpl
Expand Down Expand Up @@ -276,7 +276,7 @@ methodRules:
- containingType: NHibernate.Action.IAfterTransactionCompletionProcess
- containingType: NHibernate.Action.IBeforeTransactionCompletionProcess
- containingType: NHibernate.Action.EntityAction
name: BeforeTransactionCompletionProcessImpl
name: BeforeTransactionCompletionProcessImpl
name: TransactionCompletion
- filters:
- containingNamespace: NHibernate
Expand Down
7 changes: 1 addition & 6 deletions src/NHibernate.DomainModel/Bar.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class Bar : Abstract, BarProxy, INamed
private string _name = "bar";
private object _object;


/// <summary>
/// Gets or sets the X
/// </summary>
Expand All @@ -31,7 +30,6 @@ public string BarString
set { _barString = value; }
}


/// <summary>
/// Gets or sets the _barComponent
/// </summary>
Expand All @@ -41,7 +39,6 @@ public FooComponent BarComponent
set { _barComponent = value; }
}


/// <summary>
/// Gets or sets the _baz
/// </summary>
Expand All @@ -51,7 +48,6 @@ public Baz Baz
set { _baz = value; }
}


/// <summary>
/// Gets or sets the _name
/// </summary>
Expand All @@ -61,7 +57,6 @@ public string Name
set { _name = value; }
}


/// <summary>
/// Gets or sets the _object
/// </summary>
Expand All @@ -71,4 +66,4 @@ public object Object
set { _object = value; }
}
}
}
}
4 changes: 1 addition & 3 deletions src/NHibernate.DomainModel/Baz.cs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ public string[] StringArray
set { _stringArray = value; }
}


/// <summary>
/// Gets or sets the fooArray
/// </summary>
Expand All @@ -270,7 +269,6 @@ public FooProxy[] FooArray
set { _fooArray = value; }
}


/// <summary>
/// Get/set for fooSet
/// </summary>
Expand Down Expand Up @@ -453,4 +451,4 @@ public int CompareTo(object obj)

#endregion
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/Circular.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public string Id
set { _id = value; }
}


public System.Type Clazz
{
get { return _clazz; }
Expand All @@ -37,4 +36,4 @@ public object AnyEntity
set { _anyEntity = value; }
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/ComponentCollection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public IList Foos
set { _foos = value; }
}


/// <summary>
/// Holds the _str
/// </summary>
Expand Down Expand Up @@ -49,4 +48,4 @@ public IList Floats
set { _floats = value; }
}
}
}
}
4 changes: 1 addition & 3 deletions src/NHibernate.DomainModel/Container.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public Glarch Glarch
}
}


private IList<Simple> _oneToMany;
private IList<ContainerInnerClass> _components;
private IList<Simple> _manyToMany;
Expand All @@ -94,7 +93,6 @@ public Glarch Glarch
//<set> mapping
private ISet<Ternary> _ternarySet;


public virtual IList<Simple> OneToMany
{
get { return _oneToMany; }
Expand Down Expand Up @@ -155,4 +153,4 @@ public virtual ISet<Ternary> TernarySet
set { _ternarySet = value; }
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/Detail.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public int I
set { _i = value; }
}


public ISet<SubDetail> SubDetails
{
get { return _details; }
Expand All @@ -39,4 +38,4 @@ public int X
set { _x = value; }
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/DoubleStringType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public Object NullSafeGet(DbDataReader rs, string[] names, ISessionImplementor s
return (first == null && second == null) ? null : new string[] {first, second};
}


public void NullSafeSet(DbCommand st, Object value, int index, bool[] settable, ISessionImplementor session)
{
string[] strings = (value == null) ? new string[2] : (string[]) value;
Expand Down Expand Up @@ -107,4 +106,4 @@ public object Replace(object original, object target, ISessionImplementor sessio
return DeepCopy(original);
}
}
}
}
6 changes: 2 additions & 4 deletions src/NHibernate.DomainModel/Foo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ public LifecycleVeto OnSave(ISession s)
_long = 696969696969696969L - count++;
_short = 42;
_float = 6666.66f;
//_double = new Double( 1.33e-69 ); // this double is too big for the sap db jdbc driver
// _double = 1.12e-36;
//_double = new Double( 1.33e-69 ); // this double is too big for the sap db jdbc driver
//_double = 1.12e-36;
_boolean = true;
_byte = 127;
_int = 2;
Expand Down Expand Up @@ -397,7 +397,6 @@ public bool EqualsFoo(Foo other)
}
}


return (_bool == other.Bool)
&& ((_boolean == other.Boolean) || (_boolean.Equals(other.Boolean)))
&& ((_byte == other.Byte) || (_byte.Equals(other.Byte)))
Expand Down Expand Up @@ -429,7 +428,6 @@ public bool EqualsFoo(Foo other)
// return key.GetHashCode() - _string.GetHashCode();
// }


private static int count = 0;
}
}
6 changes: 1 addition & 5 deletions src/NHibernate.DomainModel/Fum.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ public ISet<Fum> Friends
set { this._friends = value; }
}


public LifecycleVeto OnDelete(ISession s)
{
if (_friends == null) return LifecycleVeto.NoVeto;
Expand All @@ -117,12 +116,10 @@ public LifecycleVeto OnDelete(ISession s)
return LifecycleVeto.NoVeto;
}


public void OnLoad(ISession s, object id)
{
}


public LifecycleVeto OnSave(ISession s)
{
if (_friends == null) return LifecycleVeto.NoVeto;
Expand All @@ -140,7 +137,6 @@ public LifecycleVeto OnSave(ISession s)
return LifecycleVeto.NoVeto;
}


public LifecycleVeto OnUpdate(ISession s)
{
return LifecycleVeto.NoVeto;
Expand All @@ -158,4 +154,4 @@ public MapComponent MapComponent
set { _mapComponent = value; }
}
}
}
}
9 changes: 1 addition & 8 deletions src/NHibernate.DomainModel/Glarch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public int Version
set { this._version = value; }
}


/// <summary>
/// Gets or sets the _next
/// </summary>
Expand All @@ -48,7 +47,6 @@ public GlarchProxy Next
set { _next = value; }
}


/// <summary>
/// Gets or sets the _order
/// </summary>
Expand All @@ -58,7 +56,6 @@ public short Order
set { _order = value; }
}


/// <summary>
/// Gets or sets the _strings
/// </summary>
Expand All @@ -68,7 +65,6 @@ public IList<string> Strings
set { _strings = value; }
}


/// <summary>
/// Gets or sets the _stringSets
/// </summary>
Expand All @@ -79,7 +75,6 @@ public ISet<string> StringSets
set { _stringSets = value; }
}


/// <summary>
/// Gets or sets the _fooComponents
/// </summary>
Expand All @@ -89,7 +84,6 @@ public IList<FooComponent> FooComponents
set { _fooComponents = value; }
}


/// <summary>
/// Gets or sets the _proxyArray
/// </summary>
Expand All @@ -99,7 +93,6 @@ public GlarchProxy[] ProxyArray
set { _proxyArray = value; }
}


/// <summary>
/// Gets or sets the _proxySet
/// </summary>
Expand Down Expand Up @@ -188,4 +181,4 @@ public Multiplicity Multiple
set { _name = value; }
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/Location.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ public string CountryCode
set { _countryCode = value; }
}


public string Description
{
get { return _description; }
Expand Down Expand Up @@ -76,4 +75,4 @@ public override int GetHashCode()

#endregion
}
}
}
4 changes: 1 addition & 3 deletions src/NHibernate.DomainModel/MoreStuff.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class MoreStuff
private IList<Stuff> _stuffs;
private string _name;


public string StringId
{
get { return _stringId; }
Expand Down Expand Up @@ -52,12 +51,11 @@ public override bool Equals(object obj)
return (rhs.IntId == this.IntId && rhs.StringId.Equals(this.StringId));
}


public override int GetHashCode()
{
return _stringId.GetHashCode();
}

#endregion
}
}
}
4 changes: 1 addition & 3 deletions src/NHibernate.DomainModel/NHSpecific/Child.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public Child FirstSibling
set { Siblings.Insert(0, value); }
}


public Child SecondSibling
{
get { return (Child) Siblings[1]; }
Expand Down Expand Up @@ -115,11 +114,10 @@ public Child[] Friends
set { _friends = value; }
}


public DateTime FavoriteDate
{
get { return _favoriteDate; }
set { _favoriteDate = value; }
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/NHSpecific/Parent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public class Parent
private ISet<object> _children;
private ISet<Parent> _adultFriends;


public Parent()
{
_adultFriends = new SortedSet<Parent>(new ParentComparer());
Expand Down Expand Up @@ -48,4 +47,4 @@ public void AddFriend(Parent friend)
_adultFriends.Add(friend);
}
}
}
}
3 changes: 1 addition & 2 deletions src/NHibernate.DomainModel/Northwind/Entities/Role.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

namespace NHibernate.DomainModel.Northwind.Entities
namespace NHibernate.DomainModel.Northwind.Entities
{
public class Role
{
Expand Down
4 changes: 0 additions & 4 deletions src/NHibernate.DomainModel/Northwind/Entities/User.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ public User(string name, DateTime registeredAt)
}
}





public enum EnumStoredAsString { Unspecified, Small, Medium, Large }

public enum EnumStoredAsInt32 { Unspecified, High, Low }
Expand Down
Loading