Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 25fc0f69 by tchemit at 2018-11-13T17:36:26Z clean some code + sue last pom - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - dto/pom.xml - persistence/pom.xml - pom.xml - server-core/pom.xml - server-core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java - server-core/src/main/java/fr/ird/observe/server/controller/ConfigurationController.java - server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java - services-client/pom.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/backup/BackupsManager.java ===================================== @@ -30,8 +30,8 @@ import fr.ird.observe.client.db.ObserveDataSourcesManager; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.persistence.script.TopiaSqlScript; import java.io.BufferedReader; @@ -181,15 +181,11 @@ public class BackupsManager implements Closeable { } public List<BackupStorage> getAutomaticBackups() { - List<BackupStorage> result = backups.stream().filter(BackupStorage::isAutomatic).collect(Collectors.toList()); - result.sort(Comparator.comparing(BackupStorage::getDate).reversed()); - return result; + return backups.stream().filter(BackupStorage::isAutomatic).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } public List<BackupStorage> getUserBackups() { - List<BackupStorage> result = backups.stream().filter(BackupStorage::isUser).collect(Collectors.toList()); - result.sort(Comparator.comparing(BackupStorage::getDate).reversed()); - return result; + return backups.stream().filter(BackupStorage::isUser).sorted(Comparator.comparing(BackupStorage::getDate).reversed()).collect(Collectors.toList()); } public void addAutomaticBackup(Path backupPath) { ===================================== dto/pom.xml ===================================== @@ -113,11 +113,7 @@ <artifactId>gson</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>com.google.auto.service</groupId> - <artifactId>auto-service</artifactId> - <scope>provided</scope> - </dependency> + <!-- Swingx --> <dependency> ===================================== persistence/pom.xml ===================================== @@ -183,6 +183,28 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> ===================================== pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.72</version> + <version>2018.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -159,7 +159,7 @@ <observeToolkitVersion>4.8-SNAPSHOT</observeToolkitVersion> <!--<lib.version.java4all.topia>1.1.1</lib.version.java4all.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> - <!--<lib.version.java4all.jaxx>3.0-alpha-42-SNAPSHOT</lib.version.java4all.jaxx>--> + <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>--> <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>--> ===================================== server-core/pom.xml ===================================== @@ -90,10 +90,6 @@ <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -186,6 +182,16 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> ===================================== server-core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java ===================================== @@ -34,7 +34,6 @@ import fr.ird.observe.server.injector.ObserveReferenceSetRequestInjector; import fr.ird.observe.server.injector.SqlScriptProducerRequestInjector; import fr.ird.observe.server.injector.TopiaSqlScriptInjector; import io.ultreia.java4all.http.HRequestBuilder; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -42,6 +41,7 @@ import org.debux.webmotion.server.WebMotionServerListener; import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; +import java.io.IOException; import java.util.Date; /** @@ -85,23 +85,19 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { context.getServletContext().setAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); - if (log.isInfoEnabled()) { - log.info("Initializing " + ObserveWebApplicationListener.class.getName() + " done."); - } + log.info("Initializing " + ObserveWebApplicationListener.class.getName() + " done."); } @Override public void onStop(ServerContext context) { - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveWebApplicationListener.class.getName()); - } - - IOUtils.closeQuietly(applicationContext); - - if (log.isInfoEnabled()) { - log.info("Destroying " + ObserveWebApplicationListener.class.getName() + " done."); + log.info("Destroying " + ObserveWebApplicationListener.class.getName()); + try { + applicationContext.close(); + } catch (IOException e) { + log.error("Error while closing application context", e); } + log.info("Destroying " + ObserveWebApplicationListener.class.getName() + " done."); } } ===================================== server-core/src/main/java/fr/ird/observe/server/controller/ConfigurationController.java ===================================== @@ -35,12 +35,12 @@ import fr.ird.observe.server.configuration.user.ObserveWebUsers; import fr.ird.observe.server.configuration.user.ObserveWebUsersHelper; import fr.ird.observe.server.security.ObserveWebSecurityApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; -import org.apache.commons.io.IOUtils; import org.debux.webmotion.server.WebMotionContextable; import org.debux.webmotion.server.render.RenderContent; +import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStream; +import java.io.InputStreamReader; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.util.Map; @@ -108,11 +108,13 @@ public class ConfigurationController extends ObserveWebMotionController { } { - try (InputStream mappingUrl = getClass().getResourceAsStream("/mapping")) { - String content = IOUtils.toString(mappingUrl, StandardCharsets.UTF_8); - builder.append("\n~~~ Mapping ~~~\n").append(content); + try (BufferedReader mappingUrl = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/mapping"), StandardCharsets.UTF_8))) { + String line; + builder.append("\n~~~ Mapping ~~~\n"); + while ((line = mappingUrl.readLine()) != null) { + builder.append(line).append("\n"); + } } - } return toTextPlain(builder.toString()); ===================================== server-core/src/main/java/fr/ird/observe/server/injector/ImmutableSetInjector.java ===================================== @@ -29,8 +29,8 @@ import org.apache.logging.log4j.Logger; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.handler.ExecutorParametersInjectorHandler; import org.debux.webmotion.server.mapping.Mapping; -import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl; +import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.Collection; import java.util.Objects; @@ -49,7 +49,6 @@ import java.util.Objects; */ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.Injector { - /** Logger. */ private static final Logger log = LogManager.getLogger(ImmutableSetInjector.class); private final Gson gson; @@ -74,7 +73,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I String[] values = (String[]) parameterTree.getValue(); StringBuilder value = new StringBuilder(values[0]); if ((value.length() > 0) && !value.toString().contains("[")) { - if (((ParameterizedTypeImpl) generic).getActualTypeArguments()[0].equals(String.class)) { + if (((ParameterizedType) generic).getActualTypeArguments()[0].equals(String.class)) { value = new StringBuilder(); for (String s : values) { value.append(", \"").append(s).append("\""); @@ -90,9 +89,7 @@ public class ImmutableSetInjector implements ExecutorParametersInjectorHandler.I } result = builder.build(); - if (log.isInfoEnabled()) { - log.info("Inject ImmutableSet: " + result); - } + log.info("Inject ImmutableSet: " + result); } ===================================== services-client/pom.xml ===================================== @@ -140,6 +140,16 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>com.google.auto.service</groupId> + <artifactId>auto-service</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25fc0f69dfc714a010c86818a5ef... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/25fc0f69dfc714a010c86818a5ef... You're receiving this email because of your account on gitlab.com.