Merge branch 'master' of https://github.com/KnowageLabs/Knowage-Server

Author: masseb974

knowage-core/src/main/java/it/eng/spagobi/api/v2/DataSourceResource.java

@@ -418,7 +418,7 @@ public Response testDataSource(IDataSource dataSource) throws Exception {
 					throw new SpagoBIRestServiceException("Driver not found: " + driver, buildLocaleFromSession(), e);
 				}
 
-				try (Connection connection = DriverManager.getConnection(url, user, pwd)) {
+				try (Connection connection = DriverManager.getConnection(url, user, pwd == null ? dataSource.getPwd() : pwd)) {
 					LOGGER.debug("Connection performed successfully");
 				} catch (SQLException sqlException) {
 					LOGGER.error("Connection failure", sqlException);

knowage-core/src/main/java/it/eng/spagobi/tools/dataset/service/ManageDataSetsForREST.java

@@ -466,7 +466,7 @@ protected IDataSet getGuiGenericDatasetToInsert(JSONObject json, UserProfile use
 					IDataSet existingDataSet = null;
 
 					try {
-						existingDataSet = DAOFactory.getDataSetDAO().loadDataSetById(new Integer(id));
+						existingDataSet = DAOFactory.getDataSetDAO().loadDataSetById(Integer.parseInt(id));
 					} catch (Exception e) {
 						LOGGER.error("Error while getting dataset metadataa", e);
 						throw e;
@@ -1665,12 +1665,6 @@ protected String datasetInsert(IDataSet ds, IDataSetDAO dsDao, Locale locale, Us
 
 		if (ds != null) {
 
-			List<String> persistenceTableNames = dsDao.loadPersistenceTableNames(ds.getId());
-
-			if (persistenceTableNames.stream().anyMatch(tableName -> tableName != null && !tableName.isBlank() && tableName.equalsIgnoreCase(ds.getPersistTableName()))) {
-				throw new SpagoBIRuntimeException("The persistence table with name <" + ds.getPersistTableName().toUpperCase(Locale.ROOT) + "> already exists");
-			}
-
 			String dsLabel = ds.getLabel();
 			String dsName = ds.getName();
 			logParam.put("NAME", dsName);
@@ -1681,9 +1675,16 @@ protected String datasetInsert(IDataSet ds, IDataSetDAO dsDao, Locale locale, Us
 				IDataSet existingByName = dsDao.loadDataSetByName(ds.getName());
 				IDataSet existingByLabel = dsDao.loadDataSetByLabel(ds.getLabel());
 
-				if (id != null && !id.equals("") && !id.equals("0")) {
+				if (id != null && !id.isEmpty() && !id.equals("0")) {
 					validateLabelAndName(id, dsName, dsLabel, existingByName, existingByLabel);
-					ds.setId(Integer.valueOf(id));
+					ds.setId(Integer.parseInt(id));
+
+					List<String> persistenceTableNames = dsDao.loadPersistenceTableNames(ds.getId());
+
+					if (persistenceTableNames.stream().anyMatch(tableName -> tableName != null && !tableName.isBlank() && tableName.equalsIgnoreCase(ds.getPersistTableName()))) {
+						throw new SpagoBIRuntimeException("The persistence table with name <" + ds.getPersistTableName().toUpperCase(Locale.ROOT) + "> already exists");
+					}
+
 					IDataSet existingDataset = dsDao.loadDataSetById(Integer.valueOf(id));
 					clearCacheForDataset(existingDataset);