Make exception classes public

rafidzal · rafidzal · commit f74ca278c497 · 2016-05-19T17:05:25.000+08:00
Minor code changes. Make exception classes public as they are exposed in
the IService interface for use.
diff --git a/Code/Sif3Framework/Sif.Framework/Controllers/SifController.cs b/Code/Sif3Framework/Sif.Framework/Controllers/SifController.cs
@@ -17,6 +17,7 @@
 using Sif.Framework.Model.Persistence;
 using Sif.Framework.Service;
 using Sif.Framework.Service.Authentication;
+using Sif.Framework.Service.Infrastructure;
 using System;
 using System.Collections.Generic;
 using System.Net;
@@ -45,7 +46,7 @@ public abstract class SifController<UI, DB> : ApiController
         public SifController(ISifService<UI, DB> service)
         {
             this.service = service;
-            authService = new DirectAuthenticationService();
+            authService = new DirectAuthenticationService(new ApplicationRegisterService(), new EnvironmentService());
         }
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/AlreadyExistsException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/AlreadyExistsException.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2015 Systemic Pty Ltd
+ * Copyright 2016 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents the situation where an item already exists.
     /// </summary>
     [Serializable]
-    class AlreadyExistsException : BaseException
+    public class AlreadyExistsException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/BaseException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/BaseException.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2015 Systemic Pty Ltd
+ * Copyright 2016 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This class represents the base class for customised exceptions.
     /// </summary>
     [Serializable]
-    class BaseException : Exception
+    public abstract class BaseException : Exception
     {
         private string exceptionReference;
 
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/ContentTooLargeException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/ContentTooLargeException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents the situation where the message content is too large.
     /// </summary>
     [Serializable]
-    class ContentTooLargeException : BaseException
+    public class ContentTooLargeException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/CreateException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/CreateException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents an error from a create request.
     /// </summary>
     [Serializable]
-    class CreateException : BaseException
+    public class CreateException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/DeleteException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/DeleteException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents an error from a delete request.
     /// </summary>
     [Serializable]
-    class DeleteException : BaseException
+    public class DeleteException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/NotFoundException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/NotFoundException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents the situation where an item cannot be found.
     /// </summary>
     [Serializable]
-    class NotFoundException : BaseException
+    public class NotFoundException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/QueryException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/QueryException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents an error from a query request.
     /// </summary>
     [Serializable]
-    class QueryException : BaseException
+    public class QueryException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/RejectedException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/RejectedException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents the situation where a requested action or operation is rejected.
     /// </summary>
     [Serializable]
-    class RejectedException : BaseException
+    public class RejectedException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Model/Exceptions/UpdateException.cs b/Code/Sif3Framework/Sif.Framework/Model/Exceptions/UpdateException.cs
@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions
     /// This exception represents an error from an update request.
     /// </summary>
     [Serializable]
-    class UpdateException : BaseException
+    public class UpdateException : BaseException
     {
 
         /// <summary>
diff --git a/Code/Sif3Framework/Sif.Framework/Providers/Provider.cs b/Code/Sif3Framework/Sif.Framework/Providers/Provider.cs
@@ -22,6 +22,7 @@
 using Sif.Framework.Model.Responses;
 using Sif.Framework.Service;
 using Sif.Framework.Service.Authentication;
+using Sif.Framework.Service.Infrastructure;
 using Sif.Framework.Service.Mapper;
 using Sif.Framework.Service.Providers;
 using Sif.Framework.Utils;
@@ -55,11 +56,11 @@ protected Provider()
 
             if (EnvironmentType.DIRECT.Equals(SettingsManager.ProviderSettings.EnvironmentType))
             {
-                authService = new DirectAuthenticationService();
+                authService = new DirectAuthenticationService(new ApplicationRegisterService(), new EnvironmentService());
             }
             else if (EnvironmentType.BROKERED.Equals(SettingsManager.ProviderSettings.EnvironmentType))
             {
-                authService = new BrokeredAuthenticationService();
+                authService = new BrokeredAuthenticationService(new ApplicationRegisterService(), new EnvironmentService());
             }
 
         }
diff --git a/Code/Sif3Framework/Sif.Framework/Service/Authentication/BrokeredAuthenticationService.cs b/Code/Sif3Framework/Sif.Framework/Service/Authentication/BrokeredAuthenticationService.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2015 Systemic Pty Ltd
+ * Copyright 2016 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,11 +31,15 @@ namespace Sif.Framework.Service.Authentication
     /// </summary>
     class BrokeredAuthenticationService : AuthenticationService
     {
+        private IApplicationRegisterService applicationRegisterService;
+        private IEnvironmentService environmentService;
         private IFrameworkSettings settings;
         private ISessionService sessionService;
 
-        public BrokeredAuthenticationService()
+        public BrokeredAuthenticationService(IApplicationRegisterService applicationRegisterService, IEnvironmentService environmentService)
         {
+            this.applicationRegisterService = applicationRegisterService;
+            this.environmentService = environmentService;
             settings = SettingsManager.ProviderSettings;
             sessionService = SessionsManager.ProviderSessionService;
         }
@@ -45,7 +49,7 @@ public BrokeredAuthenticationService()
         /// </summary>
         protected override string InitialSharedSecret(string applicationKey)
         {
-            ApplicationRegister applicationRegister = (new ApplicationRegisterService()).RetrieveByApplicationKey(applicationKey);
+            ApplicationRegister applicationRegister = applicationRegisterService.RetrieveByApplicationKey(applicationKey);
             return (applicationRegister == null ? null : applicationRegister.SharedSecret);
         }
 
@@ -54,14 +58,14 @@ protected override string InitialSharedSecret(string applicationKey)
         /// </summary>
         protected override string SharedSecret(string sessionToken)
         {
-            environmentType environment = (new EnvironmentService()).RetrieveBySessionToken(sessionToken);
+            environmentType environment = environmentService.RetrieveBySessionToken(sessionToken);
 
             if (environment == null)
             {
                 throw new InvalidSessionException();
             }
 
-            ApplicationRegister applicationRegister = (new ApplicationRegisterService()).RetrieveByApplicationKey(environment.applicationInfo.applicationKey);
+            ApplicationRegister applicationRegister = applicationRegisterService.RetrieveByApplicationKey(environment.applicationInfo.applicationKey);
             return (applicationRegister == null ? null : applicationRegister.SharedSecret);
         }
 
diff --git a/Code/Sif3Framework/Sif.Framework/Service/Authentication/DirectAuthenticationService.cs b/Code/Sif3Framework/Sif.Framework/Service/Authentication/DirectAuthenticationService.cs
@@ -1,5 +1,5 @@
 ﻿/*
- * Copyright 2015 Systemic Pty Ltd
+ * Copyright 2016 Systemic Pty Ltd
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,13 +27,21 @@ namespace Sif.Framework.Service.Authentication
     /// </summary>
     class DirectAuthenticationService : AuthenticationService
     {
+        private IApplicationRegisterService applicationRegisterService;
+        private IEnvironmentService environmentService;
+
+        public DirectAuthenticationService(IApplicationRegisterService applicationRegisterService, IEnvironmentService environmentService)
+        {
+            this.applicationRegisterService = applicationRegisterService;
+            this.environmentService = environmentService;
+        }
 
         /// <summary>
         /// <see cref="Sif.Framework.Service.Authentication.AuthenticationService.InitialSharedSecret(System.String)">InitialSharedSecret</see>
         /// </summary>
         protected override string InitialSharedSecret(string applicationKey)
         {
-            ApplicationRegister applicationRegister = (new ApplicationRegisterService()).RetrieveByApplicationKey(applicationKey);
+            ApplicationRegister applicationRegister = applicationRegisterService.RetrieveByApplicationKey(applicationKey);
             return (applicationRegister == null ? null : applicationRegister.SharedSecret);
         }
 
@@ -42,14 +50,14 @@ protected override string InitialSharedSecret(string applicationKey)
         /// </summary>
         protected override string SharedSecret(string sessionToken)
         {
-            environmentType environment = (new EnvironmentService()).RetrieveBySessionToken(sessionToken);
+            environmentType environment = environmentService.RetrieveBySessionToken(sessionToken);
 
             if (environment == null)
             {
                 throw new InvalidSessionException();
             }
 
-            ApplicationRegister applicationRegister = (new ApplicationRegisterService()).RetrieveByApplicationKey(environment.applicationInfo.applicationKey);
+            ApplicationRegister applicationRegister = applicationRegisterService.RetrieveByApplicationKey(environment.applicationInfo.applicationKey);
             return (applicationRegister == null ? null : applicationRegister.SharedSecret);
         }
 
diff --git a/Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj b/Code/Sif3Framework/Sif.Framework/Sif.Framework.csproj
@@ -82,11 +82,11 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Consumers\IBasicConsumer.cs" />
+    <Compile Include="Controllers\EnvironmentsController.cs" />
     <Compile Include="Model\DataModels\IPayloadSerialisable.cs" />
     <Compile Include="Consumers\BasicConsumer.cs" />
     <Compile Include="Consumers\Consumer.cs" />
     <Compile Include="Consumers\IConsumer.cs" />
-    <Compile Include="Controllers\EnvironmentsController.cs" />
     <Compile Include="Controllers\SifController.cs" />
     <Compile Include="Extensions\Extension.cs" />
     <Compile Include="Model\DataModels\IDataModel.cs" />
@@ -132,6 +132,12 @@
     <Compile Include="Model\Settings\ConfigFileBasedFrameworkSettings.cs" />
     <Compile Include="Model\Settings\ISessionsSection.cs" />
     <Compile Include="Model\Settings\ProviderSettings.cs" />
+    <Compile Include="Persistence\NHibernate\ApplicationRegisterRepository.cs" />
+    <Compile Include="Persistence\NHibernate\EnvironmentProviderSessionFactory.cs" />
+    <Compile Include="Persistence\NHibernate\EnvironmentRegisterRepository.cs" />
+    <Compile Include="Persistence\NHibernate\EnvironmentRepository.cs" />
+    <Compile Include="Persistence\NHibernate\GenericRepository.cs" />
+    <Compile Include="Persistence\NHibernate\IBaseSessionFactory.cs" />
     <Compile Include="Providers\IBasicProvider.cs" />
     <Compile Include="Providers\IProvider.cs" />
     <Compile Include="Providers\BasicProvider.cs" />
@@ -146,6 +152,9 @@
     <Compile Include="Model\Settings\ProviderSection.cs" />
     <Compile Include="Model\Settings\SessionElement.cs" />
     <Compile Include="Model\Settings\SessionsElementCollection.cs" />
+    <Compile Include="Service\Infrastructure\ApplicationRegisterService.cs" />
+    <Compile Include="Service\Infrastructure\EnvironmentRegisterService.cs" />
+    <Compile Include="Service\Infrastructure\EnvironmentService.cs" />
     <Compile Include="Service\Providers\IBasicProviderService.cs" />
     <Compile Include="Service\Providers\IProviderService.cs" />
     <Compile Include="Service\IService.cs" />
@@ -168,23 +177,14 @@
     <Compile Include="Persistence\IEnvironmentRepository.cs" />
     <Compile Include="Persistence\IGenericRepository.cs" />
     <Compile Include="Model\Persistence\IPersistable.cs" />
-    <Compile Include="Persistence\NHibernate\ApplicationRegisterRepository.cs" />
-    <Compile Include="Persistence\NHibernate\EnvironmentProviderSessionFactory.cs" />
-    <Compile Include="Persistence\NHibernate\EnvironmentRegisterRepository.cs" />
-    <Compile Include="Persistence\NHibernate\EnvironmentRepository.cs" />
-    <Compile Include="Persistence\NHibernate\GenericRepository.cs" />
-    <Compile Include="Persistence\NHibernate\IBaseSessionFactory.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Service\Infrastructure\ApplicationRegisterService.cs" />
     <Compile Include="Service\Infrastructure\IApplicationRegisterService.cs" />
     <Compile Include="Service\GenericService.cs" />
     <Compile Include="Service\IGenericService.cs" />
     <Compile Include="Service\Serialisation\ISerialiser.cs" />
     <Compile Include="Service\Serialisation\XmlSerialiser.cs" />
     <Compile Include="Service\SifService.cs" />
     <Compile Include="Service\ISifService.cs" />
-    <Compile Include="Service\Infrastructure\EnvironmentRegisterService.cs" />
-    <Compile Include="Service\Infrastructure\EnvironmentService.cs" />
     <Compile Include="Service\Infrastructure\IEnvironmentRegisterService.cs" />
     <Compile Include="Service\Infrastructure\IEnvironmentService.cs" />
     <Compile Include="Service\Mapper\MapperFactory.cs" />
@@ -204,11 +204,6 @@
     <Compile Include="WebApi\RouteConstraints\SegmentPrefixConstraint.cs" />
     <Compile Include="WebApi\ServiceProviderHttpControllerTypeResolver.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Environment.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <None Include="ClassDiagram.cd" />
     <None Include="SifFramework.config">
@@ -219,51 +214,22 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationInfo.hbm.xml" />
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ProductIdentity.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Property.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Zone.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Right.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Service.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ProvisionedZone.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationRegister.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\EnvironmentRegister.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Content Include="..\packages\AutoMapper.3.1.1\lib\net40\AutoMapper.Net4.dll">
       <Link>AutoMapper.Net4.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <EmbeddedResource Include="Persistence\NHibernate\Mapping\InfrastructureService.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationInfo.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ApplicationRegister.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Environment.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\EnvironmentRegister.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\InfrastructureService.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ProductIdentity.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Property.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\ProvisionedZone.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Right.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Service.hbm.xml" />
+    <EmbeddedResource Include="Persistence\NHibernate\Mapping\Zone.hbm.xml" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Data/Databases/SQLite/SifFrameworkDatabase.db b/Data/Databases/SQLite/SifFrameworkDatabase.db

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2015 Systemic Pty Ltd`
	`2`	`+ * Copyright 2016 Systemic Pty Ltd`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -24,7 +24,7 @@ namespace Sif.Framework.Model.Exceptions`
`24`	`24`	`/// This exception represents the situation where an item already exists.`
`25`	`25`	`/// </summary>`
`26`	`26`	`[Serializable]`
`27`		`- class AlreadyExistsException : BaseException`
	`27`	`+ public class AlreadyExistsException : BaseException`
`28`	`28`	`{`
`29`	`29`
`30`	`30`	`/// <summary>`