From 136d29ba8775420ae3f43d097263e93544bf41ff Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 7 Jul 2017 15:54:07 +0200
Subject: [PATCH] add toString to CdmSource and cleanup and some minor fixes

---
 .../eu/etaxonomy/cdm/config/CdmSource.java    | 22 +++++++++++++++++--
 .../etaxonomy/cdm/database/CdmDataSource.java |  1 -
 .../cdm/database/CdmDataSourceBase.java       |  1 -
 .../cdm/database/CdmPersistentDataSource.java | 16 +++-----------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/CdmSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/CdmSource.java
index e9d9894f69..0fe74ee9f4 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/CdmSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/config/CdmSource.java
@@ -8,13 +8,17 @@
 */
 package eu.etaxonomy.cdm.config;
 
+import org.apache.commons.lang3.StringUtils;
+
+import eu.etaxonomy.cdm.common.CdmUtils;
+
 /**
  * Abstract class representing the base CDM Source object.
  */
 public abstract class CdmSource implements ICdmSource {
 
 	private String name;
-	private String server;
+	protected String server;
 	private int port;
 
 	public static final int NULL_PORT = -1;
@@ -80,7 +84,21 @@ public abstract class CdmSource implements ICdmSource {
 
 	@Override
 	public void closeOpenConnections() {
-
 	}
 
+    @Override
+    public String toString() {
+        if (StringUtils.isBlank(name)&& StringUtils.isBlank(server)){
+            return super.toString();
+        }else{
+            String result = CdmUtils.concat("@", name, server);
+            if (port > 0){
+                result = CdmUtils.concat(":", result, String.valueOf(port));
+            }
+            return result;
+        }
+    }
+
+
+
 }
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
index 9cca535f0e..d1f48cf331 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java
@@ -34,7 +34,6 @@ public class CdmDataSource extends CdmDataSourceBase {
 	private static final Logger logger = Logger.getLogger(CdmDataSource.class);
 
 	private DatabaseTypeEnum dbType;
-	private String server;
 	private String database;
 	private int port = -1;
 	private String username;
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
index 6d455e8515..b4c6727307 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java
@@ -29,7 +29,6 @@ import eu.etaxonomy.cdm.model.metadata.CdmMetaDataPropertyName;
 /**
  * @author a.mueller
  * @created 18.12.2008
- * @veresultSetion 1.0
  */
 abstract class CdmDataSourceBase extends CdmSource implements ICdmDataSource  {
 
diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
index b949d2ac03..cd7466fbc9 100644
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java
@@ -471,13 +471,13 @@ public class CdmPersistentDataSource extends CdmDataSourceBase implements ICdmPe
 			ICdmDataSource dataSource)  throws IllegalArgumentException{
 
 		if(dataSource.getDatabaseType() == null){
-			new IllegalArgumentException("Database type not specified");
+			throw new IllegalArgumentException("Database type not specified");
 		}
 
 		if(dataSource.getDatabaseType().equals(DatabaseTypeEnum.H2)){
 			Class<? extends DataSource> dataSourceClass =  LocalH2.class;
 			if(dataSource.getMode() == null) {
-				new IllegalArgumentException("H2 mode not specified");
+			    throw new IllegalArgumentException("H2 mode not specified");
 			}
 			return save(
 					strDataSourceName,
@@ -565,7 +565,6 @@ public class CdmPersistentDataSource extends CdmDataSourceBase implements ICdmPe
 			CdmPersistentDataSource dataSource = (CdmPersistentDataSource)obj;
 			return (getName() == dataSource.getName());
 		}
-
 	}
 
 	@Override
@@ -573,16 +572,7 @@ public class CdmPersistentDataSource extends CdmDataSourceBase implements ICdmPe
 		if (getName() != null){
 			return getName();
 		}else{
-			return null;
+			return super.toString();
 		}
 	}
-
-
-
-
-
-
-
-
-
 }
-- 
2.34.1