branch feature/7549 updated (6910618 -> 9ca1de5)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git from 6910618 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) new 5d38d12 rendre serializable la connexion a une source de donnees new 61939e6 fix typo new 9ca1de5 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9ca1de5071aceb4ec8b4fe32326fe4771714ca4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:59:19 2015 +0200 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean commit 61939e6ecf4092efe258e27e7316f43c5eba59cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:48:44 2015 +0200 fix typo commit 5d38d122e12394d59e6afcaf9c9ad091a446bb1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:48:03 2015 +0200 rendre serializable la connexion a une source de donnees Summary of changes: .../observe/ObserveSwingApplicationContext.java | 10 ++--- .../fr/ird/observe/db/ObserveSwingDataSource.java | 44 +++++++++++----------- .../java/fr/ird/observe/db/constantes/DbMode.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 8 ++-- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 2 + .../ObserveDataSourceConnectionRest.java | 2 + .../ObserveDataSourceConnectionTopia.java | 2 + .../ObserveDataSourceConnectionTopiaTaiste.java | 2 + 10 files changed, 44 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git commit 5d38d122e12394d59e6afcaf9c9ad091a446bb1b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:48:03 2015 +0200 rendre serializable la connexion a une source de donnees --- .../observe/services/configuration/ObserveDataSourceConnection.java | 4 +++- .../services/configuration/ObserveDataSourceConnectionSupport.java | 2 ++ .../services/configuration/ObserveDataSourceConnectionRest.java | 2 ++ .../services/configuration/ObserveDataSourceConnectionTopia.java | 2 ++ .../ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java index c151292..a9db404 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnection.java @@ -24,6 +24,8 @@ package fr.ird.observe.services.configuration; import org.nuiton.util.version.Version; +import java.io.Serializable; + /** * Représente une source de donnée une fois la connexion acceptée. * @@ -31,7 +33,7 @@ import org.nuiton.util.version.Version; * * @author Tony Chemit - chemit@codelutin.com */ -public interface ObserveDataSourceConnection { +public interface ObserveDataSourceConnection extends Serializable { /** * @return le jeton qui identifie cette connexion diff --git a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java index a7b52fb..d63e56f 100644 --- a/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java +++ b/observe-services-configuration-api/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionSupport.java @@ -34,6 +34,8 @@ import java.util.Objects; */ public abstract class ObserveDataSourceConnectionSupport implements ObserveDataSourceConnection { + private static final long serialVersionUID = 1L; + protected final String authenticationToken; protected final boolean readReferential; diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java index 1cca594..f91e7f4 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionRest.java @@ -33,6 +33,8 @@ import java.net.URL; */ public class ObserveDataSourceConnectionRest extends ObserveDataSourceConnectionSupport { + private static final long serialVersionUID = 1L; + protected final URL serverUrl; public ObserveDataSourceConnectionRest(URL serverUrl, diff --git a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java index 26d13c0..204164b 100644 --- a/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java +++ b/observe-services-configuration-topia/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConnectionTopia.java @@ -31,6 +31,8 @@ import org.nuiton.util.version.Version; */ public class ObserveDataSourceConnectionTopia extends ObserveDataSourceConnectionSupport { + private static final long serialVersionUID = 1L; + public ObserveDataSourceConnectionTopia(String authenticationToken, boolean readReferential, boolean writeReferential, diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java index 735aa5c..10368c3 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ObserveDataSourceConnectionTopiaTaiste.java @@ -8,6 +8,8 @@ import org.nuiton.util.version.Version; */ public class ObserveDataSourceConnectionTopiaTaiste extends ObserveDataSourceConnectionTopia { + private static final long serialVersionUID = 1L; + public ObserveDataSourceConnectionTopiaTaiste(String authenticationToken) { // on se donne tout les droit pour pouvoir tout tester super(authenticationToken, true, true, true, true, Version.VZERO); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git commit 61939e6ecf4092efe258e27e7316f43c5eba59cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:48:44 2015 +0200 fix typo --- .../src/main/java/fr/ird/observe/db/constantes/DbMode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java b/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java index a7a2876..8755192 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/constantes/DbMode.java @@ -45,7 +45,7 @@ public enum DbMode { n("observe.storage.dbMode.useRemote"), n("observe.storage.dbMode.useRemote.description") ), - /** Pour utiliser une un serveur web distante */ + /** Pour utiliser une base via un serveur web distant */ USE_SERVER( n("observe.storage.dbMode.useServer"), n("observe.storage.dbMode.useServer.description") -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7549 in repository observe. See http://git.codelutin.com/observe.git commit 9ca1de5071aceb4ec8b4fe32326fe4771714ca4c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 16:59:19 2015 +0200 Renommage des méthodes qui font appels à nos listeners pour respecter la norme JavaBean --- .../observe/ObserveSwingApplicationContext.java | 10 ++--- .../fr/ird/observe/db/ObserveSwingDataSource.java | 44 +++++++++++----------- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 8 ++-- .../ird/observe/ui/storage/StorageUIHandler.java | 2 +- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 965b0ee..77fee7f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -599,7 +599,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { public void prepareMainStorage(ObserveSwingDataSource dataSource) { - dataSource.addDataSourceListener(new ObserveSwingDataSourceListenerAdapter() { + dataSource.addObserveSwingDataSourceListener(new ObserveSwingDataSourceListenerAdapter() { @Override public void onOpening(ObserveSwingDataSourceEvent event) { @@ -735,15 +735,15 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { ReferenceSetDto<TripSeineStubDto> tripSeines = tripSeineService.getTripSeineByProgram(programDtoRef.getId()); for (ReferenceDto tripSeine : tripSeines.getReference()) { log.info(" - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL) - + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) - + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); + + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) + + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); } } else if (ProgramDtos.isProgramLongline(programDtoRef)) { ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); for (ReferenceDto tripLongline : tripLonglines.getReference()) { log.info(" - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL) - + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) - + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); + + " " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE) + + " - " + tripLongline.getPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE)); } } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java index 748fbb3..79b781c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java @@ -42,6 +42,8 @@ import static org.nuiton.i18n.I18n.t; */ public class ObserveSwingDataSource extends AbstractSerializableBean { + private static final long serialVersionUID = 1L; + private static final Log log = LogFactory.getLog(ObserveSwingDataSource.class); /** le conteneur de listeners */ @@ -54,7 +56,6 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public ObserveSwingDataSource(ObserveDataSourceConfiguration configuration) { this.configuration = configuration; this.listenerList = new EventListenerList(); - this.connection = null; } public ObserveDataSourceConfiguration getConfiguration() { @@ -85,8 +86,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public Version getVersion() { Version result = null; if (connection != null) { - //FIXME -// result = connection.getVersion(); + result = connection.getVersion(); } return result; } @@ -108,7 +108,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public void open() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException, BabModelVersionException { - Preconditions.checkState(!isOpen(), "Connection is alredy open"); + Preconditions.checkState(!isOpen(), "Connection is already open"); fireNewMessage(t("observe.storage.message.opening", getLabel())); fireOpening(); @@ -122,16 +122,16 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { fireOpened(); } - public void create(DataSourceCreateConfigurationDto creatDto) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { + public void create(DataSourceCreateConfigurationDto createDto) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException { - Preconditions.checkState(!isOpen(), "Connection is alredy open"); + Preconditions.checkState(!isOpen(), "Connection is already open"); fireNewMessage(t("observe.storage.message.creating", getLabel())); fireOpening(); DataSourceService dataSourceService = newService(DataSourceService.class); - connection = dataSourceService.create(configuration, creatDto); + connection = dataSourceService.create(configuration, createDto); fireNewMessage(t("observe.storage.message.created", getLabel())); fireOpened(); @@ -197,7 +197,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { Preconditions.checkState(!isOpen(), "Connection is open"); Version dbVersion = dataSourceInformation.getVersion(); - if (! dataSourceInformation.getMigrations().isEmpty()) { + if (!dataSourceInformation.getMigrations().isEmpty()) { if (dbVersion.before(dataSourceInformation.getMinnimumVersion())) { @@ -273,7 +273,7 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public ObserveDataSourceInformation checkCanConnect() throws DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { - Preconditions.checkState(connection == null, "Connection is alredy open"); + Preconditions.checkState(connection == null, "Connection is already open"); DataSourceService dataSourceService = newService(DataSourceService.class); @@ -296,12 +296,12 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { } - public void addDataSourceListener(ObserveSwingDataSourceListener listener) { + public void addObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { listenerList.add(ObserveSwingDataSourceListener.class, listener); } - public boolean containsDataSourceListener(ObserveSwingDataSourceListener listener) { - ObserveSwingDataSourceListener[] listeners = getDataSourceListeners(); + public boolean containsObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { + ObserveSwingDataSourceListener[] listeners = getObserveSwingDataSourceListener(); for (ObserveSwingDataSourceListener l : listeners) { if (l.equals(listener)) { return true; @@ -310,21 +310,21 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { return false; } - public ObserveSwingDataSourceListener[] getDataSourceListeners() { + public ObserveSwingDataSourceListener[] getObserveSwingDataSourceListener() { return listenerList.getListeners(ObserveSwingDataSourceListener.class); } - public void removeDataSourceListener(ObserveSwingDataSourceListener listener) { + public void removeObserveSwingDataSourceListener(ObserveSwingDataSourceListener listener) { listenerList.remove(ObserveSwingDataSourceListener.class, listener); } - protected void removeDataSourceListeners() { + protected void removeObserveSwingDataSourceListeners() { // remove all listeners - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { if (log.isInfoEnabled()) { log.info("removing listener " + listener); } - removeDataSourceListener(listener); + removeObserveSwingDataSourceListener(listener); } } @@ -334,35 +334,35 @@ public class ObserveSwingDataSource extends AbstractSerializableBean { public void fireNewMessage(String message, ObserveSwingDataSourceEvent.MessageLevel level) { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this, message, level); - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { listener.onNewMessage(evt); } } protected void fireOpening() { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this); - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { listener.onOpening(evt); } } protected void fireOpened() { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this); - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { listener.onOpened(evt); } } protected void fireClosing() { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this); - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { listener.onClosing(evt); } } protected void fireClosed() { ObserveSwingDataSourceEvent evt = new ObserveSwingDataSourceEvent(this); - for (ObserveSwingDataSourceListener listener : getDataSourceListeners()) { + for (ObserveSwingDataSourceListener listener : getObserveSwingDataSourceListener()) { listener.onClosed(evt); } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 6d0d29f..e67bd3a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -366,14 +366,14 @@ public class AdminTabUIHandler implements SendMessageAble { protected void addStorageServiceLogger(ObserveSwingDataSource service) { //FIXME -// if (!service.containsDataSourceListener(serviceLogger)) { -// service.addDataSourceListener(serviceLogger); +// if (!service.containsObserveSwingDataSourceListener(serviceLogger)) { +// service.addObserveSwingDataSourceListener(serviceLogger); // } } protected void removeStorageServiceLogger(DataSource service) { -// if (service.containsDataSourceListener(serviceLogger)) { -// service.removeDataSourceListener(serviceLogger); +// if (service.containsObserveSwingDataSourceListener(serviceLogger)) { +// service.removeObserveSwingDataSourceListener(serviceLogger); // } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 1ce6ffc..7a47fa6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -114,7 +114,7 @@ public class StorageUIHandler { dataSource = new ObserveSwingDataSource(configuration); - dataSource.addDataSourceListener( + dataSource.addObserveSwingDataSourceListener( new ObserveSwingDataSourceListenerAdapter() { @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm