Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d83d499 by Tony CHEMIT at 2017-07-05T10:17:26+02:00 Rename ping method to getModelVersion + clean code - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java - application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java - services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java - services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java - services/src/main/java/fr/ird/observe/services/service/PingService.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -1701,7 +1701,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { if (!error) { - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); Version clientModelVersion = getModelVersion(); if (!Objects.equals(clientModelVersion, modelServerVersion)) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -205,7 +205,7 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { PingService pingService = dataSource.newPingService(); - Version modelServerVersion = pingService.ping(); + Version modelServerVersion = pingService.getModelVersion(); if (!modelVersion.equals(modelServerVersion)) { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/PingServiceController.java @@ -35,7 +35,7 @@ import org.nuiton.version.Versions; public class PingServiceController extends ObserveWebMotionController implements PingService { @Override - public Version ping() { + public Version getModelVersion() { return getApplicationConfiguration().getModelVersion(); } ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/RestTestMethodResource.java @@ -81,7 +81,7 @@ public class RestTestMethodResource extends TestMethodResourceSupport<RestTestCl PingService service = testClassResource.newService(dataSourceConfiguration, PingService.class); try { - Version serverVersion = service.ping(); + Version serverVersion = service.getModelVersion(); Version modelVersion = ObserveTestConfiguration.getModelVersion(); if (!serverVersion.equals(modelVersion)) { serverExist = false; ===================================== services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java ===================================== --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/PingServiceRestTest.java @@ -45,7 +45,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setServerUrl(new URL("http://fake_" + System.nanoTime())); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } @@ -57,7 +57,7 @@ public class PingServiceRestTest extends AbstractServiceRestTest { dataSourceConfiguration.setLogin("fake_" + System.nanoTime()); PingService service = REST_TEST_CLASS_RESOURCE.newService(dataSourceConfiguration, PingService.class); - service.ping(); + service.getModelVersion(); } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -22,23 +22,22 @@ package fr.ird.observe.services.topia.service; * #L% */ -import com.google.common.base.Optional; -import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.topia.ObserveServiceTopia; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; +import java.util.Optional; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.support.TopiaSqlQuery; /** * Created on 07/09/16. @@ -69,10 +68,10 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L private <E extends ObserveEntity> void updateLastUpdateDate(Class<E> entityType) { - Optional<LastUpdateDate> optionalLastUpdateDate = getTopiaPersistenceContext().getLastUpdateDateDao() + Optional<LastUpdateDate> optionalLastUpdateDate = Optional.ofNullable(getTopiaPersistenceContext().getLastUpdateDateDao() .forTypeEquals(entityType.getName()) .setOrderByArguments(LastUpdateDate.PROPERTY_LAST_UPDATE_DATE + " DESC") - .tryFindFirst(); + .tryFindFirst().orNull()); if (!optionalLastUpdateDate.isPresent()) { return; @@ -90,7 +89,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT max(lastUpdateDate)::TIMESTAMP FROM " + schemaName + "." + tableName); + return connection.prepareStatement(String.format("SELECT max(lastUpdateDate)::TIMESTAMP FROM %s.%s", schemaName, tableName)); } @Override @@ -102,7 +101,7 @@ public class LastUpdateDateServiceTopia extends ObserveServiceTopia implements L if (maxLastUpdateDate != null && lastUpdateDate.getLastUpdateDate().before(maxLastUpdateDate)) { if (log.isInfoEnabled()) { - log.info("Update LastUpdateDate for " + entityType.getName() + " with value: " + maxLastUpdateDate); + log.info(String.format("Update LastUpdateDate for %s with value: %s", entityType.getName(), maxLastUpdateDate)); } lastUpdateDate.setLastUpdateDate(maxLastUpdateDate); } ===================================== services/src/main/java/fr/ird/observe/services/service/PingService.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/PingService.java +++ b/services/src/main/java/fr/ird/observe/services/service/PingService.java @@ -34,7 +34,7 @@ import org.nuiton.version.Version; public interface PingService extends ObserveService { @NoDataAccess - Version ping(); + Version getModelVersion(); @NoDataAccess Version getServerVersion(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d95... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d83d4994ee94d9ceca74ff80d95... You're receiving this email because of your account on gitlab.com.