Localization: Solver Clutering

- ensure that the current locale is passed on solver server calls - this is to make localized messages returned in the user's current locale, rather than just using the unitime.locale default
UniTime · Dec 20, 2024 · 9c50234 · 9c50234
1 parent c9d4f8f
commit 9c50234
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/CourseSolverContainerRemote.java b/JavaSource/org/unitime/timetable/solver/jgroups/CourseSolverContainerRemote.java
@@ -41,6 +41,7 @@
 import org.jgroups.util.Rsp;
 import org.jgroups.util.RspList;
 import org.unitime.commons.hibernate.util.HibernateUtil;
+import org.unitime.localization.impl.Localization;
 import org.unitime.timetable.model.Assignment;
 import org.unitime.timetable.model.Class_;
 import org.unitime.timetable.model.Department;
@@ -103,13 +104,14 @@ public boolean createRemoteSolver(String user, DataProperties config, Address ca
 	}
 
 	@Override
-	public Object invoke(String method, String user, Class[] types, Object[] args) throws Exception {
+	public Object invoke(String method, String user, String locale, Class[] types, Object[] args) throws Exception {
 		try {
 			SolverProxy solver = iCourseSolvers.get(user);
 			if ("exists".equals(method) && types.length == 0)
 				return solver != null;
 			if (solver == null)
 				throw new Exception("Solver " + user + " does not exist.");
+			if (locale != null) Localization.setLocale(locale);
 			return solver.getClass().getMethod(method, types).invoke(solver, args);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
@@ -124,7 +126,10 @@ public Object invoke(String method, String user, Class[] types, Object[] args) t
 	@Override
 	public Object dispatch(Address address, String user, Method method, Object[] args) throws Exception {
 		try {
-			return iDispatcher.callRemoteMethod(address, "invoke",  new Object[] { method.getName(), user, method.getParameterTypes(), args }, new Class[] { String.class, String.class, Class[].class, Object[].class }, SolverServerImplementation.sFirstResponse);
+			return iDispatcher.callRemoteMethod(address, "invoke",
+					new Object[] { method.getName(), user, Localization.getLocale(), method.getParameterTypes(), args },
+					new Class[] { String.class, String.class, String.class, Class[].class, Object[].class },
+					SolverServerImplementation.sFirstResponse);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
 				throw (Exception)e.getTargetException();

diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/ExaminationSolverContainerRemote.java b/JavaSource/org/unitime/timetable/solver/jgroups/ExaminationSolverContainerRemote.java
@@ -34,6 +34,7 @@
 import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.fork.ForkChannel;
 import org.unitime.commons.hibernate.util.HibernateUtil;
+import org.unitime.localization.impl.Localization;
 import org.unitime.timetable.solver.exam.ExamSolverProxy;
 
 /**
@@ -85,13 +86,14 @@ public boolean createRemoteSolver(String user, DataProperties config, Address ca
 	}
 
 	@Override
-	public Object invoke(String method, String user, Class[] types, Object[] args) throws Exception {
+	public Object invoke(String method, String user, String locale, Class[] types, Object[] args) throws Exception {
 		try {
 			ExamSolverProxy solver = iExamSolvers.get(user);
 			if ("exists".equals(method) && types.length == 0)
 				return solver != null;
 			if (solver == null)
 				throw new Exception("Solver " + user + " does not exist.");
+			if (locale != null) Localization.setLocale(locale);
 			return solver.getClass().getMethod(method, types).invoke(solver, args);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
@@ -106,7 +108,10 @@ public Object invoke(String method, String user, Class[] types, Object[] args) t
 	@Override
 	public Object dispatch(Address address, String user, Method method, Object[] args) throws Exception {
 		try {
-			return iDispatcher.callRemoteMethod(address, "invoke",  new Object[] { method.getName(), user, method.getParameterTypes(), args }, new Class[] { String.class, String.class, Class[].class, Object[].class }, SolverServerImplementation.sFirstResponse);
+			return iDispatcher.callRemoteMethod(address, "invoke",
+					new Object[] { method.getName(), user, Localization.getLocale(), method.getParameterTypes(), args },
+					new Class[] { String.class, String.class, String.class, Class[].class, Object[].class },
+					SolverServerImplementation.sFirstResponse);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
 				throw (Exception)e.getTargetException();

diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/InstructorSchedulingContainerRemote.java b/JavaSource/org/unitime/timetable/solver/jgroups/InstructorSchedulingContainerRemote.java
@@ -33,6 +33,7 @@
 import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.fork.ForkChannel;
 import org.unitime.commons.hibernate.util.HibernateUtil;
+import org.unitime.localization.impl.Localization;
 import org.unitime.timetable.solver.exam.ExamSolverProxy;
 import org.unitime.timetable.solver.instructor.InstructorSchedulingProxy;
 
@@ -85,13 +86,14 @@ public boolean createRemoteSolver(String user, DataProperties config, Address ca
 	}
 
 	@Override
-	public Object invoke(String method, String user, Class[] types, Object[] args) throws Exception {
+	public Object invoke(String method, String user, String locale, Class[] types, Object[] args) throws Exception {
 		try {
 			InstructorSchedulingProxy solver = iInstrSchdSolvers.get(user);
 			if ("exists".equals(method) && types.length == 0)
 				return solver != null;
 			if (solver == null)
 				throw new Exception("Solver " + user + " does not exist.");
+			if (locale != null) Localization.setLocale(locale);
 			return solver.getClass().getMethod(method, types).invoke(solver, args);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
@@ -106,7 +108,10 @@ public Object invoke(String method, String user, Class[] types, Object[] args) t
 	@Override
 	public Object dispatch(Address address, String user, Method method, Object[] args) throws Exception {
 		try {
-			return iDispatcher.callRemoteMethod(address, "invoke",  new Object[] { method.getName(), user, method.getParameterTypes(), args }, new Class[] { String.class, String.class, Class[].class, Object[].class }, SolverServerImplementation.sFirstResponse);
+			return iDispatcher.callRemoteMethod(address, "invoke",
+					new Object[] { method.getName(), user, Localization.getLocale(), method.getParameterTypes(), args },
+					new Class[] { String.class, String.class, String.class, Class[].class, Object[].class },
+					SolverServerImplementation.sFirstResponse);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
 				throw (Exception)e.getTargetException();

diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/OnlineStudentSchedulingContainerRemote.java b/JavaSource/org/unitime/timetable/solver/jgroups/OnlineStudentSchedulingContainerRemote.java
@@ -33,6 +33,7 @@
 import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.fork.ForkChannel;
 import org.unitime.commons.hibernate.util.HibernateUtil;
+import org.unitime.localization.impl.Localization;
 import org.unitime.timetable.onlinesectioning.OnlineSectioningServer;
 import org.unitime.timetable.onlinesectioning.OnlineSectioningServerContext;
 import org.unitime.timetable.solver.SolverProxy;
@@ -85,13 +86,14 @@ public boolean createRemoteSolver(String sessionId, DataProperties config, Addre
 	}
 
 	@Override
-	public Object invoke(String method, String sessionId, Class[] types, Object[] args) throws Exception {
+	public Object invoke(String method, String sessionId, String locale, Class[] types, Object[] args) throws Exception {
 		try {
 			OnlineSectioningServer solver = iInstances.get(Long.valueOf(sessionId));
 			if ("exists".equals(method) && types.length == 0)
 				return solver != null;
 			if (solver == null)
 				throw new Exception("Server " + sessionId + " does not exist.");
+			if (locale != null) Localization.setLocale(locale);
 			return solver.getClass().getMethod(method, types).invoke(solver, args);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
@@ -106,7 +108,10 @@ public Object invoke(String method, String sessionId, Class[] types, Object[] ar
 	@Override
 	public Object dispatch(Address address, String sessionId, Method method, Object[] args) throws Exception {
 		try {
-			return iDispatcher.callRemoteMethod(address, "invoke",  new Object[] { method.getName(), sessionId, method.getParameterTypes(), args }, new Class[] { String.class, String.class, Class[].class, Object[].class }, SolverServerImplementation.sFirstResponse);
+			return iDispatcher.callRemoteMethod(address, "invoke",
+					new Object[] { method.getName(), sessionId, Localization.getLocale(), method.getParameterTypes(), args },
+					new Class[] { String.class, String.class, String.class, Class[].class, Object[].class },
+					SolverServerImplementation.sFirstResponse);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
 				throw (Exception)e.getTargetException();

diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/RemoteSolverContainer.java b/JavaSource/org/unitime/timetable/solver/jgroups/RemoteSolverContainer.java
@@ -37,7 +37,10 @@ public interface RemoteSolverContainer<T> extends SolverContainer<T> {
 
 	public Object dispatch(Address address, String user, Method method, Object[] args) throws Exception;
 
-	public Object invoke(String method, String user, Class[] types, Object[] args) throws Exception;
+	public Object invoke(String method, String user, String locale, Class[] types, Object[] args) throws Exception;
+	default Object invoke(String method, String user, Class[] types, Object[] args) throws Exception {
+		return invoke(method, user, null, types, args);
+	}
 
 	public T createProxy(Address address, String user);
 

diff --git a/JavaSource/org/unitime/timetable/solver/jgroups/StudentSolverContainerRemote.java b/JavaSource/org/unitime/timetable/solver/jgroups/StudentSolverContainerRemote.java
@@ -34,6 +34,7 @@
 import org.jgroups.blocks.RpcDispatcher;
 import org.jgroups.fork.ForkChannel;
 import org.unitime.commons.hibernate.util.HibernateUtil;
+import org.unitime.localization.impl.Localization;
 import org.unitime.timetable.solver.studentsct.StudentSolverProxy;
 
 /**
@@ -85,13 +86,14 @@ public boolean createRemoteSolver(String user, DataProperties config, Address ca
 	}
 
 	@Override
-	public Object invoke(String method, String user, Class[] types, Object[] args) throws Exception {
+	public Object invoke(String method, String user, String locale, Class[] types, Object[] args) throws Exception {
 		try {
 			StudentSolverProxy solver = iStudentSolvers.get(user);
 			if ("exists".equals(method) && types.length == 0)
 				return solver != null;
 			if (solver == null)
 				throw new Exception("Solver " + user + " does not exist.");
+			if (locale != null) Localization.setLocale(locale);
 			return solver.getClass().getMethod(method, types).invoke(solver, args);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
@@ -106,7 +108,10 @@ public Object invoke(String method, String user, Class[] types, Object[] args) t
 	@Override
 	public Object dispatch(Address address, String user, Method method, Object[] args) throws Exception {
 		try {
-			return iDispatcher.callRemoteMethod(address, "invoke",  new Object[] { method.getName(), user, method.getParameterTypes(), args }, new Class[] { String.class, String.class, Class[].class, Object[].class }, SolverServerImplementation.sFirstResponse);
+			return iDispatcher.callRemoteMethod(address, "invoke",
+					new Object[] { method.getName(), user, Localization.getLocale(), method.getParameterTypes(), args },
+					new Class[] { String.class, String.class, String.class, Class[].class, Object[].class },
+					SolverServerImplementation.sFirstResponse);
 		} catch (InvocationTargetException e) {
 			if (e.getTargetException() != null && e.getTargetException() instanceof Exception)
 				throw (Exception)e.getTargetException();