Author: bleny Date: 2013-04-09 10:33:34 +0200 (Tue, 09 Apr 2013) New Revision: 80 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: use spec for barcodes Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java 2013-04-09 08:30:06 UTC (rev 79) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Site.java 2013-04-09 08:33:34 UTC (rev 80) @@ -1,7 +1,5 @@ package com.franciaflex.magalie.persistence.entity; -import com.google.common.base.Joiner; - import javax.persistence.Entity; import javax.persistence.Id; @@ -55,7 +53,7 @@ } public String getBarcode() { - String barcode = Joiner.on('_').join("EMPL", getStoreCode(), getLocationCode()); + String barcode = getStoreCode() + getLocationCode(); return barcode; } } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-04-09 08:30:06 UTC (rev 79) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/MagalieBarcodeService.java 2013-04-09 08:33:34 UTC (rev 80) @@ -5,17 +5,11 @@ import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; public class MagalieBarcodeService implements MagalieService { protected MagalieServiceContext serviceContext; - protected static final String BARCODE_ELEMENTS_SEPARATOR = "_"; - - protected static final String ARTICLE_BARCODE_PREFIX = "ART"; - @Override public void setServiceContext(MagalieServiceContext serviceContext) { this.serviceContext = serviceContext; @@ -23,34 +17,14 @@ public Article getArticle(String articleBarcode) throws InvalidMagalieBarcodeException { - Iterable<String> split = Splitter.on(BARCODE_ELEMENTS_SEPARATOR).split(articleBarcode); - - if (Iterables.size(split) != 2) { - - throw new InvalidMagalieBarcodeException("Unexpected barcode format, 2 parts expected"); - - } - - String prefix = Iterables.get(split, 0); - - if ( ! ARTICLE_BARCODE_PREFIX.equals(prefix)) { - - throw new InvalidMagalieBarcodeException( - "not an article barcode. expected prefix '" - + ARTICLE_BARCODE_PREFIX + ", '" + prefix + "' found."); - - } - - String articleCode = Iterables.get(split, 1); - ArticleDao articleDao = serviceContext.getPersistenceContext().getArticleDao(); - Article article = articleDao.findByCode(articleCode); + Article article = articleDao.findByCode(articleBarcode); if (article == null) { throw new InvalidMagalieBarcodeException( - "no article with code " + articleCode); + "no article with code " + articleBarcode); }