It's a bit of a pain to pass Map<String, Map<String,Object>> to
the ActorService configure() method. Changed it to simply take
a Map<String,Object>, as it had been in a previous iteration.
Issue-ID: POLICY-1625
Signed-off-by: Jim Hahn <jrh3@att.com>
Change-Id: Ib6e703115027bc4919cc93762ca5b38d254f2b8f
private TopicParameterGroup topics;
@NotNull
private TopicParameterGroup topics;
@NotNull
- private Map<String, Map<String, Object>> actors;
+ private Map<String, Object> actors;
/**
* Validates the config.
/**
* Validates the config.
* {@link #start()} to start all of the actors. When finished using the actor service,
* invoke {@link #stop()} or {@link #shutdown()}.
*/
* {@link #start()} to start all of the actors. When finished using the actor service,
* invoke {@link #stop()} or {@link #shutdown()}.
*/
-public class ActorService extends StartConfigPartial<Map<String, Map<String, Object>>> {
+public class ActorService extends StartConfigPartial<Map<String, Object>> {
private static final Logger logger = LoggerFactory.getLogger(ActorService.class);
private final Map<String, Actor> name2actor;
private static final Logger logger = LoggerFactory.getLogger(ActorService.class);
private final Map<String, Actor> name2actor;
- protected void doConfigure(Map<String, Map<String, Object>> parameters) {
+ protected void doConfigure(Map<String, Object> parameters) {
logger.info("configuring actors");
BeanValidationResult valres = new BeanValidationResult("ActorService", parameters);
for (Actor actor : name2actor.values()) {
String actorName = actor.getName();
logger.info("configuring actors");
BeanValidationResult valres = new BeanValidationResult("ActorService", parameters);
for (Actor actor : name2actor.values()) {
String actorName = actor.getName();
- Map<String, Object> subparams = parameters.get(actorName);
+ Object paramValue = parameters.get(actorName);
- if (subparams != null) {
+ if (paramValue instanceof Map) {
+ @SuppressWarnings("unchecked")
+ Map<String, Object> subparams = (Map<String, Object>) paramValue;
try {
actor.configure(subparams);
try {
actor.configure(subparams);
private Map<String, Object> sub2;
private Map<String, Object> sub3;
private Map<String, Object> sub4;
private Map<String, Object> sub2;
private Map<String, Object> sub3;
private Map<String, Object> sub4;
- private Map<String, Map<String, Object>> params;
+ private Map<String, Object> params;
private ActorService service;
private ActorService service;