From bb3fe508f98ec31109f951fb059ee49746a36d48 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 27 Jan 2012 20:15:31 +0000 Subject: NO-JIRA: Encapsulate fields, use private members and accesors (keep checkstyle happy) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1236867 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/security/access/plugins/AccessControl.java | 2 +- .../info/src/main/java/org/apache/qpid/info/Activator.java | 4 ++-- .../info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java | 2 +- .../src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java | 4 ++-- .../src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java | 2 +- .../src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java | 2 +- .../java/org/apache/qpid/server/security/access/plugins/Firewall.java | 2 +- .../qpid/server/security/access/plugins/FirewallConfiguration.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) (limited to 'qpid/java/broker-plugins') diff --git a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java index a97b66a287..d8a5bd4085 100644 --- a/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java +++ b/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java @@ -109,7 +109,7 @@ public class AccessControl extends AbstractPlugin { super.configure(config); - AccessControlConfiguration accessConfig = (AccessControlConfiguration) _config; + AccessControlConfiguration accessConfig = (AccessControlConfiguration) getConfig(); _ruleSet = accessConfig.getRuleSet(); } diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java index b3e3d1676e..037fad0979 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/Activator.java @@ -44,9 +44,9 @@ public class Activator implements BundleActivator private final List _httpPropList = Arrays.asList("http.url", "http.envelope"); - InfoServiceImpl _service = null; + private InfoServiceImpl _service = null; - BundleContext _ctx = null; + private BundleContext _ctx = null; /** * Start bundle method diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java index 5522f2701e..08caa794fa 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/InfoServiceImpl.java @@ -38,7 +38,7 @@ import java.util.TreeMap; public class InfoServiceImpl implements InfoService { - SortedMap infoMap = new TreeMap(); + private SortedMap infoMap = new TreeMap(); /** * invoke method collects all the information from System and Application diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java index 348e860d5f..9f38ab253d 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java @@ -61,9 +61,9 @@ public class InfoPluginTest extends QpidBrokerTestCase private CountDownLatch _latch = new CountDownLatch(2); - final List> _recv = new ArrayList>(); + private final List> _recv = new ArrayList>(); - Thread _socketAcceptor; + private Thread _socketAcceptor; public void setUp() throws Exception { diff --git a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java index 0cd73d9de5..1e0b6ccccc 100644 --- a/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java +++ b/qpid/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/test/InfoServiceImplTest.java @@ -37,7 +37,7 @@ import java.util.Properties; public class InfoServiceImplTest extends TestCase { - InfoServiceImpl _isi = null; + private InfoServiceImpl _isi = null; @SuppressWarnings("unchecked") public void testInvoke() diff --git a/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java index 7695a5a2d5..458f9a1846 100644 --- a/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java +++ b/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java @@ -36,7 +36,7 @@ public class ExtrasTest extends TestCase private static final String PLUGIN_DIRECTORY = System.getProperty("example.plugin.target"); private static final String CACHE_DIRECTORY = System.getProperty("example.cache.target"); - IApplicationRegistry _registry; + private IApplicationRegistry _registry; @Override public void setUp() throws Exception diff --git a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java index 77ffbfa16f..40a65fddba 100644 --- a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java +++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/Firewall.java @@ -115,7 +115,7 @@ public class Firewall extends AbstractPlugin public void configure(ConfigurationPlugin config) { super.configure(config); - FirewallConfiguration firewallConfiguration = (FirewallConfiguration) _config; + FirewallConfiguration firewallConfiguration = (FirewallConfiguration) getConfig(); // Get default action _default = firewallConfiguration.getDefaultAction(); diff --git a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java index 80ff8b7eca..57d7b27ee3 100644 --- a/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java +++ b/qpid/java/broker-plugins/firewall/src/main/java/org/apache/qpid/server/security/access/plugins/FirewallConfiguration.java @@ -35,7 +35,7 @@ import java.util.List; public class FirewallConfiguration extends ConfigurationPlugin { - CompositeConfiguration _finalConfig; + private CompositeConfiguration _finalConfig; public static final ConfigurationPluginFactory FACTORY = new ConfigurationPluginFactory() { -- cgit v1.2.1