33
33
34
34
using CTe . CTeOSDocumento . Common ;
35
35
using DFe . Classes . Extensoes ;
36
- using MDFe . Classes . Extensoes ;
36
+ using MDFe . Classes . Extencoes ;
37
37
using MDFe . Servicos . Enderecos . Helper ;
38
38
using MDFe . Utils . Configuracoes ;
39
39
using MDFe . Wsdl . Gerado . MDFeStatusServico ;
@@ -48,104 +48,88 @@ namespace MDFe.Servicos.Factory
48
48
{
49
49
public static class WsdlFactory
50
50
{
51
- public static MDFeConsNaoEnc CriaWsdlMDFeConsNaoEnc ( MDFeConfiguracao cfgMdfe = null )
51
+ public static MDFeConsNaoEnc CriaWsdlMDFeConsNaoEnc ( )
52
52
{
53
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
54
-
55
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeConsNaoEnc ;
56
- var versao = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
57
- var configuracaoWsdl = CriaConfiguracao ( url , versao , config ) ;
53
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeConsNaoEnc ;
54
+ var versao = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
55
+ var configuracaoWsdl = CriaConfiguracao ( url , versao ) ;
58
56
59
57
var ws = new MDFeConsNaoEnc ( configuracaoWsdl ) ;
60
58
return ws ;
61
59
}
62
60
63
- public static MDFeConsulta CriaWsdlMDFeConsulta ( MDFeConfiguracao cfgMdfe = null )
61
+ public static MDFeConsulta CriaWsdlMDFeConsulta ( )
64
62
{
65
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
66
-
67
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeConsulta ;
68
- var versao = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
63
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeConsulta ;
64
+ var versao = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
69
65
70
- var configuracaoWsdl = CriaConfiguracao ( url , versao , config ) ;
66
+ var configuracaoWsdl = CriaConfiguracao ( url , versao ) ;
71
67
72
68
return new MDFeConsulta ( configuracaoWsdl ) ;
73
69
}
74
70
75
- public static MDFeRecepcaoEvento CriaWsdlMDFeRecepcaoEvento ( MDFeConfiguracao cfgMdfe = null )
71
+ public static MDFeRecepcaoEvento CriaWsdlMDFeRecepcaoEvento ( )
76
72
{
77
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
73
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeRecepcaoEvento ;
74
+ var versao = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
78
75
79
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeRecepcaoEvento ;
80
- var versao = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
81
-
82
- var configuracaoWsdl = CriaConfiguracao ( url , versao , config ) ;
76
+ var configuracaoWsdl = CriaConfiguracao ( url , versao ) ;
83
77
84
78
return new MDFeRecepcaoEvento ( configuracaoWsdl ) ;
85
79
}
86
80
87
- public static MDFeRecepcao CriaWsdlMDFeRecepcao ( MDFeConfiguracao cfgMdfe = null )
81
+ public static MDFeRecepcao CriaWsdlMDFeRecepcao ( )
88
82
{
89
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
90
-
91
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeRecepcao ;
92
- var versaoServico = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
83
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeRecepcao ;
84
+ var versaoServico = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
93
85
94
- var configuracaoWsdl = CriaConfiguracao ( url , versaoServico , config ) ;
86
+ var configuracaoWsdl = CriaConfiguracao ( url , versaoServico ) ;
95
87
96
88
return new MDFeRecepcao ( configuracaoWsdl ) ;
97
89
}
98
90
99
- public static MDFeRecepcaoSinc CriaWsdlMDFeRecepcaoSinc ( MDFeConfiguracao cfgMdfe = null )
91
+ public static MDFeRecepcaoSinc CriaWsdlMDFeRecepcaoSinc ( )
100
92
{
101
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
93
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeRecepcaoSinc ;
94
+ var versaoServico = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
102
95
103
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeRecepcaoSinc ;
104
- var versaoServico = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
105
-
106
- var configuracaoWsdl = CriaConfiguracao ( url , versaoServico , config ) ;
96
+ var configuracaoWsdl = CriaConfiguracao ( url , versaoServico ) ;
107
97
108
98
return new MDFeRecepcaoSinc ( configuracaoWsdl ) ;
109
99
}
110
100
111
- public static MDFeRetRecepcao CriaWsdlMDFeRetRecepcao ( MDFeConfiguracao cfgMdfe = null )
101
+ public static MDFeRetRecepcao CriaWsdlMDFeRetRecepcao ( )
112
102
{
113
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
114
-
115
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeRetRecepcao ;
116
- var versao = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
103
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeRetRecepcao ;
104
+ var versao = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
117
105
118
- var configuracaoWsdl = CriaConfiguracao ( url , versao , config ) ;
106
+ var configuracaoWsdl = CriaConfiguracao ( url , versao ) ;
119
107
120
108
return new MDFeRetRecepcao ( configuracaoWsdl ) ;
121
109
}
122
110
123
- public static MDFeStatusServico CriaWsdlMDFeStatusServico ( MDFeConfiguracao cfgMdfe = null )
111
+ public static MDFeStatusServico CriaWsdlMDFeStatusServico ( )
124
112
{
125
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
113
+ var url = UrlHelper . ObterUrlServico ( MDFeConfiguracao . VersaoWebService . TipoAmbiente ) . MDFeStatusServico ;
114
+ var versao = MDFeConfiguracao . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
126
115
127
- var url = UrlHelper . ObterUrlServico ( config . VersaoWebService . TipoAmbiente ) . MDFeStatusServico ;
128
- var versao = config . VersaoWebService . VersaoLayout . GetVersaoString ( ) ;
129
-
130
- var configuracaoWsdl = CriaConfiguracao ( url , versao , config ) ;
116
+ var configuracaoWsdl = CriaConfiguracao ( url , versao ) ;
131
117
132
118
return new MDFeStatusServico ( configuracaoWsdl ) ;
133
119
}
134
120
135
- private static WsdlConfiguracao CriaConfiguracao ( string url , string versao , MDFeConfiguracao cfgMdfe = null )
121
+ private static WsdlConfiguracao CriaConfiguracao ( string url , string versao )
136
122
{
137
- var config = cfgMdfe ?? MDFeConfiguracao . Instancia ;
138
-
139
- var codigoEstado = config . VersaoWebService . UfEmitente . GetCodigoIbgeEmString ( ) ;
140
- var certificadoDigital = config . X509Certificate2 ;
123
+ var codigoEstado = MDFeConfiguracao . VersaoWebService . UfEmitente . GetCodigoIbgeEmString ( ) ;
124
+ var certificadoDigital = MDFeConfiguracao . X509Certificate2 ;
141
125
142
126
return new WsdlConfiguracao
143
127
{
144
128
CertificadoDigital = certificadoDigital ,
145
129
Versao = versao ,
146
130
CodigoIbgeEstado = codigoEstado ,
147
131
Url = url ,
148
- TimeOut = config . VersaoWebService . TimeOut
132
+ TimeOut = MDFeConfiguracao . VersaoWebService . TimeOut
149
133
} ;
150
134
}
151
135
}
0 commit comments