Project

General

Profile

« Previous | Next » 

Revision be6a9dc2

Added by Andreas Müller about 12 years ago

fix bug in PolytomousKeyDaoHibernateImplTest more verbose exception for cdmBases missing uuid

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java
9 9 

  		




  10
  10
  
    
package eu.etaxonomy.cdm.model.common;


  		




  11
  11
  
    

  		




  
  12
  
    
import java.util.UUID;


  		




  
  13
  
    

  		




  12
  14
  
    
import javax.persistence.Basic;


  		




  13
  15
  
    
import javax.persistence.FetchType;


  		




  14
  16
  
    
import javax.persistence.ManyToOne;


  		




  ......




  125
  127
  
    
			return false;


  		




  126
  128
  
    
		}


  		




  127
  129
  
    
		ICdmBase cdmObj = (ICdmBase)obj;


  		




  128
  
  
    
		boolean uuidEqual = cdmObj.getUuid().equals(this.getUuid());


  		




  
  130
  
    
		boolean uuidEqual;


  		




  
  131
  
    
		UUID objUuid = cdmObj.getUuid();


  		




  
  132
  
    
		if (objUuid == null){


  		




  
  133
  
    
			throw new NullPointerException("CdmBase is missing UUID");


  		




  
  134
  
    
		}


  		




  
  135
  
    
		uuidEqual = objUuid.equals(this.getUuid());


  		




  129
  136
  
    
		//TODO is this still needed?


  		




  130
  137
  
    
		boolean createdEqual = CdmUtils.nullSafeEqual(cdmObj.getCreated(), this.getCreated());


  		




  131
  138
  
    
		if (! uuidEqual || !createdEqual){


  		












  

    
      cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/description/PolytomousKeyDaoHibernateImplTest.xml
    
  





  1
  1
  
    
<?xml version='1.0' encoding='UTF-8'?>


  		




  2
  2
  
    
<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../dataset.xsd">


  		




  3
  3
  
    
  <POLYTOMOUSKEY ID="1" UUID="bab66772-2c83-428a-bb6d-655d12ac6097" ROOT_ID="1" PROTECTEDTITLECACHE="false"/>


  		




  4
  
  
    
  <POLYTOMOUSKEYNODE ID="1" KEY_ID="1" />


  		




  5
  
  
    
  <POLYTOMOUSKEYNODE ID="2" KEY_ID="1" PARENT_ID="1" SORTINDEX="0"  STATEMENT_ID="1" QUESTION_ID="2"/>


  		




  6
  
  
    
  <POLYTOMOUSKEYNODE ID="3" KEY_ID="1" PARENT_ID="1" SORTINDEX="1" STATEMENT_ID="3"/>


  		




  7
  
  
    
  <KEYSTATEMENT ID="1"/>


  		




  8
  
  
    
  <KEYSTATEMENT ID="2"/>


  		




  9
  
  
    
  <KEYSTATEMENT ID="3"/>


  		




  
  4
  
    
  <POLYTOMOUSKEYNODE ID="1" KEY_ID="1" UUID="260e8e6a-c13d-4c0d-85de-8ac6eec155a4"/>


  		




  
  5
  
    
  <POLYTOMOUSKEYNODE ID="2" KEY_ID="1" UUID="97012bdb-b7cd-4dda-ac42-4501ad14102e"  PARENT_ID="1" SORTINDEX="0"  STATEMENT_ID="1" QUESTION_ID="2"/>


  		




  
  6
  
    
  <POLYTOMOUSKEYNODE ID="3" KEY_ID="1" UUID="2e1cd5d1-fe0c-4754-8e6b-c49025696102"  PARENT_ID="1" SORTINDEX="1" STATEMENT_ID="3"/>


  		




  
  7
  
    
  <KEYSTATEMENT ID="1" UUID="7dd20130-9358-4d19-87b9-a544adc713bd"/>


  		




  
  8
  
    
  <KEYSTATEMENT ID="2" UUID="2b766504-5787-4284-a461-57c5c000d008"/>


  		




  
  9
  
    
  <KEYSTATEMENT ID="3" UUID="21174143-2e7f-4d19-886a-dd5277da7597"/>


  		




  10
  10
  
    
  <KEYSTATEMENT_LANGUAGESTRING KEYSTATEMENT_ID="1" LABEL_ID="4" LABEL_MAPKEY_ID="406"/>


  		




  11
  11
  
    
  <KEYSTATEMENT_LANGUAGESTRING KEYSTATEMENT_ID="2" LABEL_ID="5" LABEL_MAPKEY_ID="406"/>


  		




  12
  12
  
    
  <KEYSTATEMENT_LANGUAGESTRING KEYSTATEMENT_ID="3" LABEL_ID="6" LABEL_MAPKEY_ID="406"/>


  		




  13
  13
  
    
  <LANGUAGESTRING ID="4" CREATED="2008-12-10 09:56:07.0" UUID="8641c2b9-df15-452b-9d8a-41ee6f883e8c" UPDATED="2008-12-10 09:56:07.253" LANGUAGE_ID="406" TEXT="This is a nice statement"/>


  		




  14
  14
  
    
  <LANGUAGESTRING ID="5" CREATED="2008-12-10 09:56:07.0" UUID="f1909157-5979-4b92-8d69-910073d5ebfa" UPDATED="2008-12-10 09:56:07.253" LANGUAGE_ID="406" TEXT="This is another statement"/>


  		




  15
  15
  
    
  <LANGUAGESTRING ID="6" CREATED="2008-12-10 09:56:07.0" UUID="8cfcfcb1-a35d-4af3-91dc-d0a71d963413" UPDATED="2008-12-10 09:56:07.253" LANGUAGE_ID="406" TEXT="This is a question"/>


  		




  16
  
  
    
  <TAXONBASE ID="1" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  17
  
  
    
  <TAXONBASE ID="2" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  18
  
  
    
  <TAXONBASE ID="3" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  
  16
  
    
  <TAXONBASE ID="1" UUID="c7305455-5e93-4790-a74d-a29afb175d89" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  
  17
  
    
  <TAXONBASE ID="2" UUID="8a4d1f63-dd51-4fdb-8ad6-84e8f14d6929" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  
  18
  
    
  <TAXONBASE ID="3" UUID="2d3e92b4-184a-4bbe-91fa-b238ca00d1c0" PROTECTEDTITLECACHE="false" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false" EXCLUDED="false" UNPLACED="false" TAXONOMICCHILDRENCOUNT="0" />


  		




  19
  19
  
    
  <POLYTOMOUSKEY_TAXONBASE POLYTOMOUSKEY_ID="1" COVEREDTAXA_ID="1"/>


  		




  20
  20
  
    
  <POLYTOMOUSKEY_TAXONBASE POLYTOMOUSKEY_ID="2" COVEREDTAXA_ID="2"/>


  		




  21
  21
  
    
  <POLYTOMOUSKEY_TAXONBASE POLYTOMOUSKEY_ID="3" COVEREDTAXA_ID="3"/>


  		












Also available in:  Unified diff