SLING-10679 wrap every object in a single item list #9

kwin · 2021-07-28T11:00:22Z

No description provided.

Buuhuu · 2021-07-28T13:07:32Z

src/main/java/org/apache/sling/scripting/sightly/render/ObjectModel.java

-            return list;
-        }
-        return Collections.emptyList();
+        return Collections.singletonList(object);


While I agree with the change, I think it comes with a certain risk as it changes the returned collection from a modifiable to an unmodifiable one. Should we make that somehow clear to the consumers?

In general I think we should return unmodifiable collections. Can you change fromIterator() accordingly as well?

The empty list being returned before was also immutable.

But not the ArrayList returned with the single String | Number.

Modifying the other collections to return immutable lists consistently requires quite some updates in the test (which currently compare with equals against a mutable list), therefore I would like to separate this from this extension. Changing the single element list to be immutable didn't require any test changes.

Also this would require further changes on getIndex(...) as this cannot work on an object wrapped by Collections.unmodifiableCollection

After having a second thought it wasn't that much effort and only one change in the unit test was necessary, therefore I committed those changes in a16076e.