This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 46c638b3863e7e271e9c870c985363b4349cf43a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 26 09:08:05 2015 +0100 refs #6870 Correction API protocol + ajout getProtocolByName --- .../fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 9 ++++++++- .../ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java | 5 +++++ .../persistence/service/ProtocolPersistenceService.java | 3 ++- .../persistence/service/ProtocolPersistenceServiceImpl.java | 12 ++++++++++++ .../java/fr/ifremer/tutti/service/PersistenceService.java | 5 +++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index 292c608..f125b75 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -851,9 +851,16 @@ public class TuttiPersistenceImpl implements TuttiPersistence { @Override public List<String> getAllProtocolNames() { - return getProtocolService().getAllProtocolId(); + return getProtocolService().getAllProtocolNames(); + } + + @Override + public TuttiProtocol getProtocolByName(String protocolName) { + return getProtocolService().getProtocolByName(protocolName); } + + @Override public List<TuttiProtocol> getAllProtocol() { return getProtocolService().getAllProtocol(); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java index 24bcc12..879c146 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java @@ -472,6 +472,11 @@ public class TuttiPersistenceNoDbImpl implements TuttiPersistence { } @Override + public TuttiProtocol getProtocolByName(String protocolName) { + throw notImplemented(); + } + + @Override public void setProtocol(TuttiProtocol protocol) { throw notImplemented(); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java index 605fc55..1d69cba 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceService.java @@ -66,6 +66,8 @@ public interface ProtocolPersistenceService extends TuttiPersistenceServiceImple */ String getFirstAvailableName(String protocolName); + TuttiProtocol getProtocolByName(String protocolName); + List<String> getAllProtocolId(); List<String> getAllProtocolNames(); @@ -79,5 +81,4 @@ public interface ProtocolPersistenceService extends TuttiPersistenceServiceImple TuttiProtocol saveProtocol(TuttiProtocol bean); void deleteProtocol(String protocolId); - } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java index 5fae1fb..ca7bdc2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProtocolPersistenceServiceImpl.java @@ -113,6 +113,18 @@ public class ProtocolPersistenceServiceImpl extends AbstractPersistenceService i } @Override + public TuttiProtocol getProtocolByName(String protocolName) { + + TuttiProtocol result=null; + for (TuttiProtocol protocol : getAllProtocol()) { + if (protocolName.equals(protocol.getName())) + result = protocol; + } + return result; + + } + + @Override public List<String> getAllProtocolId() { File protocolDirectory = config.getProtocolDirectory(); diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java index ca5828f..8512225 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java @@ -1144,6 +1144,11 @@ public class PersistenceService extends AbstractTuttiService implements TuttiPer } @Override + public TuttiProtocol getProtocolByName(String protocolName) { + return driver.getProtocolByName(protocolName); + } + + @Override public TuttiProtocol createProtocol(TuttiProtocol bean) { return driver.createProtocol(bean); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.