Changeset 4

(2009/12/17 21:25) About 2 years ago

Abandonada la DI por innecesaria. Ahora se puede cambiar dinamicamente el provider.

Affected files

src/FmwkPoiesis.ObjectSearch.Test/CastleNHAppInitializer.cs

Show contents

src/FmwkPoiesis.ObjectSearch.Test/FmwkPoiesis.ObjectSearch.Test.csproj Download diff

	3		4
31	<WarningLevel>4</WarningLevel>	31	<WarningLevel>4</WarningLevel>
32	</PropertyGroup>	32	</PropertyGroup>
33	<ItemGroup>	33	<ItemGroup>
		34	<Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
		35	<SpecificVersion>False</SpecificVersion>
		36	<HintPath>..\..\lib\Castle\Castle.Core.dll</HintPath>
		37	</Reference>
		38	<Reference Include="Castle.DynamicProxy2, Version=2.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
		39	<SpecificVersion>False</SpecificVersion>
		40	<HintPath>..\..\lib\Castle\Castle.DynamicProxy2.dll</HintPath>
		41	</Reference>
		42	<Reference Include="Castle.MicroKernel, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
		43	<SpecificVersion>False</SpecificVersion>
		44	<HintPath>..\..\lib\Castle\Castle.MicroKernel.dll</HintPath>
		45	</Reference>
		46	<Reference Include="Castle.Windsor, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
		47	<SpecificVersion>False</SpecificVersion>
		48	<HintPath>..\..\lib\Castle\Castle.Windsor.dll</HintPath>
		49	</Reference>
		50	<Reference Include="CommonServiceLocator.WindsorAdapter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
		51	<SpecificVersion>False</SpecificVersion>
		52	<HintPath>..\..\lib\CommonServiceLocator.WindsorAdapter.dll</HintPath>
		53	</Reference>
		54	<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
		55	<SpecificVersion>False</SpecificVersion>
		56	<HintPath>..\..\lib\Microsoft.Practices.ServiceLocation.dll</HintPath>
		57	</Reference>
34	<Reference Include="nunit.core, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">	58	<Reference Include="nunit.core, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
35	<SpecificVersion>False</SpecificVersion>	59	<SpecificVersion>False</SpecificVersion>
36	<HintPath>..\..\tools\NUnit\nunit.core.dll</HintPath>	60	<HintPath>..\..\tools\NUnit\nunit.core.dll</HintPath>
...		...
53	<Reference Include="System.Xml" />	77	<Reference Include="System.Xml" />
54	</ItemGroup>	78	</ItemGroup>
55	<ItemGroup>	79	<ItemGroup>
		80	<Compile Include="CastleNHAppInitializer.cs" />
56	<Compile Include="GeneralTest.cs" />	81	<Compile Include="GeneralTest.cs" />
		82	<Compile Include="IAppInitializer.cs" />
57	<Compile Include="Model\Persona.cs" />	83	<Compile Include="Model\Persona.cs" />
58	<Compile Include="SearchPersona.cs" />	84	<Compile Include="SearchPersona.cs" />
59	<Compile Include="Properties\AssemblyInfo.cs" />	85	<Compile Include="Properties\AssemblyInfo.cs" />
60	</ItemGroup>	86	</ItemGroup>
61	<ItemGroup>	87	<ItemGroup>
		88	<ProjectReference Include="..\FmwkPoiesis.ObjectSearchProvider.Hql\FmwkPoiesis.ObjectSearchProvider.Hql.csproj">
		89	<Project>{8D83E74C-4D68-46EE-8480-DC332518AC03}</Project>
		90	<Name>FmwkPoiesis.ObjectSearchProvider.Hql</Name>
		91	</ProjectReference>
		92	<ProjectReference Include="..\FmwkPoiesis.ObjectSearchProvider.Linq\FmwkPoiesis.ObjectSearchProvider.Linq.csproj">
		93	<Project>{BA53F5A9-B32D-4BF5-89E7-7094CB9ED247}</Project>
		94	<Name>FmwkPoiesis.ObjectSearchProvider.Linq</Name>
		95	</ProjectReference>
62	<ProjectReference Include="..\FmwkPoiesis.ObjectSearch\FmwkPoiesis.ObjectSearch.csproj">	96	<ProjectReference Include="..\FmwkPoiesis.ObjectSearch\FmwkPoiesis.ObjectSearch.csproj">
63	<Project>{8BBCB623-8D5C-4EA7-9678-A79D011F4990}</Project>	97	<Project>{8BBCB623-8D5C-4EA7-9678-A79D011F4990}</Project>
64	<Name>FmwkPoiesis.ObjectSearch</Name>	98	<Name>FmwkPoiesis.ObjectSearch</Name>

src/FmwkPoiesis.ObjectSearch.Test/GeneralTest.cs Download diff

 using System;
-using System.Collections.Generic;
+using FmwkPoiesis.ObjectSearchProvider.Hql;
-using System.Linq;
+using FmwkPoiesis.ObjectSearchProvider.Linq;
-using System.Text;
+using Microsoft.Practices.ServiceLocation;
 using NUnit.Framework;
 using MDS.Simpatia.Model.ObjectSearch;
+using Poiesis.FrameWork.ObjectSearch;
+using Ushuaia.WebUI;
 namespace FmwkPoiesis.ObjectSearch.Test
 {
 	{
 		SearchPersona sp;
+		private static IAppInitializer initializer;
 		[TestFixtureSetUp]
 		public void Setup()
 		{
+			//initializer = new CastleNHAppInitializer();
+			//initializer.Startup();
+			//Poiesis.FrameWork.ObjectSearch.ObjectSearch.DefaultProvider = ServiceLocator.Current.GetInstance<IObjectSearchProvider>();
+			Poiesis.FrameWork.ObjectSearch.ObjectSearch.DefaultProvider = new LinqObjectSearchProvider();
 			sp = new SearchPersona();
 			sp.Apellido.ValueToCompare = "Borges";
 			sp.Nombre.ValueToCompare = "Jorge Luis";
 		[Test]
 		public void TestBuildCommand()
 		{
-			string outPut = sp.BuildCommandSearch();
+			string outPut = "Generando para " + Poiesis.FrameWork.ObjectSearch.ObjectSearch.DefaultProvider.Name;
 			Console.WriteLine(outPut);
+			outPut = sp.BuildCommandSearch();
+			Console.WriteLine(outPut);
+			var providerHql = new HqlObjectSearchProvider();
+			string outPut2 = "Generando para " + providerHql.Name ;
+			Console.WriteLine(outPut2);
+			outPut2 = sp.BuildCommandSearch();
+			Console.WriteLine(outPut2);
 		}
 	}
 }

src/FmwkPoiesis.ObjectSearch.Test/IAppInitializer.cs

Show contents

src/FmwkPoiesis.ObjectSearch/Equal.cs Download diff

	3		4
2	using System.Collections.Generic;	2	using System.Collections.Generic;
3	using System.Linq;	3	using System.Linq;
4	using System.Text;	4	using System.Text;
5	using Microsoft.Practices.ServiceLocation;	5	//using Microsoft.Practices.ServiceLocation;
6	using CommonServiceLocator.WindsorAdapter;	6	//using CommonServiceLocator.WindsorAdapter;
7		7
8	namespace Poiesis.FrameWork.ObjectSearch	8	namespace Poiesis.FrameWork.ObjectSearch
9	{	9	{
...		...
22	public T ValueToCompare { get; set; }	22	public T ValueToCompare { get; set; }
23		23
24	#region Miembros de IComparator	24	#region Miembros de IComparator
25	public string BuildCommandSearch(bool isLastElement)	25	public string BuildCommandSearch(IObjectSearchProvider provider, bool isLastElement)
26	{	26	{
27	return ObjectSearch.Provider.BuildCommandEqual<T>(this, isLastElement);	27	return provider.BuildCommandEqual<T>(this, isLastElement);
28	}	28	}
29	#endregion	29	#endregion
30	}	30	}

src/FmwkPoiesis.ObjectSearch/FmwkPoiesis.ObjectSearch.csproj Download diff

	3		4
31	<WarningLevel>4</WarningLevel>	31	<WarningLevel>4</WarningLevel>
32	</PropertyGroup>	32	</PropertyGroup>
33	<ItemGroup>	33	<ItemGroup>
34	<Reference Include="CommonServiceLocator.WindsorAdapter, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
35	<SpecificVersion>False</SpecificVersion>
36	<HintPath>..\..\lib\CommonServiceLocator.WindsorAdapter.dll</HintPath>
37	</Reference>
38	<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
39	<SpecificVersion>False</SpecificVersion>
40	<HintPath>..\..\lib\Microsoft.Practices.ServiceLocation.dll</HintPath>
41	</Reference>
42	<Reference Include="System" />	34	<Reference Include="System" />
43	<Reference Include="System.Core">	35	<Reference Include="System.Core">
44	<RequiredTargetFramework>3.5</RequiredTargetFramework>	36	<RequiredTargetFramework>3.5</RequiredTargetFramework>

src/FmwkPoiesis.ObjectSearch/IComparator.cs Download diff

	3		4
8	public interface IComparator	8	public interface IComparator
9	{	9	{
10	string NameProperty { get; }	10	string NameProperty { get; }
11	string BuildCommandSearch(bool isLastElement);	11	string BuildCommandSearch(IObjectSearchProvider provider, bool isLastElement);
12	bool And { get; set; }	12	bool And { get; set; }
13	}	13	}
14		14

src/FmwkPoiesis.ObjectSearch/IObjectSearchProvider.cs Download diff

 {
 	public interface IObjectSearchProvider
 	{
+		string Name { get; }
 		string BuildCommandEqual<T>(Equal<T> comparator, bool isLast) where T : IComparable;
+		string BuildCommandRange<T>(Range<T> comparator, bool isLast) where T : IComparable;
 	}
 }

src/FmwkPoiesis.ObjectSearch/ObjectSearch.cs Download diff

 using System.Linq;
 using System.Text;
 using System.Reflection;
-using CommonServiceLocator.WindsorAdapter;
+//using CommonServiceLocator.WindsorAdapter;
-using Microsoft.Practices.ServiceLocation;
+//using Microsoft.Practices.ServiceLocation;
 namespace Poiesis.FrameWork.ObjectSearch
 	public class ObjectSearch : IObjectSearch
 	{
-		public static IObjectSearchProvider Provider = ServiceLocator.SetLocatorProvider(new WindsorServiceLocator());
+		public static IObjectSearchProvider DefaultProvider { get; set;}
 	}
 	abstract public class ObjectSearch<T> : ObjectSearch
 		public IObjectSearchProvider GetProvider()
 		{
-			return ObjectSearch.Provider;
+			return ObjectSearch.DefaultProvider;
 		}
 		private List<IComparator> FindComparators()
 			return this.Comparators;
 		}
 		public string BuildCommandSearch()
 		{
+			return BuildCommandSearch(ObjectSearch.DefaultProvider );
+		}
+		public string BuildCommandSearch(IObjectSearchProvider provider)
+		{
 			this.Comparators = FindComparators();
 			int count = this.Comparators.Count;
 				StringBuilder sb = new StringBuilder();
 				for (int i = 0; i < count; i++)
 				{
-					sb.Append(Comparators[i].BuildCommandSearch(i == (count - 1)));
+					sb.Append(Comparators[i].BuildCommandSearch( provider, i == (count - 1)));
 				}
 				return sb.ToString();
 			}

src/FmwkPoiesis.ObjectSearch/Range.cs Download diff

 		public T MaxValue { get; set; }
 		#region Miembros de IComparator
-		public string BuildCommandSearch(bool isLastElement)
+		public string BuildCommandSearch(IObjectSearchProvider provider,   bool isLastElement)
 		{
-			string command = String.Format("({0} >= {1} and {0} <= {2})",
+			return provider.BuildCommandRange(this, isLastElement);
-											this.NameProperty, this.MinValue.ToString(), this.MaxValue.ToString());
-			if (isLastElement)
-				return command;
-			if (this.And)
-				return command + " and ";
-			else
-				return command + " or ";
 		}
 		#endregion
 	}

src/FmwkPoiesis.ObjectSearchProvider.Hql/HqlObjectSearchProvider.cs Download diff

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Poiesis.FrameWork.ObjectSearch;
 namespace FmwkPoiesis.ObjectSearchProvider.Hql
 {
 	public class HqlObjectSearchProvider : IObjectSearchProvider
 	{
-		public string BuildCommandEqual<T>(Equal<T> comparator,  bool isLast) where T : IComparable
+		public string Name
 		{
-			string command = String.Format("({0} = {1})",	comparator.NameProperty, comparator.ValueToCompare.ToString());
+			get { return "HQLProvider"; }
+		}
+		public string BuildCommandEqual<T>(Equal<T> comparator, bool isLast) where T : IComparable
+		{
+			string command = String.Format("({0} = {1})", comparator.NameProperty, comparator.ValueToCompare.ToString());
 			if (isLast)
 				return command;
 			else
 				return command + " or ";
 		}
+		public string BuildCommandRange<T>(Range<T> comparator, bool isLast) where T : IComparable
+		{
+			string command = String.Format("({0} >= {1} and {0} <= {2})", comparator.NameProperty, comparator.MinValue.ToString(),
comparator.MaxValue.ToString());
+			if (isLast)
+				return command;
+			if (comparator.And)
+				return command + " and ";
+			else
+				return command + " or ";
+		}
 	}
 }

src/FmwkPoiesis.ObjectSearchProvider.Linq/LinqObjectSearchProvider.cs Download diff

 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using Poiesis.FrameWork.ObjectSearch;
 namespace FmwkPoiesis.ObjectSearchProvider.Linq
 {
 	public class LinqObjectSearchProvider : IObjectSearchProvider
 	{
+		public string Name
+		{
+			get { return "LinqProvider"; }
+		}
 		public string BuildCommandEqual<T>(Equal<T> comparator, bool isLast) where T : IComparable
 		{
-			string command = String.Format("({0} = {1})", comparator.NameProperty, comparator.ValueToCompare.ToString());
+			string command = String.Format("|{0} = {1}|", comparator.NameProperty, comparator.ValueToCompare.ToString());
-			if ( isLast)
+			if (isLast)
 				return command;
 			if (comparator.And)
 			else
 				return command + " or ";
 		}
+		public string BuildCommandRange<T>(Range<T> comparator, bool isLast) where T : IComparable
+		{
+			string command = String.Format("|{0} >= {1} and {0} <= {2}|", comparator.NameProperty, comparator.MinValue.ToString(),
comparator.MaxValue.ToString() );
+			if (isLast)
+				return command;
+			if (comparator.And)
+				return command + " and ";
+			else
+				return command + " or ";
+		}
 	}
 }