Author: sbavencoff Date: 2014-06-17 10:02:20 +0200 (Tue, 17 Jun 2014) New Revision: 1031 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/1031 Log: refs #4194 : fixe bluid error in jenkins Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-06-16 07:54:40 UTC (rev 1030) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/SpatialService.java 2014-06-17 08:02:20 UTC (rev 1031) @@ -21,6 +21,7 @@ * #L% */ +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.data.Voyage; @@ -37,9 +38,8 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileNotFoundException; +import java.io.FileWriter; import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; import java.util.Scanner; /** @@ -155,12 +155,25 @@ } } + + /** + * Generate map files for this database and this voyage. + * @param conf data base connexion configuration + * @param voyageId voyage identifier for this map + * @return Name of project map + */ public String generateMap(JdbcConfiguration conf, String voyageId) { Preconditions.checkState(StringUtils.isNotBlank(voyageId)); Voyage voyage = persistenceService.getVoyage(voyageId); return generateMap(conf, voyage); } + /** + * Generate map files for this database and this voyage. + * @param conf data base connexion configuration + * @param voyage voyage for this map + * @return Name of project map + */ public String generateMap (JdbcConfiguration conf, Voyage voyage) { Preconditions.checkNotNull(conf); Preconditions.checkNotNull(voyage); @@ -178,6 +191,12 @@ } + /** + * Generate file from template and values + * @param template file template to used + * @param templateValues values to used in the template + * @return file generated + */ protected File generateMapFile(File template, String[] templateValues) { File lizmapTarget = getConfiguration().getLizmapTarget(); @@ -194,19 +213,19 @@ if (!target.isFile()) { Scanner scanner = null; - BufferedWriter writer = null; + BufferedWriter bufferedWriter = null; try { - scanner = new Scanner(template, StandardCharsets.UTF_8.name()); + scanner = new Scanner(template, Charsets.UTF_8.name()); - writer = Files.newBufferedWriter(target.toPath(), StandardCharsets.UTF_8); + bufferedWriter = new BufferedWriter(new FileWriter(target)); String line; while(scanner.hasNextLine() ) { line = scanner.nextLine(); line = StringUtils.replaceEach(line, TEMPLATE_MARKUP, templateValues); - writer.write(line); - writer.newLine(); + bufferedWriter.write(line); + bufferedWriter.newLine(); } } catch (FileNotFoundException e) { throw new EchoBaseTechnicalException(e); @@ -214,9 +233,9 @@ throw new EchoBaseTechnicalException(e); } finally { scanner.close(); - if (writer != null) { + if (bufferedWriter != null) { try { - writer.close(); + bufferedWriter.close(); } catch (IOException e) { throw new EchoBaseTechnicalException(e); } @@ -228,6 +247,12 @@ } + /** + * Extract data value to used in template + * @param conf data base connexion configuration + * @param voyage voyage for this map + * @return values table + */ protected String[] getTemplateValues(JdbcConfiguration conf, Voyage voyage) { String[] templateValues = new String[TEMPLATE_MARKUP.length]; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-06-16 07:54:40 UTC (rev 1030) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/spatial/ShowMap.java 2014-06-17 08:02:20 UTC (rev 1031) @@ -21,16 +21,13 @@ * #L% */ -import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.persistence.JdbcConfiguration; import fr.ifremer.echobase.services.service.spatial.SpatialService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.http.client.utils.URIBuilder; import javax.inject.Inject; -import java.net.URISyntaxException; /** * To display only the spatial data map. @@ -63,16 +60,9 @@ } public String getLizmapUrl() { - String url = null; - try { - URIBuilder uriBuilder = new URIBuilder(getServiceContext().getConfiguration().getLizmapUrl()); - uriBuilder.addParameter("repository", getServiceContext().getConfiguration().getLizmapRepository()); - uriBuilder.addParameter("project", lizmpaProject); - url = uriBuilder.build().toString(); - - } catch (URISyntaxException e) { - throw new EchoBaseTechnicalException(e); - } + String url = getServiceContext().getConfiguration().getLizmapUrl() + "?" + + "repository=" + getServiceContext().getConfiguration().getLizmapRepository() + "&" + + "project=" + lizmpaProject; return url; }