Revision 9304
Added by Jing Tao almost 9 years ago
| MNodeService.java | ||
|---|---|---|
| 61 | 61 |
import org.dataone.service.types.v1.SystemMetadata; |
| 62 | 62 |
import org.dataone.service.types.v1_1.QueryEngineDescription; |
| 63 | 63 |
import org.dataone.service.types.v1_1.QueryEngineList; |
| 64 |
import org.dataone.service.util.TypeMarshaller;
|
|
| 64 |
import org.dataone.service.types.v2.TypeFactory;
|
|
| 65 | 65 |
|
| 66 | 66 |
import edu.ucsb.nceas.metacat.IdentifierManager; |
| 67 | 67 |
import edu.ucsb.nceas.metacat.dataone.convert.LogV2toV1Converter; |
| ... | ... | |
| 169 | 169 |
//convert sysmeta to newer version |
| 170 | 170 |
org.dataone.service.types.v2.SystemMetadata v2Sysmeta = null; |
| 171 | 171 |
try {
|
| 172 |
v2Sysmeta = TypeMarshaller.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 172 |
v2Sysmeta = TypeFactory.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 173 | 173 |
} catch (Exception e) {
|
| 174 | 174 |
// report as service failure |
| 175 | 175 |
ServiceFailure sf = new ServiceFailure("1190", e.getMessage());
|
| ... | ... | |
| 241 | 241 |
//convert sysmeta to newer version |
| 242 | 242 |
org.dataone.service.types.v2.SystemMetadata v2Sysmeta = null; |
| 243 | 243 |
try {
|
| 244 |
v2Sysmeta = TypeMarshaller.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 244 |
v2Sysmeta = TypeFactory.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 245 | 245 |
} catch (Exception e) {
|
| 246 | 246 |
// report as service failure |
| 247 | 247 |
ServiceFailure sf = new ServiceFailure("1030", e.getMessage());
|
| ... | ... | |
| 268 | 268 |
//convert sysmeta to newer version |
| 269 | 269 |
org.dataone.service.types.v2.SystemMetadata v2Sysmeta = null; |
| 270 | 270 |
try {
|
| 271 |
v2Sysmeta = TypeMarshaller.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 271 |
v2Sysmeta = TypeFactory.convertTypeFromType(sysmeta, org.dataone.service.types.v2.SystemMetadata.class);
|
|
| 272 | 272 |
} catch (Exception e) {
|
| 273 | 273 |
// report as service failure |
| 274 | 274 |
ServiceFailure sf = new ServiceFailure("1030", e.getMessage());
|
| ... | ... | |
| 373 | 373 |
org.dataone.service.types.v2.SystemMetadata sysMeta = impl.getSystemMetadata(session, pid); |
| 374 | 374 |
SystemMetadata retSysMeta = null; |
| 375 | 375 |
try {
|
| 376 |
retSysMeta = TypeMarshaller.convertTypeFromType(sysMeta, SystemMetadata.class);
|
|
| 376 |
retSysMeta = TypeFactory.convertTypeFromType(sysMeta, SystemMetadata.class);
|
|
| 377 | 377 |
} catch (Exception e) {
|
| 378 | 378 |
// report as service failure |
| 379 | 379 |
ServiceFailure sf = new ServiceFailure("4801", e.getMessage());
|
| ... | ... | |
| 419 | 419 |
org.dataone.service.types.v2.Node node = impl.getCapabilities(); |
| 420 | 420 |
Node retNode = null; |
| 421 | 421 |
try {
|
| 422 |
retNode = TypeMarshaller.convertTypeFromType(node, Node.class);
|
|
| 422 |
retNode = TypeFactory.convertTypeFromType(node, Node.class);
|
|
| 423 | 423 |
} catch (Exception e) {
|
| 424 | 424 |
// report as service failure |
| 425 | 425 |
ServiceFailure sf = new ServiceFailure("4801", e.getMessage());
|
| ... | ... | |
| 465 | 465 |
org.dataone.service.types.v2.Log log = impl.getLogRecords(session, fromDate, toDate, eventValue, pidFilter, start, count); |
| 466 | 466 |
|
| 467 | 467 |
try {
|
| 468 |
//retLog = TypeMarshaller.convertTypeFromType(log, Log.class);
|
|
| 468 |
//retLog = TypeFactory.convertTypeFromType(log, Log.class);
|
|
| 469 | 469 |
LogV2toV1Converter converter = new LogV2toV1Converter(); |
| 470 | 470 |
retLog = converter.convert(log); |
| 471 | 471 |
} catch (Exception e) {
|
Also available in: Unified diff
Use the TypeFactory to replace the TypeMarshaller according to the change in the d1_common_java.