Merge branch 'master' of https://code.ill.fr/instrument-control/nomad-command-system.git

ChangeLog

-3.2.1 DD/MM/YYYY
+3.2.1 29/04/2019
 ------
 * Overwritten equals method in Property class.
 

src/main/java/fr/ill/ics/bridge/ControllerManager.java

@@ -134,6 +134,11 @@ public class ControllerManager implements ServerConfigurationChangeListener {
 	}
 
 	
+	public Set<String> getControllerTypesInheritingType(int databaseID, String controllerType) {
+		return ServantManagerAccessor.getInstance(serverId).getControllerTypesInheritingType(databaseID, controllerType);
+	}
+	
+
 	public boolean controllerIsEnabled(String controllerName) {
 		return ServantDatabase.getInstance().controllerIsEnabled(controllerName);
 	}

src/main/java/fr/ill/ics/nscclient/dataprovider/ServantManagerAccessor.java

@@ -19,11 +19,13 @@
 package fr.ill.ics.nscclient.dataprovider;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.logging.Level;
@@ -1027,4 +1029,34 @@ public class ServantManagerAccessor {
 		}
 	}
 	
+	public Set<String> getControllerTypesInheritingType(int databaseID, String controllerType) {
+		
+		// Create the message type.
+		ServantManagerRequest.Message type = ServantManagerRequest.Message.newBuilder()
+													.setType(ServantManagerRequest.Message.Type.GetControllerTypesInheritingType)
+													.build();
+
+		// Create the request.
+		ServantManagerRequest.GetControllerTypesInheritingTypeRequest request = ServantManagerRequest.GetControllerTypesInheritingTypeRequest.newBuilder()
+																							.setDatabaseID(databaseID)
+																							.setType(controllerType)
+																							.build();
+		
+		servantManagerRequester.sendTwoParts(type.toByteArray(), request.toByteArray());
+		
+		try {
+			Common.StringArrayResponse response = Common.StringArrayResponse.parseFrom(servantManagerRequester.receive());
+			HashSet<String> result = new HashSet<String>();
+			Iterator<String> t = response.getValueList().iterator();
+			while (t.hasNext()) {
+				result.add(t.next());
+			}
+			return result;
+		}
+		catch (InvalidProtocolBufferException e) {
+			LOGGER.logp(Level.WARNING, this.getClass().getName(), "getControllerTypesInheritingType", "error in parsing response");
+		}
+	
+		return null;
+	}
 }
\ No newline at end of file