Skip to content

Commit 1bffa85

Browse files
committed
Updated and cleaned up AutoMapper configuration.
1 parent 9e69278 commit 1bffa85

3 files changed

Lines changed: 21 additions & 54 deletions

File tree

Code/Sif3Framework/Sif.Framework/Service/Mapper/MapperFactory.cs

Lines changed: 21 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,6 @@ public IDictionary<string, Right> Convert(rightType[] source, IDictionary<string
105105

106106
}
107107

108-
class StatesConverter : ITypeConverter<stateType[], IList<PhaseState>>
109-
{
110-
111-
public IList<PhaseState> Convert(stateType[] source, IList<PhaseState> destination, ResolutionContext context)
112-
{
113-
return new List<PhaseState>(mapper.Map<stateType[], ICollection<PhaseState>>(source));
114-
}
115-
116-
}
117-
118108
class PhasesConverter : ITypeConverter<phaseType[], IDictionary<string, Phase>>
119109
{
120110

@@ -133,34 +123,16 @@ public IDictionary<string, Phase> Convert(phaseType[] source, IDictionary<string
133123

134124
}
135125

136-
class DeleteIdsConverter : ITypeConverter<deleteIdType[], ICollection<string>>
137-
{
138-
139-
public ICollection<string> Convert(deleteIdType[] source, ICollection<string> destination, ResolutionContext context)
140-
{
141-
ICollection<string> deleteIds = new List<string>();
142-
143-
foreach (deleteIdType deleteId in source)
144-
{
145-
deleteIds.Add(deleteId.id);
146-
}
147-
148-
return deleteIds;
149-
}
150-
151-
}
152-
153126
static MapperFactory()
154127
{
155128

156129
MapperConfiguration config = new MapperConfiguration(cfg =>
157130
{
158-
cfg.CreateMap<ApplicationInfo, applicationInfoType>();
159-
cfg.CreateMap<applicationInfoType, ApplicationInfo>()
160-
.ForMember(dest => dest.Id, opt => opt.Ignore());
131+
cfg.CreateMap<ApplicationInfo, applicationInfoType>()
132+
.ReverseMap();
161133

162134
cfg.CreateMap<InfrastructureService, infrastructureServiceType>()
163-
.ForMember(dest => dest.nameSpecified, opt => opt.UseValue<bool>(true))
135+
.ForMember(dest => dest.nameSpecified, opt => opt.UseValue(true))
164136
.ForMember(dest => dest.name, opt => opt.MapFrom(src => src.Name));
165137
cfg.CreateMap<infrastructureServiceType, InfrastructureService>()
166138
.ForMember(dest => dest.Id, opt => opt.Ignore())
@@ -171,17 +143,15 @@ static MapperFactory()
171143
cfg.CreateMap<Environment, environmentType>()
172144
.ForMember(dest => dest.infrastructureServices, opt => opt.MapFrom(src => src.InfrastructureServices.Values))
173145
.ForMember(dest => dest.provisionedZones, opt => opt.MapFrom(src => src.ProvisionedZones.Values))
174-
.ForMember(dest => dest.typeSpecified, opt => opt.UseValue<bool>(true))
146+
.ForMember(dest => dest.typeSpecified, opt => opt.UseValue(true))
175147
.ForMember(dest => dest.fingerprint, opt => opt.Ignore());
176148
cfg.CreateMap<environmentType, Environment>();
177149

178-
cfg.CreateMap<ProductIdentity, productIdentityType>();
179-
cfg.CreateMap<productIdentityType, ProductIdentity>()
180-
.ForMember(dest => dest.Id, opt => opt.Ignore());
150+
cfg.CreateMap<ProductIdentity, productIdentityType>()
151+
.ReverseMap();
181152

182-
cfg.CreateMap<Property, propertyType>();
183-
cfg.CreateMap<propertyType, Property>()
184-
.ForMember(dest => dest.Id, opt => opt.Ignore());
153+
cfg.CreateMap<Property, propertyType>()
154+
.ReverseMap();
185155
cfg.CreateMap<propertyType[], IDictionary<string, Property>>()
186156
.ConvertUsing<PropertiesConverter>();
187157

@@ -193,9 +163,8 @@ static MapperFactory()
193163
cfg.CreateMap<provisionedZoneType[], IDictionary<string, ProvisionedZone>>()
194164
.ConvertUsing<ProvisionedZonesConverter>();
195165

196-
cfg.CreateMap<Right, rightType>();
197-
cfg.CreateMap<rightType, Right>()
198-
.ForMember(dest => dest.Id, opt => opt.Ignore());
166+
cfg.CreateMap<Right, rightType>()
167+
.ReverseMap();
199168
cfg.CreateMap<rightType[], IDictionary<string, Right>>()
200169
.ConvertUsing<RightsConverter>();
201170

@@ -216,8 +185,6 @@ static MapperFactory()
216185
.ForMember(dest => dest.lastModifiedSpecified, opt => opt.MapFrom(src => src.LastModified != null));
217186
cfg.CreateMap<stateType, PhaseState>()
218187
.ForMember(dest => dest.Id, opt => opt.Ignore());
219-
cfg.CreateMap<stateType[], IList<PhaseState>>()
220-
.ConvertUsing<StatesConverter>();
221188

222189
cfg.CreateMap<Phase, phaseType>()
223190
.ForMember(dest => dest.rights, opt => opt.MapFrom(src => src.Rights.Values))
@@ -227,8 +194,8 @@ static MapperFactory()
227194
cfg.CreateMap<phaseType[], IDictionary<string, Phase>>()
228195
.ConvertUsing<PhasesConverter>();
229196

230-
cfg.CreateMap<Initialization, initializationType>();
231-
cfg.CreateMap<initializationType, Initialization>();
197+
cfg.CreateMap<Initialization, initializationType>()
198+
.ReverseMap();
232199

233200
cfg.CreateMap<Job, jobType>()
234201
.ForMember(dest => dest.phases, opt => opt.MapFrom(src => src.Phases.Values))
@@ -239,17 +206,17 @@ static MapperFactory()
239206
cfg.CreateMap<jobType, Job>()
240207
.ForMember(dest => dest.Timeout, opt => opt.MapFrom(src => XmlConvert.ToTimeSpan(src.timeout)));
241208

242-
cfg.CreateMap<ResponseError, errorType>();
243-
cfg.CreateMap<errorType, ResponseError>();
209+
cfg.CreateMap<ResponseError, errorType>()
210+
.ReverseMap();
244211

245-
cfg.CreateMap<CreateStatus, createType>();
246-
cfg.CreateMap<createType, CreateStatus>();
212+
cfg.CreateMap<CreateStatus, createType>()
213+
.ReverseMap();
247214

248-
cfg.CreateMap<DeleteStatus, deleteStatus>();
249-
cfg.CreateMap<deleteStatus, DeleteStatus>();
215+
cfg.CreateMap<DeleteStatus, deleteStatus>()
216+
.ReverseMap();
250217

251-
cfg.CreateMap<UpdateStatus, updateType>();
252-
cfg.CreateMap<updateType, UpdateStatus>();
218+
cfg.CreateMap<UpdateStatus, updateType>()
219+
.ReverseMap();
253220

254221
cfg.CreateMap<MultipleCreateResponse, createResponseType>()
255222
.ForMember(dest => dest.creates, opt => opt.MapFrom(src => src.StatusRecords));
@@ -267,7 +234,7 @@ static MapperFactory()
267234
.ForMember(dest => dest.StatusRecords, opt => opt.MapFrom(src => src.updates));
268235

269236
cfg.CreateMap<deleteIdType[], ICollection<string>>()
270-
.ConvertUsing<DeleteIdsConverter>();
237+
.ReverseMap();
271238

272239
cfg.CreateMap<deleteRequestType, MultipleDeleteRequest>()
273240
.ForMember(dest => dest.RefIds, opt => opt.MapFrom(src => src.deletes));
0 Bytes
Binary file not shown.
-1.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)