Skip to content

Commit e966fd9

Browse files
poutsmapoutsma
committed
- Removed GenericMarshaller & GenericUnmarshaller
- Made Marshaller and Unmarshaller generic
1 parent 56bdfae commit e966fd9

19 files changed

+532
-888
lines changed

‎org.springframework.oxm/oxm.iml

+169-11
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
</SOURCES>
3434
</library>
3535
</orderEntry>
36-
<orderEntry type="module" module-name="jms" />
3736
<orderEntry type="module-library">
3837
<library>
3938
<CLASSES>
@@ -45,7 +44,6 @@
4544
</SOURCES>
4645
</library>
4746
</orderEntry>
48-
<orderEntry type="module" module-name="web-servlet" />
4947
<orderEntry type="module-library">
5048
<library>
5149
<CLASSES>
@@ -112,15 +110,6 @@
112110
</SOURCES>
113111
</library>
114112
</orderEntry>
115-
<orderEntry type="module-library">
116-
<library>
117-
<CLASSES>
118-
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.5.jar!/" />
119-
</CLASSES>
120-
<JAVADOC />
121-
<SOURCES />
122-
</library>
123-
</orderEntry>
124113
<orderEntry type="module" module-name="context" />
125114
<orderEntry type="module-library">
126115
<library>
@@ -155,11 +144,180 @@
155144
</SOURCES>
156145
</library>
157146
</orderEntry>
147+
<orderEntry type="module-library">
148+
<library>
149+
<CLASSES>
150+
<root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar!/" />
151+
</CLASSES>
152+
<JAVADOC />
153+
<SOURCES>
154+
<root url="jar://$IVY_CACHE$/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-sources-4.5.0.jar!/" />
155+
</SOURCES>
156+
</library>
157+
</orderEntry>
158+
<orderEntry type="module-library">
159+
<library>
160+
<CLASSES>
161+
<root url="jar://$IVY_CACHE$/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-2.1.7.jar!/" />
162+
</CLASSES>
163+
<JAVADOC />
164+
<SOURCES>
165+
<root url="jar://$IVY_CACHE$/javax.xml.bind/com.springsource.javax.xml.bind/2.1.7/com.springsource.javax.xml.bind-sources-2.1.7.jar!/" />
166+
</SOURCES>
167+
</library>
168+
</orderEntry>
158169
</component>
159170
<component name="copyright">
160171
<Base>
161172
<setting name="state" value="1" />
162173
</Base>
174+
<LanguageOptions name="HTML">
175+
<option name="templateOptions">
176+
<value>
177+
<option name="block" value="true" />
178+
<option name="separateBefore" value="false" />
179+
<option name="separateAfter" value="false" />
180+
<option name="prefixLines" value="true" />
181+
<option name="lenBefore" value="80" />
182+
<option name="lenAfter" value="80" />
183+
<option name="box" value="false" />
184+
<option name="filler" value=" " />
185+
</value>
186+
</option>
187+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
188+
<option name="keyword" value="Copyright" />
189+
<option name="fileTypeOverride" value="1" />
190+
<option name="relativeBefore" value="true" />
191+
<option name="addBlankAfter" value="true" />
192+
<option name="fileLocation" value="1" />
193+
<option name="useAlternate" value="false" />
194+
</LanguageOptions>
195+
<LanguageOptions name="JAVA">
196+
<option name="templateOptions">
197+
<value>
198+
<option name="block" value="true" />
199+
<option name="separateBefore" value="false" />
200+
<option name="separateAfter" value="false" />
201+
<option name="prefixLines" value="true" />
202+
<option name="lenBefore" value="80" />
203+
<option name="lenAfter" value="80" />
204+
<option name="box" value="false" />
205+
<option name="filler" value=" " />
206+
</value>
207+
</option>
208+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
209+
<option name="keyword" value="Copyright" />
210+
<option name="fileTypeOverride" value="2" />
211+
<option name="relativeBefore" value="true" />
212+
<option name="addBlankAfter" value="true" />
213+
<option name="fileLocation" value="1" />
214+
<option name="useAlternate" value="false" />
215+
</LanguageOptions>
216+
<LanguageOptions name="JSP">
217+
<option name="templateOptions">
218+
<value>
219+
<option name="block" value="true" />
220+
<option name="separateBefore" value="false" />
221+
<option name="separateAfter" value="false" />
222+
<option name="prefixLines" value="true" />
223+
<option name="lenBefore" value="80" />
224+
<option name="lenAfter" value="80" />
225+
<option name="box" value="false" />
226+
<option name="filler" value=" " />
227+
</value>
228+
</option>
229+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
230+
<option name="keyword" value="Copyright" />
231+
<option name="fileTypeOverride" value="1" />
232+
<option name="relativeBefore" value="true" />
233+
<option name="addBlankAfter" value="true" />
234+
<option name="fileLocation" value="1" />
235+
<option name="useAlternate" value="false" />
236+
</LanguageOptions>
237+
<LanguageOptions name="JavaScript">
238+
<option name="templateOptions">
239+
<value>
240+
<option name="block" value="true" />
241+
<option name="separateBefore" value="false" />
242+
<option name="separateAfter" value="false" />
243+
<option name="prefixLines" value="true" />
244+
<option name="lenBefore" value="80" />
245+
<option name="lenAfter" value="80" />
246+
<option name="box" value="false" />
247+
<option name="filler" value=" " />
248+
</value>
249+
</option>
250+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
251+
<option name="keyword" value="Copyright" />
252+
<option name="fileTypeOverride" value="1" />
253+
<option name="relativeBefore" value="true" />
254+
<option name="addBlankAfter" value="true" />
255+
<option name="fileLocation" value="1" />
256+
<option name="useAlternate" value="false" />
257+
</LanguageOptions>
258+
<LanguageOptions name="Properties">
259+
<option name="templateOptions">
260+
<value>
261+
<option name="block" value="true" />
262+
<option name="separateBefore" value="false" />
263+
<option name="separateAfter" value="false" />
264+
<option name="prefixLines" value="true" />
265+
<option name="lenBefore" value="80" />
266+
<option name="lenAfter" value="80" />
267+
<option name="box" value="false" />
268+
<option name="filler" value=" " />
269+
</value>
270+
</option>
271+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
272+
<option name="keyword" value="Copyright" />
273+
<option name="fileTypeOverride" value="1" />
274+
<option name="relativeBefore" value="true" />
275+
<option name="addBlankAfter" value="true" />
276+
<option name="fileLocation" value="1" />
277+
<option name="useAlternate" value="false" />
278+
</LanguageOptions>
279+
<LanguageOptions name="XML">
280+
<option name="templateOptions">
281+
<value>
282+
<option name="block" value="true" />
283+
<option name="separateBefore" value="false" />
284+
<option name="separateAfter" value="false" />
285+
<option name="prefixLines" value="true" />
286+
<option name="lenBefore" value="80" />
287+
<option name="lenAfter" value="80" />
288+
<option name="box" value="false" />
289+
<option name="filler" value=" " />
290+
</value>
291+
</option>
292+
<option name="notice" value="Copyright (c) &amp;#36;today.year, Your Corporation. All Rights Reserved." />
293+
<option name="keyword" value="Copyright" />
294+
<option name="fileTypeOverride" value="1" />
295+
<option name="relativeBefore" value="true" />
296+
<option name="addBlankAfter" value="true" />
297+
<option name="fileLocation" value="1" />
298+
<option name="useAlternate" value="false" />
299+
</LanguageOptions>
300+
<LanguageOptions name="__TEMPLATE__">
301+
<option name="templateOptions">
302+
<value>
303+
<option name="block" value="true" />
304+
<option name="separateBefore" value="false" />
305+
<option name="separateAfter" value="false" />
306+
<option name="prefixLines" value="true" />
307+
<option name="lenBefore" value="80" />
308+
<option name="lenAfter" value="80" />
309+
<option name="box" value="false" />
310+
<option name="filler" value=" " />
311+
</value>
312+
</option>
313+
<option name="notice" value="Copyright 2002-&amp;#36;today.year the original author or authors.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10; http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
314+
<option name="keyword" value="Copyright" />
315+
<option name="fileTypeOverride" value="4" />
316+
<option name="relativeBefore" value="true" />
317+
<option name="addBlankAfter" value="true" />
318+
<option name="fileLocation" value="1" />
319+
<option name="useAlternate" value="false" />
320+
</LanguageOptions>
163321
</component>
164322
</module>
165323

‎org.springframework.oxm/src/main/java/org/springframework/oxm/GenericMarshaller.java

-40
This file was deleted.

‎org.springframework.oxm/src/main/java/org/springframework/oxm/GenericUnmarshaller.java

-40
This file was deleted.

‎org.springframework.oxm/src/main/java/org/springframework/oxm/Marshaller.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ public interface Marshaller {
4646
* @return <code>true</code> if this marshaller can indeed marshal instances of the supplied class; <code>false</code>
4747
* otherwise
4848
*/
49-
boolean supports(Class clazz);
49+
boolean supports(Class<?> clazz);
5050

5151
}

‎org.springframework.oxm/src/main/java/org/springframework/oxm/Unmarshaller.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ public interface Unmarshaller {
4444
* @return <code>true</code> if this unmarshaller can indeed unmarshal to the supplied class; <code>false</code>
4545
* otherwise
4646
*/
47-
boolean supports(Class clazz);
47+
boolean supports(Class<?> clazz);
4848

4949
}

0 commit comments

Comments
 (0)