Merge pull request #1954 from zlamalp/fixService

CORE,REGISTRAR: Fixed passing boolean values as string to jdbc driver

Author: zlamalp

perun-core/src/main/java/cz/metacentrum/perun/core/impl/ServicesManagerImpl.java

@@ -74,7 +74,7 @@ public ServicesManagerImpl(DataSource perunPool) {
 	public final static String richDestinationMappingSelectQuery = " " + destinationMappingSelectQuery + ", " +
 		"facilities.id as facilities_id, facilities.name as facilities_name, " +
 		"facilities.created_at as facilities_created_at, facilities.created_by as facilities_created_by, facilities.modified_at as facilities_modified_at, facilities.modified_by as facilities_modified_by, " +
-		"facilities.modified_by_uid as facilities_modified_by_uid, facilities.created_by_uid as facilities_created_by_uid, " + 
+		"facilities.modified_by_uid as facilities_modified_by_uid, facilities.created_by_uid as facilities_created_by_uid, " +
 		serviceMappingSelectQuery + ", " +
 		"facility_service_destinations.propagation_type as f_s_des_propagation_type ";
 
@@ -211,7 +211,7 @@ public Service createService(PerunSession sess, Service service) throws Internal
 			}
 			jdbc.update("insert into services(id,name,description,delay,recurrence,enabled,script,created_by,created_at,modified_by,modified_at,created_by_uid, modified_by_uid) " +
 					"values (?,?,?,?,?,?,?,?," + Compatibility.getSysdate() + ",?," + Compatibility.getSysdate() + ",?,?)", newId, service.getName(),
-					service.getDescription(), service.getDelay(), service.getRecurrence(), service.isEnabled() ? '1' : '0', service.getScript(),
+					service.getDescription(), service.getDelay(), service.getRecurrence(), (service.isEnabled()) ? "1" : "0", service.getScript(),
 					sess.getPerunPrincipal().getActor(), sess.getPerunPrincipal().getActor(), sess.getPerunPrincipal().getUserId(), sess.getPerunPrincipal().getUserId());
 			log.info("Service created: {}", service);
 
@@ -244,7 +244,7 @@ public void updateService(PerunSession sess, Service service) throws InternalErr
 			jdbc.update("update services set name=?, description=?, delay=?, recurrence=?, enabled=?, script=?, " +
 							"modified_by=?, modified_by_uid=?, modified_at=" + Compatibility.getSysdate() + "  where id=?",
 					service.getName(), service.getDescription(), service.getDelay(), service.getRecurrence(),
-					service.isEnabled() ? '1' : '0', service.getScript(),
+					(service.isEnabled()) ? "1" : "0", service.getScript(),
 					sess.getPerunPrincipal().getActor(), sess.getPerunPrincipal().getUserId(), service.getId());
 		} catch(RuntimeException ex) {
 			throw new InternalErrorException(ex);

perun-core/src/main/java/cz/metacentrum/perun/core/impl/modules/attributes/urn_perun_user_facility_attribute_def_def_basicDefaultGID.java

@@ -49,7 +49,7 @@ public void checkAttributeValue(PerunSessionImpl sess, Facility facility, User u
 		List<Resource> resourcesWithSameGid = sess.getPerunBl().getResourcesManagerBl().getResourcesByAttribute(sess, resourceGidAttribute);
 		if (resourcesWithSameGid.isEmpty() && allowedResources.isEmpty() && resourceGidAttribute.getValue() == null) return;
 		if (resourcesWithSameGid.isEmpty() && resourceGidAttribute.getValue() != null) throw new WrongAttributeValueException(attribute, user, facility, "Resource with requiered unix GID doesn't exist.");
-		if (allowedResources.isEmpty()) throw new WrongAttributeValueException(attribute, user, "User has not access to requiered resource");
+		if (allowedResources.isEmpty()) throw new WrongAttributeValueException(attribute, user, "User has not access to required resource");
 
 		resourcesWithSameGid.retainAll(allowedResources);
 

perun-registrar-lib/src/main/java/cz/metacentrum/perun/registrar/impl/MailManagerImpl.java

@@ -255,7 +255,7 @@ public void setSendingEnabled(PerunSession sess, List<ApplicationMail> mails, bo
 		for (ApplicationMail mail : mails) {
 			// update sending (enabled / disabled)
 			if (Compatibility.isPostgreSql()) {
-				jdbc.update("update application_mails set send=? where id=?", (enabled) ? '1' : '0', mail.getId());
+				jdbc.update("update application_mails set send=? where id=?", (enabled) ? "1" : "0", mail.getId());
 			} else {
 				jdbc.update("update application_mails set send=? where id=?", enabled, mail.getId());
 			}