diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
index a14c48bda..03ead1feb 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/SiteGraph.java
@@ -68,7 +68,7 @@ public class SiteGraph {
         if (args.length != 8 && args.length != 6) {
             InputStream is = SiteGraph.class.getResourceAsStream("sitegraph-usage.txt");
             byte[] buffer = new byte[2048];
-            int length = -1;
+            int length;
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
             while ((length = is.read(buffer)) != -1) {
                 baos.write(buffer, 0, length);
diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
index c0251359e..46849184f 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/StrutsConfigRetriever.java
@@ -72,11 +72,11 @@ public class StrutsConfigRetriever {
         try {
             ConfigurationProvider configProvider = new StrutsXmlConfigurationProvider(configFile.getCanonicalPath(), true, null);
             cm = new ConfigurationManager();
-            cm.addConfigurationProvider(new DefaultPropertiesProvider());
-            cm.addConfigurationProvider(new StrutsXmlConfigurationProvider("struts-default.xml", false, null));
-            cm.addConfigurationProvider(configProvider);
-            cm.addConfigurationProvider(new LegacyPropertiesConfigurationProvider());
-            cm.addConfigurationProvider(new BeanSelectionProvider());
+            cm.addContainerProvider(new DefaultPropertiesProvider());
+            cm.addContainerProvider(new StrutsXmlConfigurationProvider("struts-default.xml", false, null));
+            cm.addContainerProvider(configProvider);
+            cm.addContainerProvider(new LegacyPropertiesConfigurationProvider());
+            cm.addContainerProvider(new BeanSelectionProvider());
             isXWorkStarted = true;
         } catch (IOException e) {
             LOG.error("IOException", e);
diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
index 6f85e96e4..07ab5e2f3 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Graph.java
@@ -22,7 +22,6 @@
 package org.apache.struts2.sitegraph.model;
 
 import java.io.IOException;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
@@ -57,14 +56,12 @@ public class Graph extends SubGraph {
         }
 
         // render all the nodes
-        for (Iterator iterator = nodes.iterator(); iterator.hasNext();) {
-            SiteGraphNode siteGraphNode = (SiteGraphNode) iterator.next();
+        for (SiteGraphNode siteGraphNode : nodes) {
             siteGraphNode.render(writer);
         }
 
         // finally, render the links
-        for (Iterator iterator = links.iterator(); iterator.hasNext();) {
-            Link link = (Link) iterator.next();
+        for (Link link : links) {
             link.render(writer);
         }
 
diff --git a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
index 8c876cf26..863f1fb8d 100644
--- a/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
+++ b/plugins/sitegraph/src/main/java/org/apache/struts2/sitegraph/model/Link.java
@@ -90,6 +90,6 @@ public class Link implements Render, Comparable {
             return result;
         }
 
-        return new Integer(type).compareTo(new Integer(other.type));
+        return new Integer(type).compareTo(other.type);
     }
 }
diff --git a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
index 587f321ba..04fe72c8f 100644
--- a/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
+++ b/plugins/sitegraph/src/test/java/org/apache/struts2/sitegraph/SiteGraphTest.java
@@ -46,7 +46,7 @@ public class SiteGraphTest extends StrutsTestCase {
         siteGraph.prepare();
 
         URL compare = SiteGraphTest.class.getResource("out.txt");
-        StringBuffer buffer = new StringBuffer(128);
+        StringBuilder buffer = new StringBuilder(128);
         InputStream in = compare.openStream();
         byte[] buf = new byte[4096];
         int nbytes;