make Attributes iterable

Signed-off-by: Stefan Niederhauser <[email protected]>

Author: nidi3

graphviz-java/src/main/java/guru/nidi/graphviz/attribute/Attributes.java

@@ -16,11 +16,13 @@
 package guru.nidi.graphviz.attribute;
 
 import javax.annotation.Nullable;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map.Entry;
 
 import static java.util.Arrays.asList;
 
-public interface Attributes<F extends For> {
+public interface Attributes<F extends For> extends Iterable<Entry<String, Object>> {
     Attributes<? super F> applyTo(MapAttributes<? super F> attrs);
 
     default Attributes<? super F> applyTo(Attributes<? super F> attrs) {
@@ -62,6 +64,11 @@ default Object get(String key) {
         return applyTo(new MapAttributes<>()).get(key);
     }
 
+    @Override
+    default Iterator<Entry<String, Object>> iterator() {
+        return applyTo(new MapAttributes<>()).iterator();
+    }
+
     default boolean isEmpty() {
         return applyTo(new MapAttributes<>()).isEmpty();
     }

graphviz-java/src/main/java/guru/nidi/graphviz/model/MutableAttributed.java

@@ -24,7 +24,7 @@
 import static guru.nidi.graphviz.attribute.Attributes.attr;
 import static guru.nidi.graphviz.attribute.Attributes.attrs;
 
-public interface MutableAttributed<T, F extends For> extends Attributes<F>, Iterable<Entry<String, Object>> {
+public interface MutableAttributed<T, F extends For> extends Attributes<F> {
     default T add(String name, @Nullable Object value) {
         return add(attr(name, value));
     }

graphviz-java/src/main/java/guru/nidi/graphviz/model/SimpleMutableAttributed.java

@@ -42,11 +42,6 @@ public Attributes<? super F> applyTo(MapAttributes<? super F> attrs) {
         return attrs.add(attributes);
     }
 
-    @Override
-    public Iterator<Entry<String, Object>> iterator() {
-        return attributes.iterator();
-    }
-
     @Override
     public Object get(String key) {
         return attributes.get(key);