/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.commons.collections4.properties;

import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;

import org.apache.commons.collections4.iterators.IteratorEnumeration;

/**
 * A drop-in replacement for {@link Properties} for sorting keys.
 * <p>
 * Overrides {@link Properties#keys()} to sort keys. Allows other methods on the superclass to work with sorted keys.
 * </p>
 *
 * @since 4.2
 */
public class SortedProperties extends Properties {

    private static final long serialVersionUID = 1L;

    @Override
    public synchronized Enumeration<Object> keys() {
        final Set<Object> keySet = keySet();
        final List<String> keys = new ArrayList<>(keySet.size());
        for (final Object key : keySet) {
            keys.add(key.toString());
        }
        Collections.sort(keys);
        return new IteratorEnumeration<>(keys.iterator());
    }

    @Override
    public Set<Map.Entry<Object, Object>> entrySet() {
        Enumeration<Object> keys = keys();
        Set<Map.Entry<Object, Object>> entrySet = new LinkedHashSet<>();
        while (keys.hasMoreElements()) {
            Object key = keys.nextElement();
            entrySet.add(new AbstractMap.SimpleEntry<>(key, getProperty((String) key)));
        }
        return entrySet;
    }
}

@@ -1095,16 +1095,52 @@
 til.Set;
+%0Aimport java.util.stream.Collectors;
 %0A%0Aimport
@@ -1613,278 +1613,118 @@
     
-final Set%3CObject%3E keySet = keySet();%0A        final List%3CString%3E keys = new ArrayList%3C%3E(keySet.size());%0A        for (final Object key : keySet) %7B%0A            keys.add(key.toString());%0A        %7D%0A        Collections.sort(keys);%0A        return new IteratorEnumeration%3C%3E(keys
+return new IteratorEnumeration%3C%3E(keySet().stream().map(Object::toString).sorted().collect(Collectors.toList())
 .ite
@@ -1817,16 +1817,22 @@
         
+final 
 Enumerat
@@ -1866,16 +1866,22 @@
         
+final 
 Set%3CMap.
@@ -1990,16 +1990,22 @@
         
+final 
 Object k

Reimplement SortedProperties#keys() a la Java 8.