Credentials insertion and management changes (59b4b3dc) · Commits · Marco Molinaro / tap_schema_manager

TASMAN-core/src/main/java/it/inaf/ia2/tsm/TapSchema.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,6 @@ import it.inaf.ia2.tsm.model.PropertyModel;
	import it.inaf.ia2.tsm.model.TableModel;		import it.inaf.ia2.tsm.model.TableModel;
	import it.inaf.ia2.tsm.model.TapSchemaModel;		import it.inaf.ia2.tsm.model.TapSchemaModel;
	import it.inaf.ia2.tsm.model.TapSchemaModels;		import it.inaf.ia2.tsm.model.TapSchemaModels;
	import it.inaf.ia2.tsm.model.Tasman;
	import java.io.Serializable;		import java.io.Serializable;
	import java.sql.SQLException;		import java.sql.SQLException;
	import java.util.ArrayList;		import java.util.ArrayList;
	@@ -45,8 +44,6 @@ import org.slf4j.Logger;
	import org.slf4j.LoggerFactory;		import org.slf4j.LoggerFactory;

	/**		/**
	* The main implementation of {@link TapSchema}.
	*
	* @author Sonia Zorba {@literal <zorba at oats.inaf.it>}		* @author Sonia Zorba {@literal <zorba at oats.inaf.it>}
	*/		*/
	public class TapSchema implements EntitiesContainer<Schema>, Serializable {		public class TapSchema implements EntitiesContainer<Schema>, Serializable {

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConfigurationManager.java

+38 −18

Original line number	Original line	Diff line number	Diff line
	@@ -101,6 +101,15 @@ public class ConfigurationManager {
	return Collections.unmodifiableList(usersConfig.getUsers());		return Collections.unmodifiableList(usersConfig.getUsers());
	}		}

			public UserConfiguration getUserConfiguration(String username) {
			for (UserConfiguration user : usersConfig.getUsers()) {
			if (username.equals(user.getUsername())) {
			return user;
			}
			}
			return null;
			}

	public List<UCDConfiguration> getUCDConfiguration() {		public List<UCDConfiguration> getUCDConfiguration() {
	return Collections.unmodifiableList(ucdListConfig.getUCDList());		return Collections.unmodifiableList(ucdListConfig.getUCDList());
	}		}
	@@ -197,9 +206,17 @@ public class ConfigurationManager {
	}		}

	public List<TapCredentials> getCredentials(String username) {		public List<TapCredentials> getCredentials(String username) {
			List<TapCredentials> credentials = getUserCredentials(username);
			if (credentials == null) {
			return null;
			}
			return Collections.unmodifiableList(credentials);
			}

			private List<TapCredentials> getUserCredentials(String username) {
	for (UserConfiguration user : usersConfig.getUsers()) {		for (UserConfiguration user : usersConfig.getUsers()) {
	if (user.getUsername().equals(username)) {		if (user.getUsername().equals(username)) {
	return Collections.unmodifiableList(user.getCredentialsInfo());		return user.getCredentialsInfo();
	}		}
	}		}
	return null;		return null;
	@@ -213,18 +230,11 @@ public class ConfigurationManager {
	* otherwise.		* otherwise.
	*/		*/
	public synchronized boolean addCredentials(String username, TapCredentials credentials) {		public synchronized boolean addCredentials(String username, TapCredentials credentials) {
	for (UserConfiguration user : usersConfig.getUsers()) {		List<TapCredentials> userCredentials = getUserCredentials(username);
	if (user.getUsername().equals(username)) {		if (userCredentials != null) {
	for (TapCredentials tapCredentials : user.getCredentialsInfo()) {		userCredentials.add(credentials);
	if (tapCredentials.equals(credentials)) {
	return false;
	}
	}

	user.getCredentialsInfo().add(credentials);
	updateUsersConfigurationFile();		updateUsersConfigurationFile();
	return false;		return true;
	}
	}		}
	return false;		return false;
	}		}
	@@ -234,11 +244,21 @@ public class ConfigurationManager {
	* otherwise.		* otherwise.
	*/		*/
	public synchronized boolean deleteCredentials(String username, int credentialsIndex) {		public synchronized boolean deleteCredentials(String username, int credentialsIndex) {
	for (UserConfiguration user : usersConfig.getUsers()) {		List<TapCredentials> userCredentials = getUserCredentials(username);
	if (user.getUsername().equals(username)) {		if (userCredentials != null && userCredentials.size() > credentialsIndex) {
	user.getCredentialsInfo().remove(credentialsIndex);		userCredentials.remove(credentialsIndex);
			updateUsersConfigurationFile();
	return true;		return true;
	}		}
			return false;
			}

			public synchronized boolean updateCredentials(String username, TapCredentials updatedCredentials, int index) {
			List<TapCredentials> userCredentials = getUserCredentials(username);
			if (userCredentials != null && userCredentials.size() > index) {
			userCredentials.set(index, updatedCredentials);
			updateUsersConfigurationFile();
			return true;
	}		}
	return false;		return false;
	}		}

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/ConsistencyChecksBean.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,6 +71,6 @@ public class ConsistencyChecksBean implements Serializable {
	}		}

	public String back() {		public String back() {
	return "schemaSelection.xhtml?faces-redirect=true";		return "credentialsEditing.xhtml?faces-redirect=true";
	}		}
	}		}

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/CredentialsEditing.java

+59 −84

Original line number	Original line	Diff line number	Diff line
	@@ -24,9 +24,7 @@ package it.inaf.ia2.tsm.webapp;

	import it.inaf.ia2.tsm.webapp.xmlconfig.SeparatedCredentials;		import it.inaf.ia2.tsm.webapp.xmlconfig.SeparatedCredentials;
	import it.inaf.ia2.tsm.datalayer.Credentials;		import it.inaf.ia2.tsm.datalayer.Credentials;
	import it.inaf.ia2.tsm.datalayer.DBWrapper;
	import it.inaf.ia2.tsm.model.TapSchemaModels;		import it.inaf.ia2.tsm.model.TapSchemaModels;
	import it.inaf.ia2.tsm.webapp.env.UIModal;
	import it.inaf.ia2.tsm.webapp.xmlconfig.JoinedCredentials;		import it.inaf.ia2.tsm.webapp.xmlconfig.JoinedCredentials;
	import it.inaf.ia2.tsm.webapp.xmlconfig.TapCredentials;		import it.inaf.ia2.tsm.webapp.xmlconfig.TapCredentials;
	import java.io.IOException;		import java.io.IOException;
	@@ -60,12 +58,11 @@ public class CredentialsEditing implements Serializable {
	private ConfigurationManager config;		private ConfigurationManager config;

	@Inject		@Inject
	private SchemaSelectionBean schemaSelectionBean;		private TapSchemaLoader tapSchemaLoader;

	private Integer credentialsInEditing;		private Integer credentialsInEditing;
	private Integer credentialsToRemove;		private Integer credentialsToRemove;

	private UIModal.StatusObserver credentialsDialogStatusObserver;
	private boolean credentialsDialogOpened;		private boolean credentialsDialogOpened;

	private List<String> tapSchemaVersions;		private List<String> tapSchemaVersions;
	@@ -79,12 +76,6 @@ public class CredentialsEditing implements Serializable {

	@PostConstruct		@PostConstruct
	public void init() {		public void init() {
	this.credentialsDialogStatusObserver = new UIModal.StatusObserver() {
	@Override
	public void statusChanged(boolean isOpen) {
	credentialsDialogOpened = isOpen;
	}
	};
	this.tapSchemaVersions = TapSchemaModels.getAvailableVersions();		this.tapSchemaVersions = TapSchemaModels.getAvailableVersions();
	}		}

	@@ -117,7 +108,8 @@ public class CredentialsEditing implements Serializable {
	hasObscore = credentials.isHasObscore();		hasObscore = credentials.isHasObscore();
	}		}

	public void addNewCredentials() {		public void addNewCredentialsInEditing() {
			credentialsInEditing = null;
	separateCredentials = false;		separateCredentials = false;
	sourceCredentials = new Credentials();		sourceCredentials = new Credentials();
	tapSchemaCredentials = new Credentials();		tapSchemaCredentials = new Credentials();
	@@ -126,63 +118,73 @@ public class CredentialsEditing implements Serializable {
	hasObscore = false;		hasObscore = false;
	}		}

	// public void editCredentials(Credentials credentials, int index) {		public void loadTapSchema(TapCredentials tapCredentials) throws SQLException {
	// this.sourceCredentials = credentials;		tapSchemaLoader.tryLoadingTapSchema(tapCredentials);
	// separateCredentials = false;
	// currentEditingRow = index;
	// }
	//
	// public void editSeparateCredentials(SeparatedCredentials sc, int index) {
	// this.sourceCredentials = sc.getSourceCredentials();
	// this.tapSchemaCredentials = sc.getTapSchemaCredentials();
	// currentEditingRow = index;
	// separateCredentials = true;
	// }
	public String loginWithJoinedCredentials(JoinedCredentials credentials) {
	return loginWithDBWrapper(new DBWrapper(credentials.getCredentials()));
	}		}

	public String loginWithSeparatedCredentials(Credentials sourceCredentials, Credentials tapSchemaCredentials) {		public void openDeleteCredentialsConfirmation(int index) throws IOException {
	return loginWithDBWrapper(new DBWrapper(sourceCredentials, tapSchemaCredentials));		credentialsToRemove = index;
	}		}

	private String loginWithDBWrapper(DBWrapper dbWrapper) {		public void confirmCredentialsDeletion() {
			if (credentialsToRemove != null) {
	try {		config.deleteCredentials(user.getUsername(), credentialsToRemove);
	dbWrapper.testConnections();
	schemaSelectionBean.setDbWrapper(dbWrapper);
	return "schemaSelection.xhtml?faces-redirect=true";
	} catch (SQLException e) {
	LOG.error("Exception caught", e);
	FacesContext.getCurrentInstance().addMessage("main", new FacesMessage("Connection error: " + e.getMessage()));
	return null;
	}		}
			credentialsToRemove = null;
	}		}

	public void removeCredentials(int index) throws IOException {		public boolean validateNotNull(FacesContext ctx, String value, String componentId, String errorMessage) {
	// getSavedCredentials().remove(index);		if (value == null \|\| value.isEmpty()) {
	// config.updateUsersConfigurationFile();		ctx.addMessage(componentId, new FacesMessage(errorMessage));
			return false;
			}
			return true;
	}		}

	public void saveCredentialsEdited() throws IOException {		public void saveCredentialsEdited() throws IOException {
	//
	// // If is editing existing, remove old for creating a new one		/**
	// if (currentEditingRow < getSavedCredentials().size()) {		* We need to validate manually to avoid problem with JSF AJAX partial
	// getSavedCredentials().remove(currentEditingRow);		* updates.
	// }		*/
	//		FacesContext ctx = FacesContext.getCurrentInstance();
	// if (separateCredentials) {
	// SeparatedCredentials sc = new SeparatedCredentials(sourceCredentials, tapSchemaCredentials);		/**
	// getSavedCredentials().add(currentEditingRow, sc);		* Single & operator used to perform all validation.
	// } else {		*/
	// getSavedCredentials().add(currentEditingRow, sourceCredentials);		boolean validationOk
	// }		= validateNotNull(ctx, sourceCredentials.getHostname(), "main:source_hostname", "Hostname is required")
	//		& validateNotNull(ctx, sourceCredentials.getUsername(), "main:source_username", "Username is required")
	// config.updateUsersConfigurationFile();		& validateNotNull(ctx, tapSchemaName, "main:tap_schema_name", "TAP_SCHEMA name is required");
	}
			if (separateCredentials) {
	public UIModal.StatusObserver getCredentialsDialogStatus() {		validationOk = validationOk
	return credentialsDialogStatusObserver;		& validateNotNull(ctx, tapSchemaCredentials.getHostname(), "main:tap_schema_hostname", "Hostname is required")
			& validateNotNull(ctx, tapSchemaCredentials.getHostname(), "main:tap_schema_username", "Username is required");
			}

			if (!validationOk) {
			return;
			}

			TapCredentials editedCredentials;
			if (separateCredentials) {
			editedCredentials = new SeparatedCredentials(sourceCredentials, tapSchemaCredentials);
			} else {
			editedCredentials = new JoinedCredentials(sourceCredentials);
			}

			editedCredentials.setHasObscore(hasObscore);
			editedCredentials.setTapSchemaName(tapSchemaName);
			editedCredentials.setTapSchemaVersion(tapSchemaVersion);

			if (credentialsInEditing == null) {
			// New credentials
			config.addCredentials(user.getUsername(), editedCredentials);
			} else {
			// Existing credentials
			config.updateCredentials(user.getUsername(), editedCredentials, credentialsInEditing);
			}
	}		}

	public List<String> getTapSchemaVersions() {		public List<String> getTapSchemaVersions() {
	@@ -201,33 +203,6 @@ public class CredentialsEditing implements Serializable {
	this.separateCredentials = separateCredentials;		this.separateCredentials = separateCredentials;
	}		}

	// public void separateCredentialsChanged() {
	// if (separateCredentials) {
	// Credentials credentials = getJoinedCredentialsInEditing().getCredentials();
	// SeparatedCredentials separatedCredentials = new SeparatedCredentials();
	// separatedCredentials.setSourceCredentials(credentials);
	// credentialsInEditing = separatedCredentials;
	// } else {
	// Credentials credentials = getSeparatedCredentialsInEditing().getSourceCredentials();
	// JoinedCredentials joinedCredentials = new JoinedCredentials();
	// joinedCredentials.setCredentials(credentials);
	// credentialsInEditing = joinedCredentials;
	// }
	// }
	//
	// public JoinedCredentials getJoinedCredentialsInEditing() {
	// if (credentialsInEditing instanceof JoinedCredentials) {
	// return (JoinedCredentials) credentialsInEditing;
	// }
	// return null;
	// }
	//
	// public SeparatedCredentials getSeparatedCredentialsInEditing() {
	// if (credentialsInEditing instanceof SeparatedCredentials) {
	// return (SeparatedCredentials) credentialsInEditing;
	// }
	// return null;
	// }
	public boolean isCredentialsDialogOpened() {		public boolean isCredentialsDialogOpened() {
	return credentialsDialogOpened;		return credentialsDialogOpened;
	}		}

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java

+7 −27

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,6 @@ package it.inaf.ia2.tsm.webapp;
	import it.inaf.ia2.tsm.ChildEntity;		import it.inaf.ia2.tsm.ChildEntity;
	import it.inaf.ia2.tsm.Column;		import it.inaf.ia2.tsm.Column;
	import it.inaf.ia2.tsm.webapp.env.CustomPartialResponseWriter;		import it.inaf.ia2.tsm.webapp.env.CustomPartialResponseWriter;
	import it.inaf.ia2.tsm.webapp.env.JSUpdateHandler;
	import it.inaf.ia2.tsm.EntitiesContainer;		import it.inaf.ia2.tsm.EntitiesContainer;
	import it.inaf.ia2.tsm.Key;		import it.inaf.ia2.tsm.Key;
	import it.inaf.ia2.tsm.KeyColumn;		import it.inaf.ia2.tsm.KeyColumn;
	@@ -58,7 +57,7 @@ public class TapSchemaEditingBean implements Serializable {
	private static final Logger LOG = LoggerFactory.getLogger(TapSchemaEditingBean.class);		private static final Logger LOG = LoggerFactory.getLogger(TapSchemaEditingBean.class);

	@Inject		@Inject
	SchemaSelectionBean schemaSelection;		private TapSchemaLoader tapSchemaLoader;

	private TapSchema tapSchema;		private TapSchema tapSchema;
	private Schema selectedSchema;		private Schema selectedSchema;
	@@ -247,7 +246,7 @@ public class TapSchemaEditingBean implements Serializable {
	}		}

	public String back() {		public String back() {
	return "schemaSelection.xhtml?faces-redirect=true";		return "credentialsEditing.xhtml?faces-redirect=true";
	}		}

	public void undoRemove(ChildEntity entity) throws SQLException {		public void undoRemove(ChildEntity entity) throws SQLException {
	@@ -310,13 +309,7 @@ public class TapSchemaEditingBean implements Serializable {
	}		}

	// New UCD is set and we can notify the client to close the UCD Search modal dialog.		// New UCD is set and we can notify the client to close the UCD Search modal dialog.
	CustomPartialResponseWriter.getCurrentInstance().addCustomJSUpdate(new JSUpdateHandler() {		CustomPartialResponseWriter.getCurrentInstance().addCustomJSUpdate(String.valueOf(true));

	@Override
	public String getUpdate() {
	return "true";
	}
	});
	}		}
	}		}

	@@ -338,13 +331,7 @@ public class TapSchemaEditingBean implements Serializable {
	if (key.equals("unit")) {		if (key.equals("unit")) {
	voUnitValidator = new VOUnitValidator(entity.getValue(key, String.class));		voUnitValidator = new VOUnitValidator(entity.getValue(key, String.class));
	}		}
	CustomPartialResponseWriter.getCurrentInstance().addCustomJSUpdate(new JSUpdateHandler() {		CustomPartialResponseWriter.getCurrentInstance().addCustomJSUpdate(String.valueOf(isChanged));

	@Override
	public String getUpdate() {
	return isChanged + "";
	}
	});
	}		}

	public void removeColumn(String name) {		public void removeColumn(String name) {
	@@ -371,17 +358,10 @@ public class TapSchemaEditingBean implements Serializable {

	public void reload() {		public void reload() {

	if (schemaSelection.getSelectedRadioOption().equals("edit")) {
	schemaSelection.edit();
	} else {
	if (tapSchema.exists()) {		if (tapSchema.exists()) {
	schemaSelection.setSelectedRadioOption("edit");		tapSchemaLoader.edit();
	schemaSelection.setSelectedTAPSchema(tapSchema.getName());
	schemaSelection.selectedTAPSchemaChanged();
	schemaSelection.edit();
	} else {		} else {
	schemaSelection.create();		tapSchemaLoader.create();
	}
	}		}
	}		}