/*
 * 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 java.util.stream.Collectors;

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() {
        return new IteratorEnumeration<>(keySet().stream().map(Object::toString).sorted().collect(Collectors.toList()).iterator());
    }

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

@@ -902,46 +902,30 @@
 il.A
-rrayList;%0Aimport java.util.Collections
+bstractMap.SimpleEntry
 ;%0Aim
@@ -988,31 +988,8 @@
 et;%0A
-import java.util.List;%0A
 impo
@@ -1092,16 +1092,48 @@
 lectors;
+%0Aimport java.util.stream.Stream;
 %0A%0Aimport
@@ -1556,45 +1556,47 @@
 lic 
-synchronized Enumeration%3C
+Set%3CMap.Entry%3CObject, 
 Object%3E
- keys
+%3E entrySet
 () %7B
@@ -1608,374 +1608,424 @@
     
-return new IteratorEnumeration%3C%3E(keySet().stream().map(Object::toString).sorted().collect(Collectors.toList()).iterator());%0A    %7D%0A%0A    @Override%0A    public Set%3CMap.Entry%3CObject, Object%3E%3E entrySet() %7B%0A        final Enumeration%3CObject%3E keys = keys();%0A        final Set%3CMap.Entry%3CObject, Object%3E%3E entrySet = new LinkedHashSet%3C%3E(
+final Stream%3CSimpleEntry%3CObject, Object%3E%3E stream = sortedKeys().map(k -%3E new AbstractMap.SimpleEntry%3C%3E(k, getProperty(k)));%0A        return stream.collect(Collectors.toCollection(LinkedHashSet::new));%0A    %7D%0A%0A    @Override%0A    public synchronized Enumeration%3CObject%3E keys() %7B%0A        return new IteratorEnumeration%3C%3E(sortedKeys().collect(Collectors.toList()).iterator()
 );%0A    
+%7D%0A%0A
     
-while (keys.hasMoreElement
+private Stream%3CString%3E sortedKey
 s()
-)
  %7B%0A 
@@ -2035,173 +2035,63 @@
     
-    final Object key = keys.nextElement();%0A            entrySet.add(new AbstractMap.SimpleEntry%3C%3E(key, getProperty((String) key)));%0A        %7D%0A        return entrySet
+return keySet().stream().map(Object::toString).sorted()
 ;%0A  

Reimplement SortedProperties#keys() a la Java 8.