This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit c2188a87d50574e5352f20240b412f2febd5c7a8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 24 20:41:05 2015 +0100 change rank order to short for gear + only check gear on operation if there is one --- .../genericformat/GenericFormatImportValidationHelper.java | 6 ++---- .../consumer/CsvConsumerForGearCaracteristic.java | 2 +- .../genericformat/consumer/CsvConsumerForOperation.java | 12 +++++++----- .../consumer/GearNotFoundInCruiseException.java | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java index 28a313e..91c2bba 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportValidationHelper.java @@ -92,10 +92,8 @@ public class GenericFormatImportValidationHelper implements Closeable { return cruiseContext; } - - - - public <R extends RowWithCruiseContextSupport> Gear getGear(CsvComsumer<R, ?> consumer, GenericFormatImportContext importContext, ImportRow<R> row, Gear gear, int rankOrder) { + + public <R extends RowWithCruiseContextSupport> Gear getGear(CsvComsumer<R, ?> consumer, GenericFormatImportContext importContext, ImportRow<R> row, Gear gear, short rankOrder) { Cruise cruise = row.getBean().getCruise(); GenericFormatImportCruiseContext cruiseContext = importContext.getCruiseContext(cruise); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java index c051f76..1450bd5 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForGearCaracteristic.java @@ -42,7 +42,7 @@ public class CsvConsumerForGearCaracteristic extends CsvComsumer<GearCaracterist GearCaracteristicRow bean = row.getBean(); Gear gear = bean.getGear(); - int rankOrder = bean.getRankOrder(); + short rankOrder = bean.getRankOrder(); Gear cruiseGear = validationHelper.getGear(this, importContext, row, gear, rankOrder); if (cruiseGear != null) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java index 3a4619e..60b340e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForOperation.java @@ -51,13 +51,15 @@ public class CsvConsumerForOperation extends CsvComsumer<OperationRow, Operation } else { Gear gear = bean.getGear(); - int rankOrder = bean.getGearRankOrder(); + Short rankOrder = bean.getGearRankOrder(); - Gear cruiseGear = validationHelper.getGear(this, importContext, row, gear, rankOrder); - if (cruiseGear != null) { - bean.setGear(cruiseGear); - } + if (gear != null && rankOrder != null) { + Gear cruiseGear = validationHelper.getGear(this, importContext, row, gear, rankOrder); + if (cruiseGear != null) { + bean.setGear(cruiseGear); + } + } NuitonValidatorResult validatorResult = validationHelper.validateFishingOperation(fishingOperation); if (validatorResult.hasFatalMessages()) { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/GearNotFoundInCruiseException.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/GearNotFoundInCruiseException.java index 5dd59e5..070c5e0 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/GearNotFoundInCruiseException.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/GearNotFoundInCruiseException.java @@ -19,9 +19,9 @@ public class GearNotFoundInCruiseException extends Exception { private final Gear gear; - private final int rankOrder; + private final short rankOrder; - public GearNotFoundInCruiseException(Cruise cruise, Gear gear, int rankOrder) { + public GearNotFoundInCruiseException(Cruise cruise, Gear gear, short rankOrder) { this.cruise = cruise; this.gear = gear; this.rankOrder = rankOrder; @@ -35,7 +35,7 @@ public class GearNotFoundInCruiseException extends Exception { return gear; } - public int getRankOrder() { + public short getRankOrder() { return rankOrder; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.