From: Andreas Kohlbecker Date: Wed, 20 Oct 2010 14:50:54 +0000 (+0000) Subject: clearer getters for DerivedUnitFacade + PointBeanProcessor X-Git-Tag: 3.0.3~409 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/d4e2728573fded04d1fa9915feaf4fb54ea0850b clearer getters for DerivedUnitFacade + PointBeanProcessor --- diff --git a/.gitattributes b/.gitattributes index c23f24b28e..5365b04663 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3341,6 +3341,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedU cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/MediaBeanProcessor.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/NameRelationshipBeanProcessor.java -text +cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/PointBeanProcessor.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/ReferenceBaseBeanProcessor.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonBeanProcessor.java -text cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java -text diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java index c25bdb29e2..f8e4378c94 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java @@ -197,7 +197,7 @@ public class Abcd206Import extends SpecimenImportBase - - - - - - - + + + + + + + + + - + + + + + + + diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java index 7d1dd4c051..fac72a6712 100644 --- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadePortalController.java @@ -28,14 +28,15 @@ public class DerivedUnitFacadePortalController extends super(); setInitializationStrategy(Arrays.asList(new String []{ "*", - "gatheringEvent.*", + "titleCache", +// "gatheringEvent.*", "ecologyAll", "plantDescriptionAll", - "fieldObservation.*", +// "fieldObservation.*", "fieldObjectMedia.representations.parts", - "derivedUnit.*", +// "derivedUnit.*", "derivedUnitMedia.representations.parts", "derivedUnitDefinitions", diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java index dcece96cc3..e541476b99 100644 --- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java +++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/DerivedUnitFacadeBeanProcessor.java @@ -11,14 +11,14 @@ package eu.etaxonomy.cdm.remote.json.processor.bean; import java.util.List; -import org.hibernate.Hibernate; - import net.sf.json.JSONObject; import net.sf.json.JsonConfig; + +import org.hibernate.Hibernate; + import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException; import eu.etaxonomy.cdm.model.common.Language; -import eu.etaxonomy.cdm.model.location.NamedArea; import eu.etaxonomy.cdm.remote.l10n.LocaleContext; /** @@ -45,8 +45,8 @@ public class DerivedUnitFacadeBeanProcessor extends AbstractBeanProcessor languages = LocaleContext.getLanguages(); - if(Hibernate.isInitialized(bean.getGatheringEvent())){ -// TODO is this needed? addJsonElement(json, jsonConfig, "gatheringEvent", bean.getGatheringEvent()); + if(Hibernate.isInitialized(bean.innerGatheringEvent())){ + addJsonElement(json, jsonConfig, "country",bean.getCountry()); addJsonElement(json, jsonConfig, "collectingAreas", bean.getCollectingAreas()); addJsonElement(json, jsonConfig, "absoluteElevation", bean.getAbsoluteElevation()); @@ -61,7 +61,6 @@ public class DerivedUnitFacadeBeanProcessor extends AbstractBeanProcessor { + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractBeanProcessor#getIgnorePropNames() + */ + @Override + public List getIgnorePropNames() { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractBeanProcessor#processBeanSecondStep(java.lang.Object, net.sf.json.JSONObject, net.sf.json.JsonConfig) + */ + @Override + public JSONObject processBeanSecondStep(Point bean, JSONObject json, + JsonConfig jsonConfig) { + json.element("sexagesimalString", bean.toSexagesimalString(false, true)); + return json; + } + +} diff --git a/cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml b/cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml index 68715314a8..d8ffd2a9ea 100644 --- a/cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml +++ b/cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml @@ -280,6 +280,9 @@ + + + diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java index 207c827453..488805d7be 100644 --- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java +++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java @@ -1011,6 +1011,10 @@ public class DerivedUnitFacade { public LanguageString getLocality(){ return (hasGatheringEvent() ? getGatheringEvent(true).getLocality() : null); } + /** + * convienience method for {@link #getLocality()}.{@link LanguageString#getText() getText()} + * @return + */ @Transient public String getLocalityText(){ LanguageString locality = getLocality(); @@ -1019,6 +1023,10 @@ public class DerivedUnitFacade { } return null; } + /** + * convienience method for {@link #getLocality()}.{@link LanguageString#getLanguage() getLanguage()} + * @return + */ @Transient public Language getLocalityLanguage(){ LanguageString locality = getLocality(); @@ -1066,8 +1074,8 @@ public class DerivedUnitFacade { public boolean hasGatheringEvent(){ return (getGatheringEvent(false) != null); } - @Transient - public GatheringEvent getGatheringEvent() { + + public GatheringEvent innerGatheringEvent() { return getGatheringEvent(false); } @@ -1379,8 +1387,7 @@ public class DerivedUnitFacade { * Returns the field observation as an object. * @return */ - @Transient - public FieldObservation getFieldObservation(){ + public FieldObservation innerFieldObservation(){ return getFieldObservation(false); } @@ -1602,8 +1609,7 @@ public class DerivedUnitFacade { * Returns the derived unit itself. * @return the derived unit */ - @Transient - public DerivedUnitBase getDerivedUnit() { + public DerivedUnitBase innerDerivedUnit() { return this.derivedUnit; } diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java index 7e3441387f..a5371b2981 100644 --- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java +++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java @@ -182,7 +182,7 @@ public class DerivedUnitFacadeTest { */ @Test public void testNewInstance() { - Assert.assertNotNull("The specimen should have been created", specimenFacade.getDerivedUnit()); + Assert.assertNotNull("The specimen should have been created", specimenFacade.innerDerivedUnit()); //??? // Assert.assertNotNull("The derivation event should have been created", specimenFacade.getSpecimen().getDerivedFrom()); // Assert.assertNotNull("The field observation should have been created", specimenFacade.getFieldObservation()); @@ -194,10 +194,10 @@ public class DerivedUnitFacadeTest { */ @Test public void testNewInstanceSpecimen() { - Assert.assertSame("Specimen should be same", specimen, specimenFacade.getDerivedUnit()); - Assert.assertSame("Derivation event should be same", derivationEvent, specimenFacade.getDerivedUnit().getDerivedFrom()); - Assert.assertSame("Field observation should be same", fieldObservation, specimenFacade.getFieldObservation()); - Assert.assertSame("Gathering event should be same", gatheringEvent, specimenFacade.getGatheringEvent()); + Assert.assertSame("Specimen should be same", specimen, specimenFacade.innerDerivedUnit()); + Assert.assertSame("Derivation event should be same", derivationEvent, specimenFacade.innerDerivedUnit().getDerivedFrom()); + Assert.assertSame("Field observation should be same", fieldObservation, specimenFacade.innerFieldObservation()); + Assert.assertSame("Gathering event should be same", gatheringEvent, specimenFacade.innerGatheringEvent()); } @@ -209,7 +209,7 @@ public class DerivedUnitFacadeTest { specimenFacade = DerivedUnitFacade.NewInstance(specimen); specimenFacade.setDistanceToGround(2); FieldObservation specimenFieldObservation = (FieldObservation)specimen.getDerivedFrom().getOriginals().iterator().next(); - Assert.assertSame("Facade gathering event and specimen gathering event should be the same",specimenFacade.getGatheringEvent(), specimenFieldObservation.getGatheringEvent()); + Assert.assertSame("Facade gathering event and specimen gathering event should be the same",specimenFacade.innerGatheringEvent(), specimenFieldObservation.getGatheringEvent()); } catch (DerivedUnitFacadeNotSupportedException e) { Assert.fail("An error should not occur in NewInstance()"); } @@ -221,7 +221,7 @@ public class DerivedUnitFacadeTest { DerivedUnitFacade specimenFacade; try { specimenFacade = DerivedUnitFacade.NewInstance(specimen); - Assert.assertNull("No field observation should exists", specimenFacade.getFieldObservation()); + Assert.assertNull("No field observation should exists", specimenFacade.innerFieldObservation()); } catch (DerivedUnitFacadeNotSupportedException e) { Assert.fail("An error should not occur in NewInstance()"); } @@ -243,7 +243,7 @@ public class DerivedUnitFacadeTest { NamedArea newCollectingArea = NamedArea.NewInstance("A nice area", "nice", "n"); specimenFacade.addCollectingArea(newCollectingArea); Assert.assertEquals("Exactly 1 area must exist", 1, specimenFacade.getCollectingAreas().size()); - Assert.assertSame("Areas should be same", newCollectingArea, specimenFacade.getFieldObservation().getGatheringEvent().getCollectingAreas().iterator().next()); + Assert.assertSame("Areas should be same", newCollectingArea, specimenFacade.innerFieldObservation().getGatheringEvent().getCollectingAreas().iterator().next()); specimenFacade.addCollectingArea(tdwgArea); Assert.assertEquals("Exactly 2 areas must exist", 2, specimenFacade.getCollectingAreas().size()); specimenFacade.removeCollectingArea(newCollectingArea); @@ -372,7 +372,7 @@ public class DerivedUnitFacadeTest { emptyFacade.setDistanceToWaterSurface(13); Assert.assertNotNull("Field observation must exist if distance to water exists", emptyFacade.getFieldObservation(false)); Assert.assertNotNull("Gathering event must exist if distance to water exists", emptyFacade.getGatheringEvent(false)); - FieldObservation specimenFieldObservation = (FieldObservation)emptyFacade.getDerivedUnit().getDerivedFrom().getOriginals().iterator().next(); + FieldObservation specimenFieldObservation = (FieldObservation)emptyFacade.innerDerivedUnit().getDerivedFrom().getOriginals().iterator().next(); Assert.assertSame("Gathering event of facade and of specimen must be the same", specimenFieldObservation.getGatheringEvent(), emptyFacade.getGatheringEvent(false)); } @@ -587,7 +587,7 @@ public class DerivedUnitFacadeTest { Assert.assertNull("Empty facace must not have any field value" ,emptyFacade.getFieldNumber()); emptyFacade.setFieldNumber("1256A"); Assert.assertNotNull("Field observation must exist if field number exists", emptyFacade.getFieldObservation(false)); - FieldObservation specimenFieldObservation = (FieldObservation)emptyFacade.getDerivedUnit().getDerivedFrom().getOriginals().iterator().next(); + FieldObservation specimenFieldObservation = (FieldObservation)emptyFacade.innerDerivedUnit().getDerivedFrom().getOriginals().iterator().next(); Assert.assertSame("Field observation of facade and of specimen must be the same", specimenFieldObservation, emptyFacade.getFieldObservation(false)); Assert.assertEquals("1256A", emptyFacade.getFieldNumber()); } @@ -612,16 +612,16 @@ public class DerivedUnitFacadeTest { Assert.assertFalse("The initial distance to ground should not be 43", specimenFacade.getDistanceToGround() == 43); specimenFacade.setGatheringEvent(newGatheringEvent); Assert.assertTrue("The final distance to ground should be 43", specimenFacade.getDistanceToGround() == 43); - Assert.assertSame("The new gathering event should be 'newGatheringEvent'", newGatheringEvent, specimenFacade.getGatheringEvent()); + Assert.assertSame("The new gathering event should be 'newGatheringEvent'", newGatheringEvent, specimenFacade.innerGatheringEvent()); } /** - * Test method for {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#getGatheringEvent()}. + * Test method for {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#innerGatheringEvent()}. */ @Test public void testGetGatheringEvent() { - Assert.assertNotNull("Gathering event must not be null", specimenFacade.getGatheringEvent()); - Assert.assertEquals("Gathering event must be field observations gathering event", specimenFacade.getFieldObservation().getGatheringEvent(), specimenFacade.getGatheringEvent()); + Assert.assertNotNull("Gathering event must not be null", specimenFacade.innerGatheringEvent()); + Assert.assertEquals("Gathering event must be field observations gathering event", specimenFacade.innerFieldObservation().getGatheringEvent(), specimenFacade.innerGatheringEvent()); } /** @@ -850,11 +850,11 @@ public class DerivedUnitFacadeTest { } /** - * Test method for {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#getDerivedUnit()}. + * Test method for {@link eu.etaxonomy.cdm.api.facade.DerivedUnitFacade#innerDerivedUnit()}. */ @Test public void testGetSpecimen() { - Assert.assertEquals("Specimen must be same", specimen, specimenFacade.getDerivedUnit()); + Assert.assertEquals("Specimen must be same", specimen, specimenFacade.innerDerivedUnit()); } /** @@ -905,7 +905,7 @@ public class DerivedUnitFacadeTest { specimenFacade.removeDuplicate(newSpecimen1); Assert.assertEquals("There should be 1 duplicate now", 1, specimenFacade.getDuplicates().size()); Assert.assertSame("The only duplicate should be 'newSpecimen2' now", newSpecimen2, specimenFacade.getDuplicates().iterator().next()); - specimenFacade.addDuplicate(specimenFacade.getDerivedUnit()); + specimenFacade.addDuplicate(specimenFacade.innerDerivedUnit()); Assert.assertEquals("There should be still 1 duplicate because the facade specimen is not a duplicate", 1, specimenFacade.getDuplicates().size()); Collection newCollection = Collection.NewInstance(); @@ -932,7 +932,7 @@ public class DerivedUnitFacadeTest { } catch (DerivedUnitFacadeNotSupportedException e) { Assert.fail("Multiple derivation events in line should not throw a not supported exception"); } - Assert.assertSame("Gathering event should derive from the derivation line", existingGatheringEvent, specimenFacade.getGatheringEvent()); + Assert.assertSame("Gathering event should derive from the derivation line", existingGatheringEvent, specimenFacade.innerGatheringEvent()); Assert.assertEquals("Mediasize should be 0. Only Imagegallery media are supported", 0, specimenFacade.getFieldObjectMedia().size()); }