Fixing Sonar issues.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@1509701 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java b/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java
index f040f3c..ded2907 100644
--- a/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java
+++ b/core/src/main/java/org/apache/commons/proxy2/provider/ProviderDecorator.java
@@ -29,31 +29,32 @@
*/
public class ProviderDecorator<T> implements ObjectProvider<T>
{
- //**********************************************************************************************************************
- // Fields
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Fields
+//----------------------------------------------------------------------------------------------------------------------
/**
* The wrapped {@link ObjectProvider}.
*/
- protected ObjectProvider<? extends T> inner;
+ private ObjectProvider<? extends T> inner;
- //**********************************************************************************************************************
- // Constructors
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// Constructors
+//----------------------------------------------------------------------------------------------------------------------
/**
* Create a new ProviderDecorator instance.
+ *
* @param inner
*/
- public ProviderDecorator( ObjectProvider<? extends T> inner )
+ public ProviderDecorator(ObjectProvider<? extends T> inner)
{
this.inner = inner;
}
- //**********************************************************************************************************************
- // ObjectProvider Implementation
- //**********************************************************************************************************************
+//----------------------------------------------------------------------------------------------------------------------
+// ObjectProvider Implementation
+//----------------------------------------------------------------------------------------------------------------------
/**
* {@inheritDoc}
@@ -62,4 +63,18 @@
{
return inner.getObject();
}
+
+//----------------------------------------------------------------------------------------------------------------------
+// Getter/Setter Methods
+//----------------------------------------------------------------------------------------------------------------------
+
+ protected ObjectProvider<? extends T> getInner()
+ {
+ return inner;
+ }
+
+ public void setInner(ObjectProvider<? extends T> inner)
+ {
+ this.inner = inner;
+ }
}
diff --git a/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java b/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
index 90d6ce6..ceda06a 100644
--- a/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
+++ b/core/src/main/java/org/apache/commons/proxy2/provider/SingletonProvider.java
@@ -40,9 +40,10 @@
/**
* Create a new SingletonProvider instance.
+ *
* @param inner
*/
- public SingletonProvider( ObjectProvider<? extends T> inner )
+ public SingletonProvider(ObjectProvider<? extends T> inner)
{
super(inner);
}
@@ -56,13 +57,13 @@
*/
public T getObject()
{
- synchronized( this )
+ synchronized (this)
{
- if( instance == null )
+ if (instance == null)
{
instance = super.getObject();
// Garbage collection
- inner = null;
+ setInner(null);
}
return instance;
}
