From 5215f59f336ff5a09cc91e9837e17f0f5751abe6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Thu, 13 Oct 2016 13:59:47 +0200 Subject: [PATCH] ref #3658 remove nomenclatural code from datasources --- .../CdmModelCacherConnectionProvider.java | 2 +- .../source/CdmPersistentRemoteSource.java | 15 +---------- .../remoting/source/CdmRemoteSource.java | 10 +++---- .../remoting/source/CdmRemoteSourceBase.java | 26 +------------------ .../remoting/source/CdmServerInfo.java | 4 +-- 5 files changed, 10 insertions(+), 47 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacherConnectionProvider.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacherConnectionProvider.java index 6297b5b6c..0a5797ae6 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacherConnectionProvider.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/cache/CdmModelCacherConnectionProvider.java @@ -25,7 +25,7 @@ public class CdmModelCacherConnectionProvider extends DatasourceConnectionProvid String database = "xyz"; String path = "C:\\Users\\a.mueller\\.cdmLibrary\\writableResources\\h2\\LocalH2_" + database; String username = "sa"; - CdmDataSource dataSource = CdmDataSource.NewH2EmbeddedInstance("cdmTest", username, "", path, NomenclaturalCode.ICNAFP); + CdmDataSource dataSource = CdmDataSource.NewH2EmbeddedInstance("cdmTest", username, "", path); return dataSource; } diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java index e40e3625f..3e7f33488 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmPersistentRemoteSource.java @@ -29,13 +29,13 @@ import eu.etaxonomy.cdm.config.CdmPersistentSourceUtils; import eu.etaxonomy.cdm.config.CdmPersistentXMLSource; import eu.etaxonomy.cdm.config.CdmPersistentXMLSource.CdmSourceProperties; import eu.etaxonomy.cdm.config.ICdmPersistentSource; -import eu.etaxonomy.cdm.model.name.NomenclaturalCode; /** * Class representing a CDM remote source which can be persisted to a source config file * */ public class CdmPersistentRemoteSource extends CdmRemoteSourceBase implements ICdmPersistentSource{ + @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(CdmPersistentRemoteSource.class); public static final String REMOTESOURCE_BEAN_POSTFIX = "RemoteSource"; @@ -98,15 +98,8 @@ public class CdmPersistentRemoteSource extends CdmRemoteSourceBase implements IC if(!cdmSourceProperties.containsKey(CdmSourceProperties.CONTEXTPATH.toString())) { throw new CdmRemoteSourceException("Could not initialise remote source. Required property '" + CdmSourceProperties.SERVER.toString() + "' is missing"); } - // default NomenclaturalCode is always ICNAFP - if(!cdmSourceProperties.containsKey(CdmSourceProperties.NOMENCLATURAL_CODE.toString())) { - cdmSourceProperties.put(CdmSourceProperties.NOMENCLATURAL_CODE.toString(), NomenclaturalCode.ICNAFP.name()); - } } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.config.ICdmPersistentSource#getBeanName() - */ @Override public String getBeanName() { return beanName; @@ -133,17 +126,11 @@ public class CdmPersistentRemoteSource extends CdmRemoteSourceBase implements IC return cdmSourceProperties.getProperty(CdmSourceProperties.CONTEXTPATH.toString()); } - @Override - public NomenclaturalCode getNomenclaturalCode() { - return NomenclaturalCode.fromString(cdmSourceProperties.getProperty(CdmSourceProperties.NOMENCLATURAL_CODE.toString())); - } - public static CdmPersistentRemoteSource save(String strRemoteSourceName, ICdmRemoteSource remoteSource) throws CdmRemoteSourceException { Properties cdmSourceProperties = new Properties(); cdmSourceProperties.put(CdmSourceProperties.SERVER.toString(), remoteSource.getServer()); cdmSourceProperties.put(CdmSourceProperties.PORT.toString(), String.valueOf(remoteSource.getPort())); cdmSourceProperties.put(CdmSourceProperties.CONTEXTPATH.toString(), remoteSource.getContextPath()); - cdmSourceProperties.put(CdmSourceProperties.NOMENCLATURAL_CODE.toString(), remoteSource.getNomenclaturalCode().name()); checkProperties(cdmSourceProperties); return save(strRemoteSourceName, cdmSourceProperties); } diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java index 473cdca0f..ed950a4b5 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSource.java @@ -27,7 +27,7 @@ public class CdmRemoteSource extends CdmRemoteSourceBase { * @return */ public static CdmRemoteSource NewInstance() { - return new CdmRemoteSource(DEFAULT_NAME, DEFAULT_SERVER, DEFAULT_PORT, DEFAULT_CONTEXT_PATH, DEFAULT_NOMENCLATURAL_CODE); + return new CdmRemoteSource(DEFAULT_NAME, DEFAULT_SERVER, DEFAULT_PORT, DEFAULT_CONTEXT_PATH); } /** @@ -40,8 +40,8 @@ public class CdmRemoteSource extends CdmRemoteSourceBase { * @param nomenclaturalCode * @return */ - public static CdmRemoteSource NewInstance(String name, String server, int port, String contextPath, NomenclaturalCode nomenclaturalCode) { - return new CdmRemoteSource(name, server, port, contextPath, nomenclaturalCode); + public static CdmRemoteSource NewInstance(String name, String server, int port, String contextPath) { + return new CdmRemoteSource(name, server, port, contextPath); } /** @@ -53,8 +53,8 @@ public class CdmRemoteSource extends CdmRemoteSourceBase { * @param contextPath * @param nomenclaturalCode */ - private CdmRemoteSource(String name, String server, int port, String contextPath, NomenclaturalCode nomenclaturalCode) { - super(name, server, port, contextPath, nomenclaturalCode); + private CdmRemoteSource(String name, String server, int port, String contextPath) { + super(name, server, port, contextPath); } diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java index 59c24ea3b..b349a4b23 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmRemoteSourceBase.java @@ -15,7 +15,6 @@ import eu.etaxonomy.cdm.api.service.IMetadataService; import eu.etaxonomy.cdm.config.CdmSource; import eu.etaxonomy.cdm.config.CdmSourceException; import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName; -import eu.etaxonomy.cdm.model.name.NomenclaturalCode; /** * Base class representing a CDM remote source. @@ -29,7 +28,6 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { protected static final String DEFAULT_SERVER = "127.0.0.1"; protected static final int DEFAULT_PORT = 8080; protected static final String DEFAULT_CONTEXT_PATH = ""; - protected static final NomenclaturalCode DEFAULT_NOMENCLATURAL_CODE = NomenclaturalCode.ICNAFP; private String contextPath; private String baseUrl; @@ -44,7 +42,6 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { setServer(DEFAULT_SERVER); setPort(DEFAULT_PORT); setContextPath(DEFAULT_CONTEXT_PATH); - setNomenclaturalCode(DEFAULT_NOMENCLATURAL_CODE); } /** @@ -56,19 +53,14 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { * @param contextPath * @param nomenclaturalCode */ - public CdmRemoteSourceBase(String name, String server, int port, String contextPath, NomenclaturalCode nomenclaturalCode) { + public CdmRemoteSourceBase(String name, String server, int port, String contextPath) { setName(name); setServer(server); setPort(port); setContextPath(contextPath); - setNomenclaturalCode(nomenclaturalCode); metadataService = CdmApplicationRemoteConfiguration.getMetadataService(this); } - - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.remote.ICdmRemoteSource#getBaseUrl() - */ @Override public String getBaseUrl() { return baseUrl; @@ -86,9 +78,6 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { this.baseUrl = baseUrl; } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.remote.ICdmRemoteSource#getContextPath() - */ @Override public String getContextPath() { return contextPath; @@ -105,27 +94,18 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { this.contextPath = contextPath; } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.config.CdmSource#getDbSchemaVersion() - */ @Override public String getDbSchemaVersion() throws CdmSourceException { return metadataService.getDbSchemaVersion(); } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.config.CdmSource#isDbEmpty() - */ @Override public boolean isDbEmpty() throws CdmSourceException { return metadataService.isDbEmpty(); } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.config.CdmSource#checkConnection() - */ @Override public boolean checkConnection() throws CdmSourceException { // assuming that database service works implies @@ -138,9 +118,6 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { return true; } - /* (non-Javadoc) - * @see eu.etaxonomy.cdm.config.CdmSource#getConnectionMessage() - */ @Override public String getConnectionMessage() { return "Connecting to Remote CDM Instance " + getName() + ":" + getPort() + "/" + getContextPath(); @@ -152,5 +129,4 @@ public class CdmRemoteSourceBase extends CdmSource implements ICdmRemoteSource { return metadataService.getCdmMetadataMap(); } - } diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java index 2a5f81522..d54986bc7 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java @@ -255,8 +255,8 @@ public class CdmServerInfo { return CdmRemoteSource.NewInstance(name, server, port, - instance.getBasePath(), - null); + instance.getBasePath() + ); } return null; } -- 2.34.1