yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes old 'Application' and renames to LegacySqlHelper

Browse Source
This commit is contained in:
Shannon
2016-03-17 10:39:39 +01:00
parent 24fed0de2e
commit 4c9f4beaf9
19 changed files with 85 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/create.aspx.cs
View File

@@ -31,7 +31,7 @@ namespace umbraco.dialogs
{
_app = Request.CleanForXss("app");
//validate the app
if (BusinessLogic.Application.getAll().Any(x => x.alias.InvariantEquals(_app)) == false)
if (Services.SectionService.GetSections().Any(x => x.Alias.InvariantEquals(_app)) == false)
{
throw new InvalidOperationException("A requested app: " + Request.GetItemAsString("app") + " was not found");
}

174
src/umbraco.businesslogic/Application.cs
View File

@@ -1,174 +0,0 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using umbraco.DataLayer;
namespace umbraco.BusinessLogic
{
/// <summary>
/// Class for handling all registered applications in Umbraco.
/// </summary>
[Obsolete("Use ApplicationContext.Current.Services.SectionService and/or Umbraco.Core.Sections.SectionCollection instead")]
public class Application
{
private static ISqlHelper _sqlHelper;
/// <summary>
/// Gets the SQL helper.
/// </summary>
/// <value>The SQL helper.</value>
[Obsolete("Do not use SqlHelper anymore, if database querying needs to be done use the DatabaseContext instead")]
public static ISqlHelper SqlHelper
{
get
{
if (_sqlHelper == null)
{
var connectionString = string.Empty;
try
{
const string umbracoDsn = Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName;
var databaseSettings = ConfigurationManager.ConnectionStrings[umbracoDsn];
if (databaseSettings != null)
connectionString = databaseSettings.ConnectionString;
// During upgrades we might still have the old appSettings connectionstring, and not the new one, so get that one instead
if (string.IsNullOrWhiteSpace(connectionString) &&
ConfigurationManager.AppSettings.ContainsKey(umbracoDsn))
connectionString = ConfigurationManager.AppSettings[umbracoDsn];
_sqlHelper = DataLayerHelper.CreateSqlHelper(connectionString, false);
}
catch(Exception ex)
{
LogHelper.Error<Application>(string.Format("Can't instantiate SQLHelper with connectionstring \"{0}\"", connectionString), ex);
}
}
return _sqlHelper;
}
}
/// <summary>
/// Initializes a new instance of the <see cref="Application"/> class.
/// </summary>
public Application()
{ }
/// <summary>
/// Initializes a new instance of the <see cref="Application"/> class.
/// </summary>
/// <param name="name">The application name.</param>
/// <param name="alias">The application alias.</param>
/// <param name="icon">The application icon.</param>
public Application(string name, string alias, string icon)
: this(name, alias, icon, 0)
{ }
/// <summary>
/// Initializes a new instance of the <see cref="Application"/> class.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="alias">The alias.</param>
/// <param name="icon">The icon.</param>
/// <param name="sortOrder">The sort order.</param>
public Application(string name, string alias, string icon, int sortOrder)
{
this.name = name;
this.alias = alias;
this.icon = icon;
this.sortOrder = sortOrder;
}
/// <summary>
/// Gets or sets the application name.
/// </summary>
/// <value>The name.</value>
public string name { get; set; }
/// <summary>
/// Gets or sets the application alias.
/// </summary>
/// <value>The alias.</value>
public string alias { get; set; }
/// <summary>
/// Gets or sets the application icon.
/// </summary>
/// <value>The application icon.</value>
public string icon { get; set; }
/// <summary>
/// Gets or sets the sort order.
/// </summary>
/// <value>
/// The sort order.
/// </value>
public int sortOrder { get; set; }
/// <summary>
/// Creates a new applcation if no application with the specified alias is found.
/// </summary>
/// <param name="name">The application name.</param>
/// <param name="alias">The application alias.</param>
/// <param name="icon">The application icon, which has to be located in umbraco/images/tray folder.</param>
public static void MakeNew(string name, string alias, string icon)
{
ApplicationContext.Current.Services.SectionService.MakeNew(name, alias, icon);
}
/// <summary>
/// Makes the new.
/// </summary>
/// <param name="name">The name.</param>
/// <param name="alias">The alias.</param>
/// <param name="icon">The icon.</param>
/// <param name="sortOrder">The sort order.</param>
public static void MakeNew(string name, string alias, string icon, int sortOrder)
{
ApplicationContext.Current.Services.SectionService.MakeNew(name, alias, icon, sortOrder);
}
/// <summary>
/// Gets the application by its alias.
/// </summary>
/// <param name="appAlias">The application alias.</param>
/// <returns></returns>
public static Application getByAlias(string appAlias)
{
return Mapper.Map<Section, Application>(
ApplicationContext.Current.Services.SectionService.GetByAlias(appAlias));
}
/// <summary>
/// Deletes this instance.
/// </summary>
public void Delete()
{
ApplicationContext.Current.Services.SectionService.DeleteSection(Mapper.Map<Application, Section>(this));
}
/// <summary>
/// Gets all applications registered in umbraco from the umbracoApp table..
/// </summary>
/// <returns>Returns a Application Array</returns>
public static List<Application> getAll()
{
return ApplicationContext.Current.Services.SectionService.GetSections().Select(Mapper.Map<Section, Application>).ToList();
}
}
}

61
src/umbraco.businesslogic/LegacySqlHelper.cs Normal file
View File

@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using AutoMapper;
using Umbraco.Core;
using Umbraco.Core.Logging;
using Umbraco.Core.Models;
using umbraco.DataLayer;
namespace umbraco.BusinessLogic
{
/// <summary>
/// Class for handling all registered applications in Umbraco.
/// </summary>
[Obsolete("Use ApplicationContext.Current.Services.SectionService and/or Umbraco.Core.Sections.SectionCollection instead")]
public class LegacySqlHelper
{
private static ISqlHelper _sqlHelper;
/// <summary>
/// Gets the SQL helper.
/// </summary>
/// <value>The SQL helper.</value>
[Obsolete("Do not use SqlHelper anymore, if database querying needs to be done use the DatabaseContext instead")]
public static ISqlHelper SqlHelper
{
get
{
if (_sqlHelper == null)
{
var connectionString = string.Empty;
try
{
const string umbracoDsn = Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName;
var databaseSettings = ConfigurationManager.ConnectionStrings[umbracoDsn];
if (databaseSettings != null)
connectionString = databaseSettings.ConnectionString;
// During upgrades we might still have the old appSettings connectionstring, and not the new one, so get that one instead
if (string.IsNullOrWhiteSpace(connectionString) &&
ConfigurationManager.AppSettings.ContainsKey(umbracoDsn))
connectionString = ConfigurationManager.AppSettings[umbracoDsn];
_sqlHelper = DataLayerHelper.CreateSqlHelper(connectionString, false);
}
catch(Exception ex)
{
LogHelper.Error<LegacySqlHelper>(string.Format("Can't instantiate SQLHelper with connectionstring \"{0}\"", connectionString), ex);
}
}
return _sqlHelper;
}
}
}
}

2
src/umbraco.businesslogic/umbraco.businesslogic.csproj
View File

@@ -182,7 +182,7 @@
<Compile Include="..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
<Compile Include="Application.cs">
<Compile Include="LegacySqlHelper.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

2
src/umbraco.cms/businesslogic/CMSNode.cs
View File

@@ -344,7 +344,7 @@ namespace umbraco.cms.businesslogic
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
internal static UmbracoDatabase Database

2
src/umbraco.cms/businesslogic/Dictionary.cs
View File

@@ -26,7 +26,7 @@ namespace umbraco.cms.businesslogic
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database")]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
/// <summary>

2
src/umbraco.cms/businesslogic/Packager/Package.cs
View File

@@ -11,7 +11,7 @@ namespace umbraco.cms.businesslogic.packager
{
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
public Package()

11
src/umbraco.cms/businesslogic/Packager/PackageActions/addApplication.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Xml;
using Umbraco.Core;
namespace umbraco.cms.businesslogic.packager.standardPackageActions
{
@@ -27,15 +28,19 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions
string alias = xmlData.Attributes["appAlias"].Value;
string icon = xmlData.Attributes["appIcon"].Value;
BusinessLogic.Application.MakeNew(name, alias, icon);
ApplicationContext.Current.Services.SectionService.MakeNew(name, alias, icon);
return true;
}
public bool Undo(string packageName, XmlNode xmlData)
{
string alias = xmlData.Attributes["appAlias"].Value;
BusinessLogic.Application.getByAlias(alias).Delete();
var section = ApplicationContext.Current.Services.SectionService.GetByAlias(alias);
if (section != null)
{
ApplicationContext.Current.Services.SectionService.DeleteSection(section);
}
return true;
}
/// <summary>

2
src/umbraco.cms/businesslogic/language/Item.cs
View File

@@ -28,7 +28,7 @@ namespace umbraco.cms.businesslogic.language
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
/// <summary>

2
src/umbraco.cms/businesslogic/language/Language.cs
View File

@@ -42,7 +42,7 @@ namespace umbraco.cms.businesslogic.language
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}

2
src/umbraco.cms/businesslogic/macro/Macro.cs
View File

@@ -37,7 +37,7 @@ namespace umbraco.cms.businesslogic.macro
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
/// <summary>

2
src/umbraco.cms/businesslogic/macro/MacroProperty.cs
View File

@@ -24,7 +24,7 @@ namespace umbraco.cms.businesslogic.macro
{
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
/// <summary>

2
src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
View File

@@ -15,7 +15,7 @@ namespace umbraco.cms.businesslogic.macro
{
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
public static List<MacroPropertyType> GetAll

2
src/umbraco.cms/businesslogic/propertytype/PropertyTypeGroup.cs
View File

@@ -149,7 +149,7 @@ namespace umbraco.cms.businesslogic.propertytype
/// <value>The SQL helper.</value>
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
}
}

2
src/umbraco.cms/businesslogic/propertytype/propertytype.cs
View File

@@ -39,7 +39,7 @@ namespace umbraco.cms.businesslogic.propertytype
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
#region Constructors

2
src/umbraco.cms/businesslogic/relation/Relation.cs
View File

@@ -38,7 +38,7 @@ namespace umbraco.cms.businesslogic.relation
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
public CMSNode Parent

2
src/umbraco.cms/businesslogic/task/Task.cs
View File

@@ -136,7 +136,7 @@ namespace umbraco.cms.businesslogic.task
/// <value>The SQL helper.</value>
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
#endregion

2
src/umbraco.cms/businesslogic/task/TaskType.cs
View File

@@ -53,7 +53,7 @@ namespace umbraco.cms.businesslogic.task
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
private Tasks _tasks;

2
src/umbraco.cms/businesslogic/workflow/Notification.cs
View File

@@ -46,7 +46,7 @@ namespace umbraco.cms.businesslogic.workflow
[Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
protected static ISqlHelper SqlHelper
{
get { return Application.SqlHelper; }
get { return LegacySqlHelper.SqlHelper; }
}
/// <summary>