Obsolete StringHelper.Join

bahusoid · bahusoid · commit 5417dbc34cfb · 2019-03-28T11:42:54.000+02:00
diff --git a/src/NHibernate/Criterion/ConditionalProjection.cs b/src/NHibernate/Criterion/ConditionalProjection.cs
@@ -73,8 +73,8 @@ public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuer
 			if(areEqual == false)
 			{
 				string msg = "Both true and false projections must return the same types."+ Environment.NewLine +
-				             "But True projection returns: ["+StringHelper.Join(", ", trueTypes) +"] "+ Environment.NewLine+
-				             "And False projection returns: ["+StringHelper.Join(", ", falseTypes)+ "]";
+				             "But True projection returns: ["+string.Join<IType>(", ", trueTypes) +"] "+ Environment.NewLine+
+				             "And False projection returns: ["+string.Join<IType>(", ", falseTypes)+ "]";
 
 				throw new HibernateException(msg);
 			}
diff --git a/src/NHibernate/Criterion/IdentifierProjection.cs b/src/NHibernate/Criterion/IdentifierProjection.cs
@@ -64,7 +64,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr
 			{
 				throw new InvalidOperationException("not a grouping projection");
 			}
-			return new SqlString(StringHelper.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));
+			return new SqlString(string.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));
 		}
 	}
 }
diff --git a/src/NHibernate/Criterion/Junction.cs b/src/NHibernate/Criterion/Junction.cs
@@ -106,7 +106,7 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri
 
 		public override string ToString()
 		{
-			return '(' + StringHelper.Join(Op, criteria) + ')';
+			return '(' + string.Join(Op, criteria) + ')';
 		}
 
 		public override IProjection[] GetProjections()
diff --git a/src/NHibernate/Criterion/PropertyProjection.cs b/src/NHibernate/Criterion/PropertyProjection.cs
@@ -72,7 +72,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr
 			{
 				throw new InvalidOperationException("not a grouping projection");
 			}
-			return new SqlString(StringHelper.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));
+			return new SqlString(string.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Dialect/InformixDialect.cs b/src/NHibernate/Dialect/InformixDialect.cs
@@ -441,14 +441,14 @@ public override string GetAddForeignKeyConstraintString(string constraintName, s
 			var res = new StringBuilder(200);
 
 			res.Append(" add constraint foreign key (")
-				.Append(StringHelper.Join(StringHelper.CommaSpace, foreignKey))
+				.Append(string.Join(StringHelper.CommaSpace, foreignKey))
 				.Append(") references ")
 				.Append(referencedTable);
 
 			if (!referencesPrimaryKey)
 			{
 				res.Append(" (")
-					.Append(StringHelper.Join(StringHelper.CommaSpace, primaryKey))
+					.Append(string.Join(StringHelper.CommaSpace, primaryKey))
 					.Append(')');
 			}
 
diff --git a/src/NHibernate/Dialect/MsSql2000Dialect.cs b/src/NHibernate/Dialect/MsSql2000Dialect.cs
@@ -788,7 +788,7 @@ public LockHintAppender(MsSql2000Dialect dialect, IDictionary<string, LockMode>
 
 				// Regex matching any alias out of those given. Aliases should contain
 				// no dangerous characters (they are identifiers) so they are not escaped.
-				var aliasesPattern = StringHelper.Join("|", aliasedLockModes.Keys);
+				var aliasesPattern = string.Join("|", aliasedLockModes.Keys);
 
 				// Match < alias >, < alias,>, or < alias$>, the intent is to capture alias names
 				// in various kinds of "FROM table1 alias1, table2 alias2".
diff --git a/src/NHibernate/Dialect/Oracle8iDialect.cs b/src/NHibernate/Dialect/Oracle8iDialect.cs
@@ -389,7 +389,7 @@ private static string ExtractColumnOrAliasNames(SqlString select)
 			Dictionary<SqlString, SqlString> columnToAlias;
 			ExtractColumnOrAliasNames(select, out columnsOrAliases, out aliasToColumn, out columnToAlias);
 
-			return StringHelper.Join(",", columnsOrAliases);
+			return string.Join(",", columnsOrAliases);
 		}
 
 		/// <summary> 
diff --git a/src/NHibernate/Engine/SubselectFetch.cs b/src/NHibernate/Engine/SubselectFetch.cs
@@ -40,12 +40,12 @@ public SqlString ToSubselectString(string ukname)
 			                       	? StringHelper.Qualify(alias, loadable.IdentifierColumnNames)
 			                       	: ((IPropertyMapping) loadable).ToColumns(alias, ukname);
 
-			return new SqlString("select ", StringHelper.Join(", ", joinColumns), queryString);
+			return new SqlString("select ", string.Join(", ", joinColumns), queryString);
 		}
 
 		public override string ToString()
 		{
 			return "SubselectFetch(" + queryString + ')';
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs b/src/NHibernate/Hql/Ast/ANTLR/Exec/AbstractStatementExecutor.cs
@@ -143,7 +143,7 @@ private static SqlString GetWhereJoinFragment(IJoinable persister, string tableA
 
 		protected string GenerateIdSubselect(IQueryable persister)
 		{
-			return "select " + StringHelper.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;
+			return "select " + string.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;
 		}
 
 		protected virtual void CreateTemporaryTableIfNecessary(IQueryable persister, ISessionImplementor session)
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs b/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableDeleteExecutor.cs
@@ -51,7 +51,7 @@ public MultiTableDeleteExecutor(IStatement statement)
 				//          defining all the needed attributes), then we could then get an array of those
 				SqlDeleteBuilder delete = new SqlDeleteBuilder(Factory.Dialect, Factory)
 					.SetTableName(tableNames[i])
-					.SetWhere("(" + StringHelper.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");
+					.SetWhere("(" + string.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");
 				if (Factory.Settings.IsCommentsEnabled)
 				{
 					delete.SetComment("bulk delete");
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableUpdateExecutor.cs b/src/NHibernate/Hql/Ast/ANTLR/Exec/MultiTableUpdateExecutor.cs
@@ -54,7 +54,7 @@ public MultiTableUpdateExecutor(IStatement statement) : base(statement, log)
 				SqlUpdateBuilder update =
 					new SqlUpdateBuilder(Factory.Dialect, Factory).SetTableName(tableNames[tableIndex])
 					.SetWhere(
-						string.Format("({0}) IN ({1})", StringHelper.Join(", ", columnNames[tableIndex]), idSubselect));
+						string.Format("({0}) IN ({1})", string.Join(", ", columnNames[tableIndex]), idSubselect));
 
 				if (Factory.Settings.IsCommentsEnabled)
 				{
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/DotNode.cs
@@ -661,7 +661,7 @@ private void SetPropertyNameAndPath(IASTNode parent)
 		private void InitText()
 		{
 			string[] cols = GetColumns();
-			string text = StringHelper.Join(", ", cols);
+			string text = string.Join(", ", cols);
 			if (cols.Length > 1 && Walker.IsComparativeExpressionClause)
 			{
 				text = "(" + text + ")";
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/FromElement.cs
@@ -513,7 +513,7 @@ public virtual string GetIdentityColumn()
 			{
 				cols = GetPropertyMapping(propertyName).ToColumns(propertyName);
 			}
-			string result = StringHelper.Join(", ", cols);
+			string result = string.Join(", ", cols);
 
 			// There used to be code here that added parentheses if the number of columns was greater than one.
 			// This was causing invalid queries like select (c1, c2) from x.  I couldn't think of a reason that
diff --git a/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs b/src/NHibernate/Hql/Ast/ANTLR/Tree/IdentNode.cs
@@ -209,7 +209,7 @@ private int ResolveAsNakedPropertyRef()
 					? persister.ToColumns(fromElement.TableAlias, property)
 					: persister.ToColumns(property);
 
-			string text = StringHelper.Join(", ", columns);
+			string text = string.Join(", ", columns);
 			Text = columns.Length == 1 ? text : "(" + text + ")";
 			Type = HqlSqlWalker.SQL_TOKEN;
 
diff --git a/src/NHibernate/Hql/CollectionSubqueryFactory.cs b/src/NHibernate/Hql/CollectionSubqueryFactory.cs
@@ -19,7 +19,7 @@ public static string CreateCollectionSubquery(
 				JoinFragment join = joinSequence.ToJoinFragment(enabledFilters, true);
 				return new StringBuilder()
 					.Append("select ")
-					.Append(StringHelper.Join(", ", columns))
+					.Append(string.Join(", ", columns))
 					.Append(" from ")
 					.Append(join.ToFromFragmentString.Substring(2)) // remove initial ", "
 					.Append(" where ")
@@ -32,4 +32,4 @@ public static string CreateCollectionSubquery(
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Loader/Collection/CollectionJoinWalker.cs b/src/NHibernate/Loader/Collection/CollectionJoinWalker.cs
@@ -24,7 +24,7 @@ protected SqlStringBuilder WhereString(string alias, string[] columnNames, SqlSt
 			}
 			else
 			{
-				string columnsJoin = StringHelper.Join(StringHelper.CommaSpace, StringHelper.Qualify(alias, columnNames));
+				string columnsJoin = string.Join(StringHelper.CommaSpace, StringHelper.Qualify(alias, columnNames));
 
 				SqlStringBuilder buf = new SqlStringBuilder();
 				if (columnNames.Length > 1)
@@ -41,4 +41,4 @@ protected SqlStringBuilder WhereString(string alias, string[] columnNames, SqlSt
 			}
 		}
 	}
-}
+}
diff --git a/src/NHibernate/Loader/Custom/ColumnCollectionAliases.cs b/src/NHibernate/Loader/Custom/ColumnCollectionAliases.cs
@@ -83,14 +83,11 @@ public override string ToString()
 				+ "], suffixedElementAliases=[" + Join(elementAliases) + "], suffixedIdentifierAlias=[" + identifierAlias + "]]";
 		}
 
-		private static string Join(IEnumerable aliases)
+		private static string Join(string[] aliases)
 		{
-			if (aliases == null)
-			{
-				return null;
-			}
-
-			return StringHelper.Join(", ", aliases);
+			return aliases == null
+				? null
+				: string.Join(", ", aliases);
 		}
 
 		private string[] GetUserProvidedAliases(string propertyPath, string[] defaultAliases)
diff --git a/src/NHibernate/Loader/GeneratedCollectionAliases.cs b/src/NHibernate/Loader/GeneratedCollectionAliases.cs
@@ -110,7 +110,7 @@ private static string Join(IEnumerable<string> aliases)
 				return null;
 			}
 
-			return StringHelper.Join(", ", aliases);
+			return string.Join(", ", aliases);
 		}
 
 		private string[] GetUserProvidedAliases(string propertyPath, string[] defaultAliases)
diff --git a/src/NHibernate/Mapping/ForeignKey.cs b/src/NHibernate/Mapping/ForeignKey.cs
@@ -196,10 +196,10 @@ public override string ToString()
 				result.Append(GetType().FullName)
 					.Append('(')
 					.Append(Table.Name)
-					.Append(StringHelper.Join(", ", Columns))
+					.Append(string.Join(", ", Columns))
 					.Append(" ref-columns:")
 					.Append('(')
-					.Append(StringHelper.Join(", ", ReferencedColumns))
+					.Append(string.Join(", ", ReferencedColumns))
 					.Append(") as ")
 					.Append(Name);
 				return result.ToString();
diff --git a/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs b/src/NHibernate/Persister/Entity/AbstractEntityPersister.cs
@@ -1872,7 +1872,7 @@ protected virtual SqlString GenerateSnapshotSelectString()
 			}
 
 			string[] aliasedIdColumns = StringHelper.Qualify(RootAlias, IdentifierColumnNames);
-			string selectClause = StringHelper.Join(StringHelper.CommaSpace, aliasedIdColumns)
+			string selectClause = string.Join(StringHelper.CommaSpace, aliasedIdColumns)
 														+ ConcretePropertySelectFragment(RootAlias, PropertyUpdateability);
 
 			SqlString fromClause = new SqlString(
@@ -3840,7 +3840,7 @@ protected string CreateFrom(int tableNumber, String alias)
 		protected SqlString CreateWhereByKey(int tableNumber, string alias)
 		{
 			//TODO: move to .sql package, and refactor with similar things!
-			//return new SqlString(StringHelper.Join("= ? and ",
+			//return new SqlString(string.Join("= ? and ",
 			//        StringHelper.Qualify(alias, GetSubclassTableKeyColumns(tableNumber))) + "= ?");
 			string[] subclauses = StringHelper.Qualify(alias, GetSubclassTableKeyColumns(tableNumber));
 			SqlStringBuilder builder = new SqlStringBuilder(subclauses.Length * 4);
diff --git a/src/NHibernate/Util/StringHelper.cs b/src/NHibernate/Util/StringHelper.cs
@@ -43,6 +43,8 @@ public static class StringHelper
 
 		public const int AliasTruncateLength = 10;
 
+		//Since 5.3
+		[Obsolete("Please use string.Join instead")]
 		public static string Join(string separator, IEnumerable objects)
 		{
 			StringBuilder buf = new StringBuilder();
@@ -62,11 +64,6 @@ public static string Join(string separator, IEnumerable objects)
 			return buf.ToString();
 		}
 
-		internal static string Join<T>(string separator, IEnumerable<T> objects)
-		{
-			return string.Join(separator, objects);
-		}
-
 		/// <summary>
 		/// 
 		/// </summary>

Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ public override IType[] GetTypes(ICriteria criteria, ICriteriaQuery criteriaQuer`
`73`	`73`	`if(areEqual == false)`
`74`	`74`	`{`
`75`	`75`	`string msg = "Both true and false projections must return the same types."+ Environment.NewLine +`
`76`		`- "But True projection returns: ["+StringHelper.Join(", ", trueTypes) +"] "+ Environment.NewLine+`
`77`		`- "And False projection returns: ["+StringHelper.Join(", ", falseTypes)+ "]";`
	`76`	`+ "But True projection returns: ["+string.Join<IType>(", ", trueTypes) +"] "+ Environment.NewLine+`
	`77`	`+ "And False projection returns: ["+string.Join<IType>(", ", falseTypes)+ "]";`
`78`	`78`
`79`	`79`	`throw new HibernateException(msg);`
`80`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr`
`64`	`64`	`{`
`65`	`65`	`throw new InvalidOperationException("not a grouping projection");`
`66`	`66`	`}`
`67`		`- return new SqlString(StringHelper.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));`
	`67`	`+ return new SqlString(string.Join(",", criteriaQuery.GetIdentifierColumns(criteria)));`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri`
`106`	`106`
`107`	`107`	`public override string ToString()`
`108`	`108`	`{`
`109`		`- return '(' + StringHelper.Join(Op, criteria) + ')';`
	`109`	`+ return '(' + string.Join(Op, criteria) + ')';`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`public override IProjection[] GetProjections()`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public override SqlString ToGroupSqlString(ICriteria criteria, ICriteriaQuery cr`
`72`	`72`	`{`
`73`	`73`	`throw new InvalidOperationException("not a grouping projection");`
`74`	`74`	`}`
`75`		`- return new SqlString(StringHelper.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));`
	`75`	`+ return new SqlString(string.Join(",", criteriaQuery.GetColumns(criteria, propertyName)));`
`76`	`76`	`}`
`77`	`77`	`}`
`78`		`-}`
	`78`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -441,14 +441,14 @@ public override string GetAddForeignKeyConstraintString(string constraintName, s`
`441`	`441`	`var res = new StringBuilder(200);`
`442`	`442`
`443`	`443`	`res.Append(" add constraint foreign key (")`
`444`		`- .Append(StringHelper.Join(StringHelper.CommaSpace, foreignKey))`
	`444`	`+ .Append(string.Join(StringHelper.CommaSpace, foreignKey))`
`445`	`445`	`.Append(") references ")`
`446`	`446`	`.Append(referencedTable);`
`447`	`447`
`448`	`448`	`if (!referencesPrimaryKey)`
`449`	`449`	`{`
`450`	`450`	`res.Append(" (")`
`451`		`- .Append(StringHelper.Join(StringHelper.CommaSpace, primaryKey))`
	`451`	`+ .Append(string.Join(StringHelper.CommaSpace, primaryKey))`
`452`	`452`	`.Append(')');`
`453`	`453`	`}`
`454`	`454`
Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ private static string ExtractColumnOrAliasNames(SqlString select)`
`389`	`389`	`Dictionary<SqlString, SqlString> columnToAlias;`
`390`	`390`	`ExtractColumnOrAliasNames(select, out columnsOrAliases, out aliasToColumn, out columnToAlias);`
`391`	`391`
`392`		`- return StringHelper.Join(",", columnsOrAliases);`
	`392`	`+ return string.Join(",", columnsOrAliases);`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -40,12 +40,12 @@ public SqlString ToSubselectString(string ukname)`
`40`	`40`	`? StringHelper.Qualify(alias, loadable.IdentifierColumnNames)`
`41`	`41`	`: ((IPropertyMapping) loadable).ToColumns(alias, ukname);`
`42`	`42`
`43`		`- return new SqlString("select ", StringHelper.Join(", ", joinColumns), queryString);`
	`43`	`+ return new SqlString("select ", string.Join(", ", joinColumns), queryString);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`public override string ToString()`
`47`	`47`	`{`
`48`	`48`	`return "SubselectFetch(" + queryString + ')';`
`49`	`49`	`}`
`50`	`50`	`}`
`51`		`-}`
	`51`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private static SqlString GetWhereJoinFragment(IJoinable persister, string tableA`
`143`	`143`
`144`	`144`	`protected string GenerateIdSubselect(IQueryable persister)`
`145`	`145`	`{`
`146`		`- return "select " + StringHelper.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;`
	`146`	`+ return "select " + string.Join(", ", persister.IdentifierColumnNames) + " from " + persister.TemporaryIdTableName;`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`protected virtual void CreateTemporaryTableIfNecessary(IQueryable persister, ISessionImplementor session)`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public MultiTableDeleteExecutor(IStatement statement)`
`51`	`51`	`// defining all the needed attributes), then we could then get an array of those`
`52`	`52`	`SqlDeleteBuilder delete = new SqlDeleteBuilder(Factory.Dialect, Factory)`
`53`	`53`	`.SetTableName(tableNames[i])`
`54`		`- .SetWhere("(" + StringHelper.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");`
	`54`	`+ .SetWhere("(" + string.Join(", ", columnNames[i]) + ") IN (" + idSubselect + ")");`
`55`	`55`	`if (Factory.Settings.IsCommentsEnabled)`
`56`	`56`	`{`
`57`	`57`	`delete.SetComment("bulk delete");`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public MultiTableUpdateExecutor(IStatement statement) : base(statement, log)`
`54`	`54`	`SqlUpdateBuilder update =`
`55`	`55`	`new SqlUpdateBuilder(Factory.Dialect, Factory).SetTableName(tableNames[tableIndex])`
`56`	`56`	`.SetWhere(`
`57`		`- string.Format("({0}) IN ({1})", StringHelper.Join(", ", columnNames[tableIndex]), idSubselect));`
	`57`	`+ string.Format("({0}) IN ({1})", string.Join(", ", columnNames[tableIndex]), idSubselect));`
`58`	`58`
`59`	`59`	`if (Factory.Settings.IsCommentsEnabled)`
`60`	`60`	`{`