Skip to content

Commit 1b8d29b

Browse files
highsourcehighsource
committed
Fixing jaxb2-basics-runtime for #91.
1 parent bf493a4 commit 1b8d29b

File tree

11 files changed

+28
-34
lines changed

11 files changed

+28
-34
lines changed

‎runtime/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@
2222
<artifactId>jaxb-runtime</artifactId>
2323
<scope>provided</scope>
2424
</dependency>
25+
<dependency>
26+
<groupId>org.glassfish.jaxb</groupId>
27+
<artifactId>jaxb-core</artifactId>
28+
<scope>provided</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>com.sun.activation</groupId>
32+
<artifactId>javax.activation</artifactId>
33+
<scope>test</scope>
34+
</dependency>
2535
<dependency>
2636
<groupId>junit</groupId>
2737
<artifactId>junit</artifactId>

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultCopyStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.jvnet.jaxb2_commons.locator.ObjectLocator;
99

10+
@SuppressWarnings("deprecation")
1011
public class DefaultCopyStrategy implements CopyStrategy2, CopyStrategy {
1112

1213
protected Object copyInternal(ObjectLocator locator, Object object) {
@@ -364,6 +365,5 @@ public Object[] copy(ObjectLocator locator, Object[] value, boolean valueSet) {
364365
}
365366

366367
public static final DefaultCopyStrategy INSTANCE2 = new DefaultCopyStrategy();
367-
@SuppressWarnings("deprecation")
368368
public static final CopyStrategy INSTANCE = INSTANCE2;
369-
}
369+
}

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultEqualsStrategy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.jvnet.jaxb2_commons.locator.ObjectLocator;
66

7+
@SuppressWarnings("deprecation")
78
public class DefaultEqualsStrategy implements EqualsStrategy2, EqualsStrategy {
89

910
public boolean equals(ObjectLocator leftLocator,
@@ -556,6 +557,5 @@ public boolean equals(ObjectLocator leftLocator,
556557
}
557558

558559
public static DefaultEqualsStrategy INSTANCE2 = new DefaultEqualsStrategy();
559-
@SuppressWarnings("deprecation")
560560
public static EqualsStrategy INSTANCE = INSTANCE2;
561-
}
561+
}

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultHashCodeStrategy.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import org.jvnet.jaxb2_commons.locator.ObjectLocator;
66

7+
@SuppressWarnings("deprecation")
78
public class DefaultHashCodeStrategy implements HashCodeStrategy2, HashCodeStrategy {
89

910
private int iConstant;
@@ -384,7 +385,5 @@ public int hashCode(ObjectLocator locator, int hashCode, Object[] value, boolean
384385
}
385386

386387
public static final DefaultHashCodeStrategy INSTANCE2 = new DefaultHashCodeStrategy();
387-
@SuppressWarnings("deprecation")
388388
public static final HashCodeStrategy INSTANCE = INSTANCE2;
389-
390-
}
389+
}

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultMergeStrategy.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import org.jvnet.jaxb2_commons.locator.ObjectLocator;
44

5+
@SuppressWarnings("deprecation")
56
public class DefaultMergeStrategy implements MergeStrategy2, MergeStrategy {
67

78
public static final DefaultMergeStrategy INSTANCE2 = new DefaultMergeStrategy();
8-
@SuppressWarnings("deprecation")
99
public static final MergeStrategy INSTANCE = INSTANCE2;
1010

1111
@Override
@@ -486,5 +486,4 @@ public Object merge(ObjectLocator leftLocator, ObjectLocator rightLocator,
486486
return merge(leftLocator, rightLocator, left, right);
487487
}
488488
}
489-
490-
}
489+
}

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/DefaultToStringStrategy.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.jvnet.jaxb2_commons.locator.ObjectLocator;
99

10+
@SuppressWarnings("deprecation")
1011
public class DefaultToStringStrategy implements ToStringStrategy2,
1112
ToStringStrategy {
1213

@@ -118,7 +119,6 @@ public boolean isUseDefaultFieldValueMarkers() {
118119
return useDefaultFieldValueMarkers;
119120
}
120121

121-
@SuppressWarnings("unchecked")
122122
protected String getShortClassName(Class cls) {
123123
return ClassUtils.getShortClassName(cls);
124124
}
@@ -434,7 +434,6 @@ public StringBuilder appendField(ObjectLocator parentLocator,
434434
return buffer;
435435
}
436436

437-
@SuppressWarnings("unchecked")
438437
public StringBuilder append(ObjectLocator parentLocator, Object parent,
439438
String fieldName, StringBuilder buffer, Collection value) {
440439
appendFieldStart(parentLocator, parent, fieldName, buffer);
@@ -509,7 +508,6 @@ public StringBuilder appendField(ObjectLocator parentLocator,
509508
return buffer;
510509
}
511510

512-
@SuppressWarnings("unchecked")
513511
protected StringBuilder appendInternal(ObjectLocator locator,
514512
StringBuilder buffer, Object value) {
515513
if (value instanceof Collection) {
@@ -621,7 +619,6 @@ public StringBuilder append(ObjectLocator locator, StringBuilder buffer,
621619
return buffer;
622620
}
623621

624-
@SuppressWarnings("unchecked")
625622
public StringBuilder append(ObjectLocator locator, StringBuilder buffer,
626623
Collection array) {
627624
if (array == null) {
@@ -802,7 +799,6 @@ protected StringBuilder appendSummary(ObjectLocator locator,
802799
return buffer;
803800
}
804801

805-
@SuppressWarnings("unchecked")
806802
protected StringBuilder appendSummary(ObjectLocator locator,
807803
StringBuilder buffer, Collection value) {
808804
appendSummarySize(locator, buffer, value.size());
@@ -932,7 +928,6 @@ protected StringBuilder appendDetail(ObjectLocator locator,
932928
return buffer;
933929
}
934930

935-
@SuppressWarnings("unchecked")
936931
protected StringBuilder appendDetail(ObjectLocator locator,
937932
StringBuilder buffer, Collection array) {
938933
appendArrayStart(buffer);
@@ -1192,6 +1187,5 @@ public StringBuilder appendField(ObjectLocator parentLocator,
11921187
}
11931188

11941189
public static final DefaultToStringStrategy INSTANCE2 = new DefaultToStringStrategy();
1195-
@SuppressWarnings("deprecation")
11961190
public static final ToStringStrategy INSTANCE = INSTANCE2;
1197-
}
1191+
}

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeCollectionsStrategy.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
public class JAXBMergeCollectionsStrategy extends JAXBMergeStrategy {
1212

13+
@SuppressWarnings("unchecked")
1314
@Override
1415
protected Object mergeInternal(ObjectLocator leftLocator,
1516
ObjectLocator rightLocator, Collection leftCollection,

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBMergeStrategy.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
public class JAXBMergeStrategy extends DefaultMergeStrategy {
88

9-
@SuppressWarnings("unchecked")
109
@Override
1110
protected Object mergeInternal(ObjectLocator leftLocator,
1211
ObjectLocator rightLocator, Object left, Object right) {
@@ -20,7 +19,6 @@ protected Object mergeInternal(ObjectLocator leftLocator,
2019
}
2120
}
2221

23-
@SuppressWarnings("unchecked")
2422
protected Object mergeInternal(ObjectLocator leftLocator,
2523
ObjectLocator rightLocator, Collection leftCollection,
2624
Collection rightCollection) {

‎runtime/src/main/java/org/jvnet/jaxb2_commons/lang/JAXBToStringStrategy.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ protected void appendJAXBElementEnd(StringBuilder stringBuilder) {
1818
stringBuilder.append(jaxbElementEnd);
1919
}
2020

21-
@SuppressWarnings("unchecked")
2221
@Override
2322
protected StringBuilder appendInternal(ObjectLocator locator,
2423
StringBuilder stringBuilder, Object value) {
@@ -31,7 +30,6 @@ protected StringBuilder appendInternal(ObjectLocator locator,
3130
return stringBuilder;
3231
}
3332

34-
@SuppressWarnings("unchecked")
3533
protected StringBuilder appendInternal(ObjectLocator locator,
3634
StringBuilder stringBuilder, JAXBElement value) {
3735
appendJAXBElementStart(stringBuilder);

‎runtime/src/main/java/org/jvnet/jaxb2_commons/xml/bind/model/concrete/CMInfoFactory.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import com.sun.xml.bind.v2.model.core.ValuePropertyInfo;
6666
import com.sun.xml.bind.v2.model.core.WildcardTypeInfo;
6767

68+
@SuppressWarnings("unchecked")
6869
public abstract class CMInfoFactory<T, C extends T, TIS extends TypeInfoSet<T, C, ?, ?>,
6970
//
7071
TI extends TypeInfo<T, C>,
@@ -143,7 +144,6 @@ private void createEnumLeafInfos(final CMModel<T, C> model) {
143144
Collection<? extends EnumLeafInfo<T, C>> enums = typeInfoSet.enums()
144145
.values();
145146
for (EnumLeafInfo<T, C> enumLeafInfo : enums) {
146-
@SuppressWarnings("unchecked")
147147
final ELI eli = (ELI) enumLeafInfo;
148148
getTypeInfo(eli);
149149
}
@@ -160,7 +160,6 @@ private void createBuiltinLeafInfos(final CMModel<T, C> model) {
160160
Collection<? extends BuiltinLeafInfo<T, C>> builtins = typeInfoSet
161161
.builtins().values();
162162
for (BuiltinLeafInfo<T, C> builtinLeafInfo : builtins) {
163-
@SuppressWarnings("unchecked")
164163
final BLI bli = (BLI) builtinLeafInfo;
165164
getTypeInfo(bli);
166165
}
@@ -173,7 +172,6 @@ private void createClassInfos(final CMModel<T, C> model) {
173172
Collection<? extends ClassInfo<T, C>> beans = typeInfoSet.beans()
174173
.values();
175174
for (ClassInfo<T, C> classInfo : beans) {
176-
@SuppressWarnings("unchecked")
177175
final CI ci = (CI) classInfo;
178176
getTypeInfo(ci);
179177
}
@@ -244,9 +242,7 @@ private MBuiltinLeafInfo<T, C> getTypeInfo(BLI info) {
244242
}
245243

246244
private MTypeInfo<T, C> getTypeInfo(EI info) {
247-
@SuppressWarnings("unchecked")
248245
EPI p = (EPI) info.getProperty();
249-
@SuppressWarnings("unchecked")
250246
TI contentType = (TI) info.getContentType();
251247
return getTypeInfo(p, contentType, p.isValueList(), p.getAdapter(),
252248
p.id(), p.getExpectedMimeType());
@@ -275,7 +271,6 @@ private MEnumLeafInfo<T, C> getTypeInfo(ELI info) {
275271
private void populateEnumLeafInfo(ELI info, MEnumLeafInfo<T, C> enumLeafInfo) {
276272
@SuppressWarnings("rawtypes")
277273
Iterable<? extends EnumConstant> _constants = info.getConstants();
278-
@SuppressWarnings("unchecked")
279274
final Iterable<? extends EnumConstant<T, C>> enumConstants = (Iterable<? extends EnumConstant<T, C>>) _constants;
280275
for (EnumConstant<?, ?> enumConstant : enumConstants) {
281276
enumLeafInfo.addEnumConstantInfo(createEnumContantInfo(
@@ -322,15 +317,12 @@ private MPropertyInfo<T, C> createPropertyInfo(
322317
final MClassInfo<T, C> classInfo, PI p) {
323318

324319
if (p instanceof AttributePropertyInfo) {
325-
@SuppressWarnings("unchecked")
326320
final API api = (API) p;
327321
return createAttributePropertyInfo(classInfo, api);
328322
} else if (p instanceof ValuePropertyInfo) {
329-
@SuppressWarnings("unchecked")
330323
final VPI vpi = (VPI) p;
331324
return createValuePropertyInfo(classInfo, vpi);
332325
} else if (p instanceof ElementPropertyInfo) {
333-
@SuppressWarnings("unchecked")
334326
final EPI ep = (EPI) p;
335327
if (ep.getTypes().size() == 1) {
336328
return createElementPropertyInfo(classInfo, ep);
@@ -339,7 +331,6 @@ private MPropertyInfo<T, C> createPropertyInfo(
339331

340332
}
341333
} else if (p instanceof ReferencePropertyInfo) {
342-
@SuppressWarnings("unchecked")
343334
final RPI rp = (RPI) p;
344335
final Set<? extends Element<T, C>> elements = rp.getElements();
345336
if (elements.size() == 0
@@ -545,7 +536,6 @@ protected MBuiltinLeafInfo<T, C> createBuiltinLeafInfo(BLI info) {
545536
}
546537

547538
protected MEnumLeafInfo<T, C> createEnumLeafInfo(final ELI info) {
548-
@SuppressWarnings("unchecked")
549539
final TI baseType = (TI) info.getBaseType();
550540
return new CMEnumLeafInfo<T, C>(createEnumLeafInfoOrigin(info),
551541
info.getClazz(), getPackage(info), getContainer(info),
@@ -561,7 +551,6 @@ protected CMEnumConstantInfo<T, C> createEnumContantInfo(
561551
}
562552

563553
protected MElementInfo<T, C> createElementInfo(EI element) {
564-
@SuppressWarnings("unchecked")
565554
final CI scopeCI = (CI) element.getScope();
566555
final MClassInfo<T, C> scope = element.getScope() == null ? null
567556
: getTypeInfo(scopeCI);

0 commit comments

Comments
 (0)