Project

General

Profile

« Previous | Next » 

Revision 6367

remove ServiceTypeUtil - replace with TypeMarshaller

View differences:

ReplicationHandler.java
55 55

  
56 56
import org.apache.log4j.Logger;
57 57
import org.dataone.service.types.v1.SystemMetadata;
58
import org.dataone.service.types.util.ServiceTypeUtil;
58
import org.dataone.service.util.TypeMarshaller;
59 59
import org.xml.sax.ContentHandler;
60 60
import org.xml.sax.ErrorHandler;
61 61
import org.xml.sax.InputSource;
......
442 442
      // process system metadata
443 443
      if (systemMetadataXML != null) {
444 444
    	  SystemMetadata sysMeta = 
445
    		  (SystemMetadata) ServiceTypeUtil.deserializeServiceType(
445
    		  TypeMarshaller.unmarshalTypeFromStream(
446 446
    				  SystemMetadata.class, 
447 447
    				  new ByteArrayInputStream(systemMetadataXML.getBytes("UTF-8")));
448 448
    	  String guid = sysMeta.getIdentifier().getValue();
......
601 601
     // process system metadata
602 602
        if (systemMetadataXML != null) {
603 603
      	  SystemMetadata sysMeta = 
604
      		  (SystemMetadata) ServiceTypeUtil.deserializeServiceType(
604
      		TypeMarshaller.unmarshalTypeFromStream(
605 605
      				  SystemMetadata.class, 
606 606
      				  new ByteArrayInputStream(systemMetadataXML.getBytes("UTF-8")));
607 607
      	  String guid = sysMeta.getIdentifier().getValue();
......
837 837

  
838 838
			// process system metadata
839 839
			if (systemMetadataXML != null) {
840
				SystemMetadata sysMeta = (SystemMetadata) ServiceTypeUtil
841
						.deserializeServiceType(SystemMetadata.class,
840
				SystemMetadata sysMeta = TypeMarshaller.unmarshalTypeFromStream(SystemMetadata.class,
842 841
								new ByteArrayInputStream(systemMetadataXML
843 842
										.getBytes("UTF-8")));
844 843
				// String guid = sysMeta.getIdentifier().getValue();

Also available in: Unified diff