- if (properties.containsKey(Constants.SERVICE_PID)) {
- String pid = (String) properties.get(Constants.SERVICE_PID);
+ if (!properties.containsKey(Constants.SERVICE_PID))
+ throw new IllegalArgumentException("A layer must have an ID");
+ String pid = (String) properties.get(Constants.SERVICE_PID);
+ List<String> types = properties.containsKey(EntityConstants.TYPE)
+ ? LangUtils.toStringList(properties.get(EntityConstants.TYPE))
+ : new ArrayList<>();
+ if (types.isEmpty()) {
+ RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+ } else {
+ if (layersByPid.containsKey(pid)) {
+ RankedObject<SuiteLayer> current = layersByPid.get(pid);
+ List<String> currentTypes = current.getProperties().containsKey(EntityConstants.TYPE)
+ ? LangUtils.toStringList(current.getProperties().get(EntityConstants.TYPE))
+ : new ArrayList<>();
+ if (!types.containsAll(currentTypes)) {
+ throw new IllegalArgumentException("Higher-ranked layer " + pid + " contains only types " + types
+ + ", while it must override all " + currentTypes);
+ }
+ }