Author: bleny Date: 2014-07-29 12:33:20 +0200 (Tue, 29 Jul 2014) New Revision: 2175 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2175 Log: refs #4481 remove fields from contact (denormalisation) Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql trunk/wao-persistence/src/main/xmi/wao-model.zargo Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-29 10:23:26 UTC (rev 2174) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactImpl.java 2014-07-29 10:33:20 UTC (rev 2175) @@ -89,15 +89,10 @@ @Override public ObsProgram getObsProgram() { - return ObsProgram.valueOf(getObsProgramOrdinal()); + return getSampleRow().getObsProgram(); } @Override - public void setObsProgram(ObsProgram obsProgram) { - setObsProgramOrdinal(obsProgram.ordinal()); - } - - @Override public SamplingStrategy getSamplingStrategy() { return SamplingStrategy.valueOf(getSamplingStrategyOrdinal()); } @@ -107,12 +102,6 @@ setSamplingStrategyOrdinal(samplingStrategy.ordinal()); } - @Override - public void setSampleRow(SampleRow sampleRow) { - super.setSampleRow(sampleRow); - setObsProgram(sampleRow.getObsProgram()); - } - /** Value is still used but it's no longer written, it's now computed * from the size of observers. */ protected void updateNbObservers() { Modified: trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql =================================================================== --- trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 10:23:26 UTC (rev 2174) +++ trunk/wao-persistence/src/main/resources/db/migration/V4_1__clean_database.sql 2014-07-29 10:33:20 UTC (rev 2175) @@ -47,3 +47,9 @@ DROP TABLE fleet; ALTER TABLE boat DROP COLUMN boatgroup; DROP TABLE boatgroup; + +-- Suppression de quelques dénormalisations + +ALTER TABLE contact DROP COLUMN tidenbdays; +ALTER TABLE contact DROP COLUMN obsprogramordinal; + Modified: trunk/wao-persistence/src/main/xmi/wao-model.zargo =================================================================== (Binary files differ)