Author: tchemit Date: 2012-01-13 18:29:04 +0100 (Fri, 13 Jan 2012) New Revision: 276 Url: http://forge.codelutin.com/repositories/revision/echobase/276 Log: fix more sonar errors Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2012-01-13 17:29:04 UTC (rev 276) @@ -156,7 +156,7 @@ * @param key the configuration option key which contains the location of * the directory to create */ - protected void createDirectory(EchoBaseConfigurationOption key) { + private void createDirectory(EchoBaseConfigurationOption key) { File directory = applicationConfig.getOptionAsFile(key.getKey()); Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-01-13 17:29:04 UTC (rev 276) @@ -226,4 +226,8 @@ return result; } + protected EntitiesUtil() { + // avoid to instanciate helper class + } + } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-13 17:29:04 UTC (rev 276) @@ -202,13 +202,13 @@ try { o = column.parseValue(stringValue); } catch (Exception e) { - throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue); + throw new EchoBaseTechnicalException("Could not parse property [" + propertyName + "] with value " + stringValue, e); } try { column.setValue(entity, o); } catch (Exception e) { throw new EchoBaseTechnicalException( - "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity); + "Could not set property [" + propertyName + "] with value " + stringValue + " to entity " + entity, e); } } @@ -303,7 +303,7 @@ String topiaId = entity.getTopiaId(); - buffer = new StringBuilder(messagePrefix + "\n"); + buffer = new StringBuilder(messagePrefix).append('\n'); if (monitor == null) { // no monitor, means this is a creation of an object Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataAcquisitionLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -71,7 +71,7 @@ TopiaDAO<DataAcquisition> dao = getDAO(); - Map<String, Map<String, Object>> EI_SONDEURByVesselName = Maps.uniqueIndex( + Map<String, Map<String, Object>> eI_SONDEURByVesselName = Maps.uniqueIndex( db.getTable("EI_SONDEUR"), EchoBaseFunctions.newRowFunction("ID_REFSONDEUR")); List<DataAcquisition> dataAcquisitions = Lists.newArrayList(); @@ -87,7 +87,7 @@ AcousticInstrument acousticInstrument = getFK( acousticInstrumentsByName, acousticInstrumentId); Map<String, Object> sondeurRow = getFK( - EI_SONDEURByVesselName, acousticInstrumentId); + eI_SONDEURByVesselName, acousticInstrumentId); Float transceiverAcquisitionAbsorption = (Float) sondeurRow.get("ALPHA"); Float transceiverAcquisitionPower = (Float) sondeurRow.get("PUISSANCE_MAX"); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -35,8 +35,6 @@ import fr.ifremer.echobase.services.DbEditorService; import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.util.csv.Import; import java.io.File; @@ -52,9 +50,6 @@ */ public class EchotypeLoader extends EntityLoader<Echotype> { - /** Logger. */ - private static final Log log = LogFactory.getLog(EchotypeLoader.class); - public EchotypeLoader() { super(Echotype.class, new EchoBaseEntityEnum[]{EchoBaseEntityEnum.Species}, Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -205,9 +205,9 @@ log.info("Import " + entityType + " from " + csvfile); } - TableMeta meta = getTable(entityType); + TableMeta tableMeta = getTable(entityType); - EntityCsvModel<E> csvModel = createCsvImportModel(meta); + EntityCsvModel<E> csvModel = createCsvImportModel(tableMeta); BufferedReader bf = new BufferedReader(new FileReader(csvfile)); try { @@ -218,7 +218,7 @@ DbEditorService dbEditorService = getService(DbEditorService.class); - importNewEntities(dbEditorService, meta, importer); + importNewEntities(dbEditorService, tableMeta, importer); } finally { importer.close(); @@ -232,9 +232,6 @@ bf.close(); } -// File out = getTableFile(outputDir, meta, FileType.NEW); -// getExportService().exportDatas(meta, out); - exportDatas(outputDir, FileType.NEW); exportAssociations(outputDir, FileType.ASSOCIATION); @@ -245,7 +242,9 @@ } } - protected void importNewEntities(DbEditorService dbEditorService, TableMeta meta, Import<E> importer) { + protected void importNewEntities(DbEditorService dbEditorService, + TableMeta meta, + Import<E> importer) { for (E entity : importer) { dbEditorService.saveEntity(meta, @@ -291,7 +290,9 @@ } } - protected void exportData(File outputDir, FileType targetType, TableMeta meta) throws IOException { + protected void exportData(File outputDir, + FileType targetType, + TableMeta meta) throws IOException { File out = getTableFile(outputDir, meta, targetType); @@ -322,7 +323,8 @@ return new File(parentDir, meta.getFilename()); } - public void copyStreamToFile(File file, FileType fileType) throws IOException { + public void copyStreamToFile(File file, + FileType fileType) throws IOException { String path = "/csv/" + fileType.name().toLowerCase() + "/" + file.getName(); InputStream stream = getClass().getResourceAsStream(path); @@ -352,9 +354,10 @@ File out = getTableFile(directory, meta, fileType); copyStreamToFile(out, fileType); - CsvImportResult result = CsvImportResult.newResult(meta.getSource(), - out.getAbsolutePath(), - true); + CsvImportResult result = CsvImportResult.newResult( + meta.getSource(), + out.getAbsolutePath(), + true); BufferedReader bf = new BufferedReader(new FileReader(out)); try { @@ -425,20 +428,20 @@ // load a association input - AssociationMeta meta = (AssociationMeta) entry; + AssociationMeta associationMeta = (AssociationMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + associationMeta); } - EchoBaseEntityEnum target = meta.getTarget(); + EchoBaseEntityEnum target = associationMeta.getTarget(); List<TopiaEntity> targetEntities = getEntities(target); Map<String, TopiaEntity> targetsById = Maps.uniqueIndex(targetEntities, EchoBaseFunctions.TO_TOPIAID); - ImportModel<Map<String, Object>> model = service.buildForImport(meta); + ImportModel<Map<String, Object>> model = service.buildForImport(associationMeta); - EchoBaseEntityEnum sourceType = meta.getSource(); + EchoBaseEntityEnum sourceType = associationMeta.getSource(); ImportToMap importer = ImportToMap.newImport(model, reader); @@ -455,7 +458,7 @@ TopiaEntity targetEntity = targetsById.get(association); associationEntities.add(targetEntity); } - meta.setChilds(e, associationEntities); + associationMeta.setChilds(e, associationEntities); csvResult.incrementsNumberUpdated(); } @@ -468,29 +471,31 @@ // normal entity table import - TableMeta meta = (TableMeta) entry; + TableMeta tableMeta = (TableMeta) entry; if (log.isInfoEnabled()) { - log.info("Will import " + meta); + log.info("Will import " + tableMeta); } - ImportModel<TopiaEntity> model = service.buildForImport(meta); + ImportModel<TopiaEntity> model = service.buildForImport(tableMeta); Import<TopiaEntity> importer = Import.newImport(model, reader); try { - TopiaDAO<TopiaEntity> dao = getDAO(meta.getSource()); + TopiaDAO<TopiaEntity> dao = getDAO(tableMeta.getSource()); for (TopiaEntity entity : importer) { TopiaEntity entityToSave = dao.create(TopiaEntity.TOPIA_ID, entity.getTopiaId()); - meta.copy(entity, entityToSave); + tableMeta.copy(entity, entityToSave); csvResult.incrementsNumberUpdated(); } } catch (Exception eee) { - throw new EchoBaseTechnicalException("Could not import entities of type " + meta.getSource(), eee); + throw new EchoBaseTechnicalException( + "Could not import entities of type " + + tableMeta.getSource(), eee); } finally { importer.close(); Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-13 17:29:04 UTC (rev 276) @@ -122,20 +122,20 @@ } //SONDE - OperationMetadata MeanWaterDepthOperationMeta; + OperationMetadata meanWaterDepthOperationMeta; //JOUR_NUIT - OperationMetadata DielPeriodOperationMeta; + OperationMetadata dielPeriodOperationMeta; //SONDEDEB - OperationMetadata StartWaterDepthOperationMeta; + OperationMetadata startWaterDepthOperationMeta; //SONDEFIN - OperationMetadata EndWaterDepthOperationMeta; + OperationMetadata endWaterDepthOperationMeta; //LFUNES - GearMetadata CableLengthGearMeta; + GearMetadata cableLengthGearMeta; //VMIN - GearMetadata MinSpeedGearMeta; + GearMetadata minSpeedGearMeta; //VMAX - GearMetadata MaxSpeedGearMeta; + GearMetadata maxSpeedGearMeta; TopiaDAO<Operation> dao; TopiaDAO<OperationMetadataValue> operationMetadataValueDAO; @@ -161,38 +161,38 @@ (OperationMetadataDAO) getDAO(OperationMetadata.class); //SONDE - MeanWaterDepthOperationMeta = + meanWaterDepthOperationMeta = operationMetadataDAO.findByName("MeanWaterDepth"); - Preconditions.checkNotNull(MeanWaterDepthOperationMeta); + Preconditions.checkNotNull(meanWaterDepthOperationMeta); //JOUR_NUIT - DielPeriodOperationMeta = + dielPeriodOperationMeta = operationMetadataDAO.findByName("DielPeriod"); - Preconditions.checkNotNull(DielPeriodOperationMeta); + Preconditions.checkNotNull(dielPeriodOperationMeta); //SONDEDEB - StartWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + startWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "ShootingStart" ); - Preconditions.checkNotNull(StartWaterDepthOperationMeta); + Preconditions.checkNotNull(startWaterDepthOperationMeta); //SONDEFIN - EndWaterDepthOperationMeta = operationMetadataDAO.findByProperties( + endWaterDepthOperationMeta = operationMetadataDAO.findByProperties( OperationMetadata.PROPERTY_NAME, "WaterDepth", OperationMetadata.PROPERTY_OPERATION_EVENT + "." + OperationEvent.PROPERTY_NAME, "HaulingEnd" ); - Preconditions.checkNotNull(EndWaterDepthOperationMeta); + Preconditions.checkNotNull(endWaterDepthOperationMeta); GearMetadataDAO gearMetadataDAO = (GearMetadataDAO) getDAO(GearMetadata.class); //LFUNES - CableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); - Preconditions.checkNotNull(CableLengthGearMeta); + cableLengthGearMeta = gearMetadataDAO.findByType("CableLength"); + Preconditions.checkNotNull(cableLengthGearMeta); //VMIN - MinSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); - Preconditions.checkNotNull(MinSpeedGearMeta); + minSpeedGearMeta = gearMetadataDAO.findByType("MinSpeed"); + Preconditions.checkNotNull(minSpeedGearMeta); //VMAX - MaxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); - Preconditions.checkNotNull(MaxSpeedGearMeta); + maxSpeedGearMeta = gearMetadataDAO.findByType("MaxSpeed"); + Preconditions.checkNotNull(maxSpeedGearMeta); dao = getDAO(); operationMetadataValueDAO = getDAO(OperationMetadataValue.class); @@ -324,31 +324,31 @@ ); addOperationMetadataValue(operation, - MeanWaterDepthOperationMeta, + meanWaterDepthOperationMeta, row.get("SONDE")); addOperationMetadataValue(operation, - DielPeriodOperationMeta, + dielPeriodOperationMeta, row.get("JOUR_NUIT")); addOperationMetadataValue(operation, - StartWaterDepthOperationMeta, + startWaterDepthOperationMeta, row.get("SONDEDEB")); addOperationMetadataValue(operation, - EndWaterDepthOperationMeta, + endWaterDepthOperationMeta, row.get("SONDEFIN")); addGearMetadataValue(operation, - CableLengthGearMeta, + cableLengthGearMeta, row.get("LFUNES")); addGearMetadataValue(operation, - MinSpeedGearMeta, + minSpeedGearMeta, row.get("VMIN")); addGearMetadataValue(operation, - MaxSpeedGearMeta, + maxSpeedGearMeta, row.get("VMAX")); return operation; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/AbstractLoadPage.java 2012-01-13 17:29:04 UTC (rev 276) @@ -73,11 +73,11 @@ public void load() throws Exception { entityTypes = Maps.newTreeMap(); DbMeta dbMeta = getEchoBaseApplicationContext().getDbMeta(); - for (TableMeta tableMeta : dbMeta) { + for (TableMeta meta : dbMeta) { // keep only editable metas - if (dbMeta.isEditable(tableMeta)) { - String name = tableMeta.getName(); + if (dbMeta.isEditable(meta)) { + String name = meta.getName(); entityTypes.put(name, name); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2012-01-13 17:29:04 UTC (rev 276) @@ -50,8 +50,8 @@ /** id of entity to save. */ protected String topiaId; - /** Metas of the table */ - protected TableMeta tableMeta; +// /** Metas of the table */ +// protected TableMeta tableMeta; protected Map<String, String[]> params; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Create.java 2012-01-13 17:29:04 UTC (rev 276) @@ -56,15 +56,15 @@ } public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToCreate = getUser(); + String userEmail = userToCreate.getEmail(); if (log.isInfoEnabled()) { log.info("will create user " + userEmail); } // create user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToCreate); // add info message addActionMessage(_("echobase.info.user.create", userEmail)); @@ -74,8 +74,8 @@ @Override public void validate() { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToValidate = getUser(); + String userEmail = userToValidate.getEmail(); // login + password required if (StringUtils.isEmpty(userEmail)) { @@ -101,7 +101,7 @@ } } - String userPassword = user.getPassword(); + String userPassword = userToValidate.getPassword(); if (StringUtils.isEmpty(userPassword)) { // empty user password Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToDelete = getUser(); + String userEmail = userToDelete.getEmail(); if (log.isInfoEnabled()) { log.info("will delete user " + userEmail); } // delete user - getUserService().delete(user); + getUserService().delete(userToDelete); // add info message addActionMessage(_("echobase.info.user.delete", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-01-13 17:29:04 UTC (rev 276) @@ -58,15 +58,15 @@ @Override public String execute() throws Exception { - EchoBaseUserDTO user = getUser(); - String userEmail = user.getEmail(); + EchoBaseUserDTO userToUpdate = getUser(); + String userEmail = userToUpdate.getEmail(); if (log.isInfoEnabled()) { log.info("will update user " + userEmail); } // update user - getUserService().createOrUpdate(user); + getUserService().createOrUpdate(userToUpdate); // add info message addActionMessage(_("echobase.info.user.update", userEmail)); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:06:50 UTC (rev 275) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-01-13 17:29:04 UTC (rev 276) @@ -65,8 +65,8 @@ boolean autoLogin = EchoBaseActionSupport.getEchoBaseApplicationContext() - .getConfiguration() - .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); + .getConfiguration() + .getOptionAsBoolean(EchoBaseConfiguration.OPTION_AUTO_LOGIN); if (autoLogin) { // by-pass login @@ -74,12 +74,12 @@ if (log.isInfoEnabled()) { log.info("AutotLogin with admin/admin user"); } - LoginAction loginAction = new LoginAction(); - loginAction.setSession(invocation.getInvocationContext().getSession()); - loginAction.setEmail("admin"); - loginAction.setPassword("admin"); + LoginAction logAction = new LoginAction(); + logAction.setSession(invocation.getInvocationContext().getSession()); + logAction.setEmail("admin"); + logAction.setPassword("admin"); try { - loginAction.doLogin(); + logAction.doLogin(); } catch (Exception eee) { if (log.isErrorEnabled()) { log.error("Could not auto-login", eee);