diff --git a/modules/apps/amazon-rankings/amazon-rankings-web/src/com/liferay/amazon/rankings/web/util/AmazonRankingsWebCacheItem.java b/modules/apps/amazon-rankings/amazon-rankings-web/src/com/liferay/amazon/rankings/web/util/AmazonRankingsWebCacheItem.java index be034c847ea06f..3c4b8075dcb314 100644 --- a/modules/apps/amazon-rankings/amazon-rankings-web/src/com/liferay/amazon/rankings/web/util/AmazonRankingsWebCacheItem.java +++ b/modules/apps/amazon-rankings/amazon-rankings-web/src/com/liferay/amazon/rankings/web/util/AmazonRankingsWebCacheItem.java @@ -281,10 +281,10 @@ protected boolean hasErrorMessage(Element element) { private static final long _REFRESH_TIME = Time.MINUTE * 20; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( AmazonRankingsWebCacheItem.class); - private AmazonRankingsConfiguration _amazonRankingsConfiguration; - private String _isbn; + private final AmazonRankingsConfiguration _amazonRankingsConfiguration; + private final String _isbn; } \ No newline at end of file diff --git a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/model/CurrencyConverter.java b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/model/CurrencyConverter.java index 6e28d78e56c0cf..fc8c91efc8c690 100644 --- a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/model/CurrencyConverter.java +++ b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/model/CurrencyConverter.java @@ -54,7 +54,7 @@ public String getToSymbol() { return DEFAULT_TO; } - private double _rate; - private String _symbol; + private final double _rate; + private final String _symbol; } \ No newline at end of file diff --git a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterUtil.java b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterUtil.java index 78e09c1a67d034..21407a2b1e973b 100644 --- a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterUtil.java +++ b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterUtil.java @@ -232,12 +232,12 @@ private CurrencyConverterUtil() { _currencyIds.add("ZWD"); } - private static CurrencyConverterUtil _instance = + private static final CurrencyConverterUtil _instance = new CurrencyConverterUtil(); - private static Map> _symbolsPool = + private static final Map> _symbolsPool = new ConcurrentHashMap>(); - private Set _currencyIds; + private final Set _currencyIds; } \ No newline at end of file diff --git a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterWebCacheItem.java b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterWebCacheItem.java index 8976610a11d8e6..9590a80ea94b73 100644 --- a/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterWebCacheItem.java +++ b/modules/apps/currency-converter/currency-converter-web/src/com/liferay/currency/converter/web/util/CurrencyConverterWebCacheItem.java @@ -85,6 +85,6 @@ public long getRefreshTime() { private static final long _REFRESH_TIME = Time.MINUTE * 20; - private String _symbol; + private final String _symbol; } \ No newline at end of file diff --git a/modules/apps/document-library/document-library-google-docs/src/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java b/modules/apps/document-library/document-library-google-docs/src/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java index 0d9a1a967a464a..64e6cc44989c30 100644 --- a/modules/apps/document-library/document-library-google-docs/src/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java +++ b/modules/apps/document-library/document-library-google-docs/src/com/liferay/document/library/google/docs/util/GoogleDocsDLFileEntryTypeHelper.java @@ -133,11 +133,11 @@ protected DLFileEntryType addGoogleDocsDLFileEntryType(long ddmStructureId) descriptionMap, new long[] {ddmStructureId}, serviceContext); } - private ClassNameLocalService _classNameLocalService; - private Company _company; - private DDMStructureLocalService _ddmStructureLocalService; - private long _dlFileEntryMetadataClassNameId; - private DLFileEntryTypeLocalService _dlFileEntryTypeLocalService; - private UserLocalService _userLocalService; + private final ClassNameLocalService _classNameLocalService; + private final Company _company; + private final DDMStructureLocalService _ddmStructureLocalService; + private final long _dlFileEntryMetadataClassNameId; + private final DLFileEntryTypeLocalService _dlFileEntryTypeLocalService; + private final UserLocalService _userLocalService; } \ No newline at end of file diff --git a/modules/apps/iframe/iframe-web/src/com/liferay/iframe/web/util/IFrameUtil.java b/modules/apps/iframe/iframe-web/src/com/liferay/iframe/web/util/IFrameUtil.java index 6487f5b94083a3..e25503c3f8d096 100644 --- a/modules/apps/iframe/iframe-web/src/com/liferay/iframe/web/util/IFrameUtil.java +++ b/modules/apps/iframe/iframe-web/src/com/liferay/iframe/web/util/IFrameUtil.java @@ -117,6 +117,6 @@ public static boolean isPasswordTokenEnabled(PortletRequest portletRequest) return false; } - private static Log _log = LogFactoryUtil.getLog(IFrameUtil.class); + private static final Log _log = LogFactoryUtil.getLog(IFrameUtil.class); } \ No newline at end of file diff --git a/modules/apps/network-utilities/network-utilities-web/src/com/liferay/network/utilities/web/util/WhoisWebCacheItem.java b/modules/apps/network-utilities/network-utilities-web/src/com/liferay/network/utilities/web/util/WhoisWebCacheItem.java index 0159802db77928..1318800c8b99d7 100644 --- a/modules/apps/network-utilities/network-utilities-web/src/com/liferay/network/utilities/web/util/WhoisWebCacheItem.java +++ b/modules/apps/network-utilities/network-utilities-web/src/com/liferay/network/utilities/web/util/WhoisWebCacheItem.java @@ -82,6 +82,6 @@ public long getRefreshTime() { private static final long _REFRESH_TIME = Time.DAY; - private String _domain; + private final String _domain; } \ No newline at end of file diff --git a/modules/apps/polls/polls-service/src/com/liferay/polls/lar/PollsDisplayPortletDataHandler.java b/modules/apps/polls/polls-service/src/com/liferay/polls/lar/PollsDisplayPortletDataHandler.java index a6cccc0ab5b07a..9cf83a120523fd 100644 --- a/modules/apps/polls/polls-service/src/com/liferay/polls/lar/PollsDisplayPortletDataHandler.java +++ b/modules/apps/polls/polls-service/src/com/liferay/polls/lar/PollsDisplayPortletDataHandler.java @@ -152,7 +152,7 @@ protected PortletPreferences doProcessImportPortletPreferences( return portletPreferences; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PollsDisplayPortletDataHandler.class); } \ No newline at end of file diff --git a/modules/apps/polls/polls-service/src/com/liferay/polls/verify/Verifier.java b/modules/apps/polls/polls-service/src/com/liferay/polls/verify/Verifier.java index 11787ae0ceaefb..b0383a8c5b08ab 100644 --- a/modules/apps/polls/polls-service/src/com/liferay/polls/verify/Verifier.java +++ b/modules/apps/polls/polls-service/src/com/liferay/polls/verify/Verifier.java @@ -39,8 +39,8 @@ protected void verifyResourcedModels() throws Exception { _verifyResourcePermissions.verify(new PollsQuestionVerifiableModel()); } - private VerifyAuditedModel _verifyAuditedModel = new VerifyAuditedModel(); - private VerifyResourcePermissions _verifyResourcePermissions = + private final VerifyAuditedModel _verifyAuditedModel = new VerifyAuditedModel(); + private final VerifyResourcePermissions _verifyResourcePermissions = new VerifyResourcePermissions(); } \ No newline at end of file diff --git a/modules/core/portal-bootstrap/src/com/liferay/portal/bootstrap/ModuleFrameworkImpl.java b/modules/core/portal-bootstrap/src/com/liferay/portal/bootstrap/ModuleFrameworkImpl.java index 1af82c55b59183..c0b7c658ee4683 100644 --- a/modules/core/portal-bootstrap/src/com/liferay/portal/bootstrap/ModuleFrameworkImpl.java +++ b/modules/core/portal-bootstrap/src/com/liferay/portal/bootstrap/ModuleFrameworkImpl.java @@ -1275,11 +1275,11 @@ private void _setupInitialBundles() throws Exception { frameworkWiring.refreshBundles(refreshBundles, frameworkListener); } - private static Log _log = LogFactoryUtil.getLog(ModuleFrameworkImpl.class); + private static final Log _log = LogFactoryUtil.getLog(ModuleFrameworkImpl.class); - private Pattern _bundleSymbolicNamePattern = Pattern.compile( + private final Pattern _bundleSymbolicNamePattern = Pattern.compile( "(" + Verifier.SYMBOLICNAME.pattern() + ")(-[0-9])?.*\\.jar"); - private Lock _extraPackageLock = new ReentrantLock(); + private final Lock _extraPackageLock = new ReentrantLock(); private Map> _extraPackageMap; private List _extraPackageURLs; private Framework _framework; @@ -1329,8 +1329,8 @@ public void frameworkEvent(FrameworkEvent frameworkEvent) { } } - private List _lazyActivationBundles; - private List _startBundles; + private final List _lazyActivationBundles; + private final List _startBundles; } diff --git a/modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java b/modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java index 6ae94bde457f74..be07ccd9ccf22b 100644 --- a/modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java +++ b/modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java @@ -432,10 +432,10 @@ private void _removedService( } } - private AtomicLong _serviceIdCounter = new AtomicLong(); - private Map, Object> _services = + private final AtomicLong _serviceIdCounter = new AtomicLong(); + private final Map, Object> _services = new ConcurrentSkipListMap, Object>(); - private Map, Filter> _serviceTrackers = + private final Map, Filter> _serviceTrackers = new ConcurrentHashMap, Filter>(); private class BasicFilter implements Filter { @@ -600,7 +600,7 @@ else if (value instanceof Collection) { return stringBuilder.toString(); } - private Map _properties = new LowerCaseKeyTreeMap(); + private final Map _properties = new LowerCaseKeyTreeMap(); } @@ -632,7 +632,7 @@ public void unregister() { _removedService(_basicServiceReference); } - private BasicServiceReference _basicServiceReference; + private final BasicServiceReference _basicServiceReference; } @@ -846,9 +846,9 @@ public T waitForService(long timeout) throws InterruptedException { private volatile CountDownLatch _countDownLatch = new CountDownLatch(1); private Filter _filter; - private ServiceTrackerCustomizer _serviceTrackerCustomizer; - private AtomicInteger _stateCounter = new AtomicInteger(); - private NavigableMap, T> _trackedServices = + private final ServiceTrackerCustomizer _serviceTrackerCustomizer; + private final AtomicInteger _stateCounter = new AtomicInteger(); + private final NavigableMap, T> _trackedServices = new ConcurrentSkipListMap, T>(); } diff --git a/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTuple.java b/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTuple.java index 998f9fcd68e3fd..3fc89fd43a661e 100644 --- a/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTuple.java +++ b/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTuple.java @@ -67,7 +67,7 @@ public int hashCode() { return _serviceReference.hashCode(); } - private TS _service; - private ServiceReference _serviceReference; + private final TS _service; + private final ServiceReference _serviceReference; } \ No newline at end of file diff --git a/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTupleComparator.java b/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTupleComparator.java index 34930d9eb71a65..6468629adb4c6f 100644 --- a/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTupleComparator.java +++ b/modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTupleComparator.java @@ -48,6 +48,6 @@ public int compare( serviceReferenceServiceTuple2.getServiceReference()); } - private Comparator> _comparator; + private final Comparator> _comparator; } \ No newline at end of file diff --git a/modules/core/registry-api/src/com/liferay/registry/collections/internal/MultiValueServiceTrackerBucketFactory.java b/modules/core/registry-api/src/com/liferay/registry/collections/internal/MultiValueServiceTrackerBucketFactory.java index a00f325c72aa97..084a5a76434e15 100644 --- a/modules/core/registry-api/src/com/liferay/registry/collections/internal/MultiValueServiceTrackerBucketFactory.java +++ b/modules/core/registry-api/src/com/liferay/registry/collections/internal/MultiValueServiceTrackerBucketFactory.java @@ -48,7 +48,7 @@ public ServiceTrackerBucket> create() { return new ListServiceTrackerBucket(); } - private Comparator> _comparator; + private final Comparator> _comparator; private class ListServiceTrackerBucket implements ServiceTrackerBucket> { @@ -106,7 +106,7 @@ private ListServiceTrackerBucket() { serviceReferenceServiceTupleComparator); } - private Set> + private final Set> _serviceReferenceServiceTuples; private List _services = new ArrayList(); diff --git a/modules/core/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java b/modules/core/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java index c6d4343524a2e0..fe5ac096152c60 100644 --- a/modules/core/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java +++ b/modules/core/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java @@ -93,14 +93,14 @@ public void open() { _serviceTracker.open(); } - private ServiceReferenceMapper _serviceReferenceMapper; - private ServiceTracker> + private final ServiceReferenceMapper _serviceReferenceMapper; + private final ServiceTracker> _serviceTracker; - private ConcurrentHashMap> + private final ConcurrentHashMap> _serviceTrackerBuckets = new ConcurrentHashMap>(); - private ServiceTrackerCustomizer _serviceTrackerCustomizer; - private ServiceTrackerBucketFactory + private final ServiceTrackerCustomizer _serviceTrackerCustomizer; + private final ServiceTrackerBucketFactory _serviceTrackerMapBucketFactory; private class Holder { diff --git a/modules/core/registry-api/src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java b/modules/core/registry-api/src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java index 5c1bbdaeb23acb..c54875e41759e4 100644 --- a/modules/core/registry-api/src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java +++ b/modules/core/registry-api/src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java @@ -45,7 +45,7 @@ public ServiceTrackerBucket create() { return new SingleBucket(); } - private Comparator> _comparator; + private final Comparator> _comparator; private class SingleBucket implements ServiceTrackerBucket { @@ -98,7 +98,7 @@ public synchronized void store( } private TS _service; - private PriorityQueue> + private final PriorityQueue> _serviceReferences; } diff --git a/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableDictionaryMap.java b/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableDictionaryMap.java index 7af08380645d9f..45f9ebb7eae426 100644 --- a/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableDictionaryMap.java +++ b/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableDictionaryMap.java @@ -103,6 +103,6 @@ public Collection values() { return _map.values(); } - private Map _map; + private final Map _map; } \ No newline at end of file diff --git a/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableMapDictionary.java b/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableMapDictionary.java index 3461acef7ef521..c569143d1fe31b 100644 --- a/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableMapDictionary.java +++ b/modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableMapDictionary.java @@ -71,8 +71,8 @@ public int size() { return _map.size(); } - private Enumeration _elements; - private Enumeration _keys; - private Map _map; + private final Enumeration _elements; + private final Enumeration _keys; + private final Map _map; } \ No newline at end of file diff --git a/modules/core/registry-impl/src/com/liferay/registry/internal/FilterWrapper.java b/modules/core/registry-impl/src/com/liferay/registry/internal/FilterWrapper.java index 04bfe4d9b7eb3a..8fde803356f46a 100644 --- a/modules/core/registry-impl/src/com/liferay/registry/internal/FilterWrapper.java +++ b/modules/core/registry-impl/src/com/liferay/registry/internal/FilterWrapper.java @@ -79,6 +79,6 @@ public String toString() { return _filter.toString(); } - private org.osgi.framework.Filter _filter; + private final org.osgi.framework.Filter _filter; } \ No newline at end of file diff --git a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceReferenceWrapper.java b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceReferenceWrapper.java index 5fd7df40bb7832..658b3d0113cd72 100644 --- a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceReferenceWrapper.java +++ b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceReferenceWrapper.java @@ -101,6 +101,6 @@ public String toString() { return _serviceReference.toString(); } - private org.osgi.framework.ServiceReference _serviceReference; + private final org.osgi.framework.ServiceReference _serviceReference; } \ No newline at end of file diff --git a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceRegistrationWrapper.java b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceRegistrationWrapper.java index bdfc3635db833b..7bfd851c833b4f 100644 --- a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceRegistrationWrapper.java +++ b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceRegistrationWrapper.java @@ -77,6 +77,6 @@ public void unregister() { _serviceRegistration.unregister(); } - private org.osgi.framework.ServiceRegistration _serviceRegistration; + private final org.osgi.framework.ServiceRegistration _serviceRegistration; } \ No newline at end of file diff --git a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerCustomizerAdapter.java b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerCustomizerAdapter.java index 6ee35242fce313..771fb37373e0ce 100644 --- a/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerCustomizerAdapter.java +++ b/modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerCustomizerAdapter.java @@ -52,6 +52,6 @@ public void removedService( new ServiceReferenceWrapper(serviceReference), service); } - private ServiceTrackerCustomizer _serviceTrackerCustomizer; + private final ServiceTrackerCustomizer _serviceTrackerCustomizer; } \ No newline at end of file diff --git a/modules/core/registry-test/src/com/liferay/registry/internal/RegistryWrapper.java b/modules/core/registry-test/src/com/liferay/registry/internal/RegistryWrapper.java index a1bb41c40edc90..0dc58dc2f0fd8b 100644 --- a/modules/core/registry-test/src/com/liferay/registry/internal/RegistryWrapper.java +++ b/modules/core/registry-test/src/com/liferay/registry/internal/RegistryWrapper.java @@ -230,8 +230,8 @@ public boolean ungetService(ServiceReference serviceReference) { return _registry.ungetService(serviceReference); } - private Registry _registry; - private ConcurrentHashMap, AtomicInteger> + private final Registry _registry; + private final ConcurrentHashMap, AtomicInteger> _serviceReferenceCountsMap = new ConcurrentHashMap, AtomicInteger>(); diff --git a/modules/core/registry-test/src/com/liferay/registry/internal/TrackedOne.java b/modules/core/registry-test/src/com/liferay/registry/internal/TrackedOne.java index ed3c6d76c1d894..d7c2d1bab046b1 100644 --- a/modules/core/registry-test/src/com/liferay/registry/internal/TrackedOne.java +++ b/modules/core/registry-test/src/com/liferay/registry/internal/TrackedOne.java @@ -30,6 +30,6 @@ public String getKey() { return _key; } - private String _key; + private final String _key; } \ No newline at end of file diff --git a/modules/core/registry-test/src/com/liferay/registry/internal/TrackedTwo.java b/modules/core/registry-test/src/com/liferay/registry/internal/TrackedTwo.java index 17d45c5de8f4ff..1d8df75c2b512e 100644 --- a/modules/core/registry-test/src/com/liferay/registry/internal/TrackedTwo.java +++ b/modules/core/registry-test/src/com/liferay/registry/internal/TrackedTwo.java @@ -27,6 +27,6 @@ public TrackedOne getTrackedOne() { return _trackedOne; } - private TrackedOne _trackedOne; + private final TrackedOne _trackedOne; } \ No newline at end of file diff --git a/modules/core/registry-test/test/integration/com/liferay/registry/internal/RegistryTest.java b/modules/core/registry-test/test/integration/com/liferay/registry/internal/RegistryTest.java index c41d74a476ba48..58d75fbf45cae1 100644 --- a/modules/core/registry-test/test/integration/com/liferay/registry/internal/RegistryTest.java +++ b/modules/core/registry-test/test/integration/com/liferay/registry/internal/RegistryTest.java @@ -764,10 +764,10 @@ public void removedService( TrackedOne trackedOne) { } - private InterfaceOne _interfaceOneA; - private InterfaceOne _interfaceOneB; - private AtomicReference _referenceA; - private AtomicReference _referenceB; + private final InterfaceOne _interfaceOneA; + private final InterfaceOne _interfaceOneB; + private final AtomicReference _referenceA; + private final AtomicReference _referenceB; } diff --git a/modules/core/registry-test/test/integration/com/liferay/registry/internal/ServiceTrackerCollectionTest.java b/modules/core/registry-test/test/integration/com/liferay/registry/internal/ServiceTrackerCollectionTest.java index 4cdc875fe7d207..bf8d6870f8e6be 100644 --- a/modules/core/registry-test/test/integration/com/liferay/registry/internal/ServiceTrackerCollectionTest.java +++ b/modules/core/registry-test/test/integration/com/liferay/registry/internal/ServiceTrackerCollectionTest.java @@ -610,7 +610,7 @@ public void removedService( _counter.incrementAndGet(); } - private AtomicInteger _counter; + private final AtomicInteger _counter; } diff --git a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePluginPackage.java b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePluginPackage.java index 37411a47696f77..e2825bf0cb2092 100644 --- a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePluginPackage.java +++ b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePluginPackage.java @@ -256,9 +256,9 @@ public void setTags(List tags) { public void setTypes(List types) { } - private Bundle _bundle; - private Dictionary _headers; - private PortletApp _portletApp; - private Version _version; + private final Bundle _bundle; + private final Dictionary _headers; + private final PortletApp _portletApp; + private final Version _version; } \ No newline at end of file diff --git a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletApp.java b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletApp.java index f8ae4b3202b3e0..cb1833f1c32ef2 100644 --- a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletApp.java +++ b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletApp.java @@ -227,11 +227,11 @@ public void setWARFile(boolean warFile) { _portletApp.setWARFile(warFile); } - private String _contextPath; - private BundlePluginPackage _pluginPackage; - private Portlet _portalPortletModel; - private PortletApp _portletApp; + private final String _contextPath; + private final BundlePluginPackage _pluginPackage; + private final Portlet _portalPortletModel; + private final PortletApp _portletApp; private ServletContext _servletContext; - private String _servletContextName; + private final String _servletContextName; } \ No newline at end of file diff --git a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletBagFactory.java b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletBagFactory.java index 06d1f88b99ce51..a890fb6c07e9e9 100644 --- a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletBagFactory.java +++ b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePortletBagFactory.java @@ -34,6 +34,6 @@ protected Portlet getPortletInstance( return _portlet; } - private Portlet _portlet; + private final Portlet _portlet; } \ No newline at end of file diff --git a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContext.java b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContext.java index 9137d33c48dc3d..bf3814c3fb7998 100644 --- a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContext.java +++ b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContext.java @@ -93,8 +93,8 @@ public String getServletContextName() { return _bundlePortletApp.getServletContextName(); } - private BundlePortletApp _bundlePortletApp; - private ClassLoader _classLoader; - private ServletContext _servletContext; + private final BundlePortletApp _bundlePortletApp; + private final ClassLoader _classLoader; + private final ServletContext _servletContext; } \ No newline at end of file diff --git a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContextInvocationHandler.java b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContextInvocationHandler.java index 75574903870f84..7b6d66f1905e6c 100644 --- a/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContextInvocationHandler.java +++ b/modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundleServletContextInvocationHandler.java @@ -53,7 +53,7 @@ public Object invoke(Object proxy, Method method, Object[] args) return method.invoke(_servletContext, args); } - private static Map _bundleServletContextMethods = + private static final Map _bundleServletContextMethods = new HashMap(); static { @@ -78,7 +78,7 @@ public Object invoke(Object proxy, Method method, Object[] args) } } - private BundleServletContext _bundleServletContext; - private ServletContext _servletContext; + private final BundleServletContext _bundleServletContext; + private final ServletContext _servletContext; } \ No newline at end of file diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchEngineConfigurator.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchEngineConfigurator.java index 6cc81ba57e42d9..839fc8abf9050d 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchEngineConfigurator.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchEngineConfigurator.java @@ -168,7 +168,7 @@ protected void unsetSearchEngine( private IndexSearcher _indexSearcher; private IndexWriter _indexWriter; private MessageBus _messageBus; - private Map _searchEngines = + private final Map _searchEngines = new ConcurrentHashMap(); } \ No newline at end of file diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexSearcher.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexSearcher.java index 383d5198f5f332..f99474da98d9ec 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexSearcher.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexSearcher.java @@ -520,7 +520,7 @@ protected void updateFacetCollectors( } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ElasticsearchIndexSearcher.class); private ElasticsearchConnectionManager _elasticsearchConnectionManager; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexWriter.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexWriter.java index c4d91f7a08be1b..0c1d92047601db 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexWriter.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchIndexWriter.java @@ -204,7 +204,7 @@ public void updateDocuments( DocumentTypes.LIFERAY, searchContext, documents, true); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ElasticsearchIndexWriter.class); private ElasticsearchConnectionManager _elasticsearchConnectionManager; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchQuerySuggester.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchQuerySuggester.java index 2e9ec9efc1128f..678b7f2b7002b3 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchQuerySuggester.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchQuerySuggester.java @@ -198,7 +198,7 @@ protected Suggest.Suggestion getSuggestion( private static final String _REQUEST_TYPE_SPELL_CHECK = "spellCheckRequest"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ElasticsearchQuerySuggester.class); private ElasticsearchConnectionManager _elasticsearchConnectionManager; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchSpellCheckIndexWriter.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchSpellCheckIndexWriter.java index fbc6a0b8bc8d6a..d960338903a6e4 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchSpellCheckIndexWriter.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchSpellCheckIndexWriter.java @@ -149,7 +149,7 @@ protected void deleteIndices(SearchContext searchContext, String indexType) LogUtil.logActionResponse(_log, deleteByQueryResponse); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ElasticsearchSpellCheckIndexWriter.class); private ElasticsearchConnectionManager _elasticsearchConnectionManager; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchUpdateDocumentCommandImpl.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchUpdateDocumentCommandImpl.java index f071492bd95fcb..cffd6251eaaf7a 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchUpdateDocumentCommandImpl.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/ElasticsearchUpdateDocumentCommandImpl.java @@ -171,7 +171,7 @@ protected BulkResponse doUpdateDocuments( } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ElasticsearchUpdateDocumentCommandImpl.class); private ElasticsearchConnectionManager _elasticsearchConnectionManager; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/connection/ElasticsearchConnectionManager.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/connection/ElasticsearchConnectionManager.java index f7ed30194bbd4c..82c2a7a995ec99 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/connection/ElasticsearchConnectionManager.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/connection/ElasticsearchConnectionManager.java @@ -81,7 +81,7 @@ public void unsetElasticsearchConnection( _elasticsearchConnection.set(null); } - private AtomicReference _elasticsearchConnection = + private final AtomicReference _elasticsearchConnection = new AtomicReference(); } \ No newline at end of file diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/CompositeFacetProcessor.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/CompositeFacetProcessor.java index 8a2db216dd5e8c..96c481bd16839c 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/CompositeFacetProcessor.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/CompositeFacetProcessor.java @@ -95,7 +95,7 @@ public void unsetFacetProcessor( } private static FacetProcessor _defaultFacetProcessor; - private static Map> + private static final Map> _facetProcessors = new HashMap>(); diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/ElasticsearchFacetFieldCollector.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/ElasticsearchFacetFieldCollector.java index 7835825771b4bb..c81f5b1e647238 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/ElasticsearchFacetFieldCollector.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/facet/ElasticsearchFacetFieldCollector.java @@ -110,7 +110,7 @@ protected void initialize(Terms terms) { private static final String _TO_STRING = " TO "; private Aggregation _aggregation; - private Map _counts = + private final Map _counts = new ConcurrentHashMap(); private List _termCollectors; diff --git a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/io/StringOutputStream.java b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/io/StringOutputStream.java index 4bec2edc63e135..d414a5aea88b75 100644 --- a/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/io/StringOutputStream.java +++ b/modules/portal/portal-search-elasticsearch/src/com/liferay/portal/search/elasticsearch/io/StringOutputStream.java @@ -33,6 +33,6 @@ public void write(int b) { _sb.append(b); } - private StringBundler _sb = new StringBundler(); + private final StringBundler _sb = new StringBundler(); } \ No newline at end of file diff --git a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/JspCompiler.java b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/JspCompiler.java index 432882cd6cc03b..197cd7098f7d1a 100644 --- a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/JspCompiler.java +++ b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/JspCompiler.java @@ -326,10 +326,10 @@ else if (protocol.equals("jar")) { "javax.servlet.ServletException" }; - private static Log _log = LogFactoryUtil.getLog(JspCompiler.class); + private static final Log _log = LogFactoryUtil.getLog(JspCompiler.class); private Bundle _bundle; private List _classPath; - private Lock _lock = new ReentrantLock(); + private final Lock _lock = new ReentrantLock(); } \ No newline at end of file diff --git a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceCache.java b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceCache.java index 3ce93e855ba72d..603dcd8c75f5cc 100644 --- a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceCache.java +++ b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceCache.java @@ -66,7 +66,7 @@ public void putResources( resourceMap.put(path, resources); } - private Map>> _resourceMaps = + private final Map>> _resourceMaps = new ConcurrentHashMap>>(); } \ No newline at end of file diff --git a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceResolver.java b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceResolver.java index eb2e9478dda1cf..edf42deb9a5ded 100644 --- a/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceResolver.java +++ b/modules/portal/portal-servlet-jsp-compiler/src/com/liferay/portal/servlet/jsp/compiler/compiler/internal/JspResourceResolver.java @@ -142,8 +142,8 @@ protected Collection handleSystemBundle( return resources; } - private static Log _log = LogFactoryUtil.getLog(JspResourceResolver.class); + private static final Log _log = LogFactoryUtil.getLog(JspResourceResolver.class); - private JspResourceCache _jspResourceCache; + private final JspResourceCache _jspResourceCache; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/blueprint/ModuleBeanFactoryPostProcessor.java b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/blueprint/ModuleBeanFactoryPostProcessor.java index 3fbf8baa34fa19..7fed0673af0836 100644 --- a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/blueprint/ModuleBeanFactoryPostProcessor.java +++ b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/blueprint/ModuleBeanFactoryPostProcessor.java @@ -31,6 +31,6 @@ protected ClassLoader getClassLoader() { return _classLoader; } - private ClassLoader _classLoader; + private final ClassLoader _classLoader; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/bundle/CompositeResourceLoaderBundle.java b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/bundle/CompositeResourceLoaderBundle.java index aa139dfaf8b023..9efd919323db4e 100644 --- a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/bundle/CompositeResourceLoaderBundle.java +++ b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/bundle/CompositeResourceLoaderBundle.java @@ -210,6 +210,6 @@ public void update(InputStream inputStream) { throw new UnsupportedOperationException(); } - private Bundle[] _bundles; + private final Bundle[] _bundles; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/classloader/BundleResolverClassLoader.java b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/classloader/BundleResolverClassLoader.java index f4d343ad0c63f5..a5e94186201b43 100644 --- a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/classloader/BundleResolverClassLoader.java +++ b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/classloader/BundleResolverClassLoader.java @@ -104,6 +104,6 @@ protected Class loadClass(String name, boolean resolve) return clazz; } - private Bundle[] _bundles; + private final Bundle[] _bundles; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/context/ServiceBuilderApplicationContext.java b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/context/ServiceBuilderApplicationContext.java index ad820df174c719..e3b44e18b4c184 100644 --- a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/context/ServiceBuilderApplicationContext.java +++ b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/internal/context/ServiceBuilderApplicationContext.java @@ -40,6 +40,6 @@ protected ResourcePatternResolver createResourcePatternResolver() { return new OsgiBundleResourcePatternResolver(_bundle); } - private Bundle _bundle; + private final Bundle _bundle; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/loader/ModuleResourceLoader.java b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/loader/ModuleResourceLoader.java index b633322a229edf..bea7ee4a51e968 100644 --- a/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/loader/ModuleResourceLoader.java +++ b/modules/portal/portal-spring-extender/src/com/liferay/portal/spring/extender/loader/ModuleResourceLoader.java @@ -87,8 +87,8 @@ protected InputStream getInputStream(String location) { return inputStream; } - private static Log _log = LogFactoryUtil.getLog(ModuleResourceLoader.class); + private static final Log _log = LogFactoryUtil.getLog(ModuleResourceLoader.class); - private Bundle _bundle; + private final Bundle _bundle; } \ No newline at end of file diff --git a/modules/portal/portal-spring-extender/test/unit/com/liferay/portal/spring/extender/internal/hibernate/configuration/ModuleHibernateConfigurationTest.java b/modules/portal/portal-spring-extender/test/unit/com/liferay/portal/spring/extender/internal/hibernate/configuration/ModuleHibernateConfigurationTest.java index 72d0ba07355bf2..c2ce8eb750940f 100644 --- a/modules/portal/portal-spring-extender/test/unit/com/liferay/portal/spring/extender/internal/hibernate/configuration/ModuleHibernateConfigurationTest.java +++ b/modules/portal/portal-spring-extender/test/unit/com/liferay/portal/spring/extender/internal/hibernate/configuration/ModuleHibernateConfigurationTest.java @@ -32,7 +32,7 @@ public void testConfigurationPaths() { "META-INF/module-hbm.xml", configurationResources[0]); } - private ModuleHibernateConfiguration _moduleHibernateConfiguration = + private final ModuleHibernateConfiguration _moduleHibernateConfiguration = new ModuleHibernateConfiguration(); } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StartedBundleListener.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StartedBundleListener.java index 6a83fbb3c5b6b2..96755d797e76b5 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StartedBundleListener.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StartedBundleListener.java @@ -58,9 +58,9 @@ public void bundleChanged(BundleEvent bundleEvent) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( StartedBundleListener.class); - private WebBundleDeployer _webBundleDeployer; + private final WebBundleDeployer _webBundleDeployer; } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StoppedBundleListener.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StoppedBundleListener.java index 7dd166c3ba2088..d66e48e59acea6 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StoppedBundleListener.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/StoppedBundleListener.java @@ -54,9 +54,9 @@ public void bundleChanged(BundleEvent bundleEvent) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( StoppedBundleListener.class); - private WebBundleDeployer _webBundleDeployer; + private final WebBundleDeployer _webBundleDeployer; } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabBundleProcessor.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabBundleProcessor.java index 2184f1230eeeba..c8355219bbd776 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabBundleProcessor.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabBundleProcessor.java @@ -287,16 +287,16 @@ protected void initServlets() { } } - private static Log _log = LogFactoryUtil.getLog(WabBundleProcessor.class); + private static final Log _log = LogFactoryUtil.getLog(WabBundleProcessor.class); - private Bundle _bundle; - private ClassLoader _bundleClassLoader; - private String _contextPath; - private ExtendedHttpService _extendedHttpService; + private final Bundle _bundle; + private final ClassLoader _bundleClassLoader; + private final String _contextPath; + private final ExtendedHttpService _extendedHttpService; private ServletContextHelper _servletContextHelper; - private String _servletContextName; + private final String _servletContextName; private WebXMLDefinition _webXML; - private WebXMLDefinitionLoader _webXMLDefinitionLoader = + private final WebXMLDefinitionLoader _webXMLDefinitionLoader = new WebXMLDefinitionLoader(); } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabFactory.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabFactory.java index 4d889d8f051ddc..97d8eb33dc4113 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabFactory.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabFactory.java @@ -114,7 +114,7 @@ protected void unsetExtendedHttpService( _extendedHttpService = null; } - private static Log _log = LogFactoryUtil.getLog(WabFactory.class); + private static final Log _log = LogFactoryUtil.getLog(WabFactory.class); private BundleContext _bundleContext; private ExtendedHttpService _extendedHttpService; diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabServletContextHelper.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabServletContextHelper.java index 104d9b059476c8..5c104dc3decf50 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabServletContextHelper.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WabServletContextHelper.java @@ -112,6 +112,6 @@ public String toString() { } private Bundle _bundle; - private String _string; + private final String _string; } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WebBundleDeployer.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WebBundleDeployer.java index 8c023cd8778db7..fa178d2e6c828a 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WebBundleDeployer.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/WebBundleDeployer.java @@ -119,11 +119,11 @@ protected void handleCollidedWABs(Bundle bundle) { } } - private static Log _log = LogFactoryUtil.getLog(WebBundleDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(WebBundleDeployer.class); - private BundleContext _bundleContext; - private ExtendedHttpService _extendedHttpService; - private Map _wabBundleProcessors = + private final BundleContext _bundleContext; + private final ExtendedHttpService _extendedHttpService; + private final Map _wabBundleProcessors = new ConcurrentHashMap(); } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/FilterDefinition.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/FilterDefinition.java index e13bf481b02911..0b6512a5d99b31 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/FilterDefinition.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/FilterDefinition.java @@ -107,12 +107,12 @@ public void setURLPatterns(List urlPatterns) { } private boolean _asyncSupported; - private List _dispatchers = new ArrayList(); + private final List _dispatchers = new ArrayList(); private Filter _filter; - private Map _initParameters = new HashMap(); + private final Map _initParameters = new HashMap(); private String _name; private int _priority; - private List _servletNames = new ArrayList(); - private List _urlPatterns = new ArrayList(); + private final List _servletNames = new ArrayList(); + private final List _urlPatterns = new ArrayList(); } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/ServletDefinition.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/ServletDefinition.java index 7a535df45b65ac..c6b599f4cb70d8 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/ServletDefinition.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/definition/ServletDefinition.java @@ -83,7 +83,7 @@ public void setURLPatterns(List urlPatterns) { } private boolean _asyncSupported; - private List _errorPages = new ArrayList(); + private final List _errorPages = new ArrayList(); private Map _initParameters = new HashMap(); private String _name; private Servlet _servlet; diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/event/EventUtil.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/event/EventUtil.java index d6c19db01de446..86cd2f56ce7f10 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/event/EventUtil.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/internal/event/EventUtil.java @@ -196,7 +196,7 @@ private void _start(BundleContext bundleContext) { DEPLOYED, DEPLOYING, FAILED, UNDEPLOYED, UNDEPLOYING }; - private static Log _log = LogFactoryUtil.getLog(EventUtil.class); + private static final Log _log = LogFactoryUtil.getLog(EventUtil.class); private static EventUtil _instance; diff --git a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/ws/axis/AxisConfigurationFactory.java b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/ws/axis/AxisConfigurationFactory.java index 99a8b08388a039..22d6ece026b352 100644 --- a/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/ws/axis/AxisConfigurationFactory.java +++ b/modules/portal/portal-wab-extender/src/com/liferay/portal/wab/extender/ws/axis/AxisConfigurationFactory.java @@ -39,6 +39,6 @@ public EngineConfiguration getServerEngineConfig() { return _engineConfigurationFactory.getServerEngineConfig(); } - private EngineConfigurationFactory _engineConfigurationFactory; + private final EngineConfigurationFactory _engineConfigurationFactory; } \ No newline at end of file diff --git a/modules/portal/portal-wab-extender/test/unit/com/liferay/portal/wab/extender/internal/definition/WebXMLDefinitionLoaderTest.java b/modules/portal/portal-wab-extender/test/unit/com/liferay/portal/wab/extender/internal/definition/WebXMLDefinitionLoaderTest.java index 372a2f7648765f..bbb06cca57198a 100644 --- a/modules/portal/portal-wab-extender/test/unit/com/liferay/portal/wab/extender/internal/definition/WebXMLDefinitionLoaderTest.java +++ b/modules/portal/portal-wab-extender/test/unit/com/liferay/portal/wab/extender/internal/definition/WebXMLDefinitionLoaderTest.java @@ -117,7 +117,7 @@ protected void testLoadDependencies( @Mock private ServletContextListener _servletContextListener; - private WebXMLDefinitionLoader _webXMLDefinitionLoader; + private final WebXMLDefinitionLoader _webXMLDefinitionLoader; private class CustomClassLoaderMockBundle extends MockBundle { diff --git a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/artifact/WarArtifactUrlTransformer.java b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/artifact/WarArtifactUrlTransformer.java index 14e37e93470b0f..9824517e5f8576 100644 --- a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/artifact/WarArtifactUrlTransformer.java +++ b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/artifact/WarArtifactUrlTransformer.java @@ -65,7 +65,7 @@ public URL transform(URL artifact) throws Exception { return url; } - private static Pattern _pattern = Pattern.compile( + private static final Pattern _pattern = Pattern.compile( "(.*?)(-\\d+\\.\\d+\\.\\d+\\.\\d+)?"); } \ No newline at end of file diff --git a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/connection/WabURLConnection.java b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/connection/WabURLConnection.java index 8e89e864c49991..2779e2d8b2ff79 100644 --- a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/connection/WabURLConnection.java +++ b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/connection/WabURLConnection.java @@ -118,7 +118,7 @@ protected void wireSpringUtils() { } } - private BundleContext _bundleContext; - private ClassLoader _classLoader; + private final BundleContext _bundleContext; + private final ClassLoader _classLoader; } \ No newline at end of file diff --git a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/handler/WabURLStreamHandlerService.java b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/handler/WabURLStreamHandlerService.java index 9bcc1c74ae2b14..b1b6213cc6b579 100644 --- a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/handler/WabURLStreamHandlerService.java +++ b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/handler/WabURLStreamHandlerService.java @@ -41,7 +41,7 @@ public URLConnection openConnection(URL url) { return new WabURLConnection(_bundleContext, _classLoader, url); } - private BundleContext _bundleContext; - private ClassLoader _classLoader; + private final BundleContext _bundleContext; + private final ClassLoader _classLoader; } \ No newline at end of file diff --git a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/introspection/ClassLoaderSource.java b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/introspection/ClassLoaderSource.java index f78df8ca036aea..9d7ee6f47d24a9 100644 --- a/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/introspection/ClassLoaderSource.java +++ b/modules/portal/portal-wab-generator/src/com/liferay/portal/wab/generator/internal/introspection/ClassLoaderSource.java @@ -31,6 +31,6 @@ public InputStream getResourceAsStream(String name) { return _classLoader.getResourceAsStream(name); } - private ClassLoader _classLoader; + private final ClassLoader _classLoader; } \ No newline at end of file diff --git a/modules/sdk/ant-bnd/src/com/liferay/ant/bnd/BaselineJarTask.java b/modules/sdk/ant-bnd/src/com/liferay/ant/bnd/BaselineJarTask.java index 898c8156763b73..f3abdfc8eeca35 100644 --- a/modules/sdk/ant-bnd/src/com/liferay/ant/bnd/BaselineJarTask.java +++ b/modules/sdk/ant-bnd/src/com/liferay/ant/bnd/BaselineJarTask.java @@ -523,8 +523,8 @@ protected void reportLog( private String _baselineResportsDirName; private Path _classpath; - private List _classpathFiles = new ArrayList(); - private DiffPluginImpl _diffPluginImpl = new DiffPluginImpl(); + private final List _classpathFiles = new ArrayList(); + private final DiffPluginImpl _diffPluginImpl = new DiffPluginImpl(); private File _file; private boolean _headerPrinted; private File _logFile; diff --git a/modules/test/arquillian-extension/src/com/liferay/arquillian/extension/internal/event/LiferayContextCreatedEvent.java b/modules/test/arquillian-extension/src/com/liferay/arquillian/extension/internal/event/LiferayContextCreatedEvent.java index f7ee45c4901372..e2be96653f7f14 100644 --- a/modules/test/arquillian-extension/src/com/liferay/arquillian/extension/internal/event/LiferayContextCreatedEvent.java +++ b/modules/test/arquillian-extension/src/com/liferay/arquillian/extension/internal/event/LiferayContextCreatedEvent.java @@ -30,6 +30,6 @@ public TestClass getTestClass() { return _testClass; } - private TestClass _testClass; + private final TestClass _testClass; } \ No newline at end of file diff --git a/modules/util/freemarker-osgi-bridge/src/com/liferay/freemarker/osgi/internal/BundleTemplateLoader.java b/modules/util/freemarker-osgi-bridge/src/com/liferay/freemarker/osgi/internal/BundleTemplateLoader.java index 2778bbf873cacc..53171e1934de78 100644 --- a/modules/util/freemarker-osgi-bridge/src/com/liferay/freemarker/osgi/internal/BundleTemplateLoader.java +++ b/modules/util/freemarker-osgi-bridge/src/com/liferay/freemarker/osgi/internal/BundleTemplateLoader.java @@ -72,7 +72,7 @@ public Reader getReader(Object templateSource, String encoding) { return new InputStreamReader(bundleTemplateSource.getInputStream()); } - private Bundle _bundle; + private final Bundle _bundle; private class BundleTemplateSource { @@ -84,7 +84,7 @@ public InputStream getInputStream() { return _inputStream; } - private InputStream _inputStream; + private final InputStream _inputStream; } diff --git a/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelReader.java b/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelReader.java index c91669b415f0f7..e98a47b1e5481b 100644 --- a/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelReader.java +++ b/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelReader.java @@ -127,6 +127,6 @@ public int skip(int length) { private ByteBuffer _byteBuffer; private boolean _eof; - private ReadableByteChannel _readableByteChannel; + private final ReadableByteChannel _readableByteChannel; } \ No newline at end of file diff --git a/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelWriter.java b/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelWriter.java index d37b9665f43203..a6ab10368d07af 100644 --- a/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelWriter.java +++ b/modules/util/io-delta/src/com/liferay/io/delta/ByteChannelWriter.java @@ -75,6 +75,6 @@ protected void write() throws IOException { } private ByteBuffer _byteBuffer; - private WritableByteChannel _writableByteChannel; + private final WritableByteChannel _writableByteChannel; } \ No newline at end of file diff --git a/modules/util/io-delta/src/com/liferay/io/delta/Patcher.java b/modules/util/io-delta/src/com/liferay/io/delta/Patcher.java index efd6e4ca542a74..8b226247b80af6 100644 --- a/modules/util/io-delta/src/com/liferay/io/delta/Patcher.java +++ b/modules/util/io-delta/src/com/liferay/io/delta/Patcher.java @@ -125,7 +125,7 @@ protected void transfer( private static final int _NATIVE_TRANSFER_THRESHOLD = 1000000; - private ByteBuffer _transferByteBuffer = ByteBuffer.allocate( + private final ByteBuffer _transferByteBuffer = ByteBuffer.allocate( _NATIVE_TRANSFER_THRESHOLD); } \ No newline at end of file diff --git a/modules/util/ip-geocoder/src/com/liferay/ip/geocoder/internal/command/IPGeocoderConfigurationCommand.java b/modules/util/ip-geocoder/src/com/liferay/ip/geocoder/internal/command/IPGeocoderConfigurationCommand.java index ed53fff81b80c0..9109862edb1797 100644 --- a/modules/util/ip-geocoder/src/com/liferay/ip/geocoder/internal/command/IPGeocoderConfigurationCommand.java +++ b/modules/util/ip-geocoder/src/com/liferay/ip/geocoder/internal/command/IPGeocoderConfigurationCommand.java @@ -80,7 +80,7 @@ protected void updateConfig(String key, String value) throws IOException { configuration.update(properties); } - private static Logger _logger = Logger.getLogger( + private static final Logger _logger = Logger.getLogger( IPGeocoderConfigurationCommand.class); private ConfigurationAdmin _configurationAdmin; diff --git a/modules/util/markdown-converter/src/com/liferay/markdown/converter/factory/MarkdownConverterFactoryUtil.java b/modules/util/markdown-converter/src/com/liferay/markdown/converter/factory/MarkdownConverterFactoryUtil.java index 256c9220e72fc1..152cc8bbf3cdb7 100644 --- a/modules/util/markdown-converter/src/com/liferay/markdown/converter/factory/MarkdownConverterFactoryUtil.java +++ b/modules/util/markdown-converter/src/com/liferay/markdown/converter/factory/MarkdownConverterFactoryUtil.java @@ -26,7 +26,7 @@ public static MarkdownConverter create() { return _markdownConverterFactory.create(); } - private static MarkdownConverterFactory _markdownConverterFactory = + private static final MarkdownConverterFactory _markdownConverterFactory = new MarkdownConverterFactoryImpl(); } \ No newline at end of file diff --git a/modules/util/markdown-converter/src/com/liferay/markdown/converter/internal/pegdown/LiferayPegDownConverter.java b/modules/util/markdown-converter/src/com/liferay/markdown/converter/internal/pegdown/LiferayPegDownConverter.java index 9be84d66a7e9f7..c75d029e1c571f 100644 --- a/modules/util/markdown-converter/src/com/liferay/markdown/converter/internal/pegdown/LiferayPegDownConverter.java +++ b/modules/util/markdown-converter/src/com/liferay/markdown/converter/internal/pegdown/LiferayPegDownConverter.java @@ -41,6 +41,6 @@ public String convert(String markdown) { markdown, new LinkRenderer()); } - private LiferayPegDownProcessor _liferayPegDownProcessor; + private final LiferayPegDownProcessor _liferayPegDownProcessor; } \ No newline at end of file diff --git a/modules/util/osgi-util/src/com/liferay/osgi/util/service/ReflectionServiceTracker.java b/modules/util/osgi-util/src/com/liferay/osgi/util/service/ReflectionServiceTracker.java index 7d576bb6fa7779..e8f7cc71cd986a 100644 --- a/modules/util/osgi-util/src/com/liferay/osgi/util/service/ReflectionServiceTracker.java +++ b/modules/util/osgi-util/src/com/liferay/osgi/util/service/ReflectionServiceTracker.java @@ -259,7 +259,7 @@ public Object invoke( }; - private List> _serviceTrackers = + private final List> _serviceTrackers = new ArrayList>(); private Object _unavailableServiceProxy; @@ -290,8 +290,8 @@ private InjectionPoint(Object target, Method method) { _method = method; } - private Method _method; - private Object _target; + private final Method _method; + private final Object _target; } @@ -312,7 +312,7 @@ public void reset() super.inject(_proxy); } - private Object _proxy; + private final Object _proxy; } diff --git a/modules/util/osgi-util/src/com/liferay/osgi/util/service/UnavailableServiceException.java b/modules/util/osgi-util/src/com/liferay/osgi/util/service/UnavailableServiceException.java index a9d5bb40f721f1..02d754a1e9225a 100644 --- a/modules/util/osgi-util/src/com/liferay/osgi/util/service/UnavailableServiceException.java +++ b/modules/util/osgi-util/src/com/liferay/osgi/util/service/UnavailableServiceException.java @@ -29,6 +29,6 @@ public Class getUnavailableServiceClass() { return _unavailableServiceClass; } - private Class _unavailableServiceClass; + private final Class _unavailableServiceClass; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/SyncEngine.java b/modules/util/sync-engine/src/com/liferay/sync/engine/SyncEngine.java index 59bdfea834aeac..39935d29123f9a 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/SyncEngine.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/SyncEngine.java @@ -348,16 +348,16 @@ protected static void synchronizeSyncFiles( FileEventUtil.retryFileTransfers(syncAccountId); } - private static Logger _logger = LoggerFactory.getLogger(SyncEngine.class); + private static final Logger _logger = LoggerFactory.getLogger(SyncEngine.class); - private static ScheduledExecutorService _eventScheduledExecutorService = + private static final ScheduledExecutorService _eventScheduledExecutorService = Executors.newScheduledThreadPool(5); - private static ExecutorService _executorService = + private static final ExecutorService _executorService = Executors.newCachedThreadPool(); private static boolean _running; - private static Map _syncAccountTasks = + private static final Map _syncAccountTasks = new HashMap(); - private static ScheduledExecutorService + private static final ScheduledExecutorService _syncWatchEventProcessorExecutorService = Executors.newScheduledThreadPool(5); diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFileEntryEvent.java index a70b364216f0a6..9cd2280d3d99b7 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFileEntryEvent.java @@ -54,6 +54,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/add-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFolderEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFolderEvent.java index 788c41cffd0bc5..bb58bc8ee22662 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFolderEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/AddFolderEvent.java @@ -51,6 +51,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/add-folder"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/BaseEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/BaseEvent.java index 56443a9254a9d7..df3a04dcd23ef5 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/BaseEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/BaseEvent.java @@ -132,11 +132,11 @@ protected void processRequest() throws Exception { executePost(_urlPath, _parameters); } - private static Logger _logger = LoggerFactory.getLogger(BaseEvent.class); + private static final Logger _logger = LoggerFactory.getLogger(BaseEvent.class); private Handler _handler; - private Map _parameters; - private long _syncAccountId; - private String _urlPath; + private final Map _parameters; + private final long _syncAccountId; + private final String _urlPath; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CancelCheckOutEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CancelCheckOutEvent.java index 24e4893b230e93..6783b0b479cb80 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CancelCheckOutEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CancelCheckOutEvent.java @@ -53,6 +53,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/cancel-check-out"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckInFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckInFileEntryEvent.java index 7cf789c6a53a6f..220b1f5b8ecf55 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckInFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckInFileEntryEvent.java @@ -53,6 +53,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/check-in-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckOutFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckOutFileEntryEvent.java index b8d4a9c772f254..482e01cfc4769d 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckOutFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/CheckOutFileEntryEvent.java @@ -53,6 +53,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/check-out-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/DownloadFileEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/DownloadFileEvent.java index 7961dd69c4fa13..2c7f0369b84bfc 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/DownloadFileEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/DownloadFileEvent.java @@ -70,6 +70,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web/download"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetAllFolderSyncDLObjectsEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetAllFolderSyncDLObjectsEvent.java index c63df7a39f3269..607ae9820a3604 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetAllFolderSyncDLObjectsEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetAllFolderSyncDLObjectsEvent.java @@ -40,6 +40,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/get-all-folder-sync-dl-objects"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncContextEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncContextEvent.java index b33171565ac531..bc4a304d2b3efc 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncContextEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncContextEvent.java @@ -54,6 +54,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/get-sync-context"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncDLObjectUpdateEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncDLObjectUpdateEvent.java index 113a8e2a99d569..8164c9a87f9096 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncDLObjectUpdateEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetSyncDLObjectUpdateEvent.java @@ -89,6 +89,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/get-sync-dl-object-update"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetUserSitesGroupsEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetUserSitesGroupsEvent.java index 004c181d5ce8aa..10b3c2c03cd607 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetUserSitesGroupsEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/GetUserSitesGroupsEvent.java @@ -40,6 +40,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/get-user-sites-groups"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryEvent.java index 27909d506b7fea..bdc9ca00db156a 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryEvent.java @@ -40,6 +40,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/move-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryToTrashEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryToTrashEvent.java index 0e1a2dbd6b45da..ef346ee50c56fb 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryToTrashEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFileEntryToTrashEvent.java @@ -40,6 +40,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/move-file-entry-to-trash"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderEvent.java index 75f95646d30675..168746ed74a603 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderEvent.java @@ -38,6 +38,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/move-folder"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderToTrashEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderToTrashEvent.java index dff26b9f5a0a31..de07748b2ccb09 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderToTrashEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/MoveFolderToTrashEvent.java @@ -40,6 +40,6 @@ public Handler getHandler() { private static final String _URL_PATH = "/sync-web.syncdlobject/move-folder-to-trash"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/PatchFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/PatchFileEntryEvent.java index 1d296df9664e96..a36125d471c3e8 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/PatchFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/PatchFileEntryEvent.java @@ -54,6 +54,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/patch-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFileEntryEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFileEntryEvent.java index d108123916524b..1f059db96463ef 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFileEntryEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFileEntryEvent.java @@ -57,6 +57,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/update-file-entry"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFolderEvent.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFolderEvent.java index 1539aa6058508c..e8b841f31a155a 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFolderEvent.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/event/UpdateFolderEvent.java @@ -53,6 +53,6 @@ protected void processRequest() throws Exception { private static final String _URL_PATH = "/sync-web.syncdlobject/update-folder"; - private Handler _handler; + private final Handler _handler; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/AddFileFolderHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/AddFileFolderHandler.java index fb53a633ce9108..a6a9756d03fae2 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/AddFileFolderHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/AddFileFolderHandler.java @@ -84,7 +84,7 @@ protected void processResponse(String response) throws Exception { SyncFileService.update(localSyncFile); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( AddFileFolderHandler.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseHandler.java index c94e78a282661c..81008ec1f04b28 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseHandler.java @@ -156,8 +156,8 @@ protected void retryServerConnection() { } } - private static Logger _logger = LoggerFactory.getLogger(BaseHandler.class); + private static final Logger _logger = LoggerFactory.getLogger(BaseHandler.class); - private Event _event; + private final Event _event; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseJSONHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseJSONHandler.java index 1b930af234ddaa..7b5e654f10bb88 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseJSONHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/BaseJSONHandler.java @@ -261,7 +261,7 @@ else if (exception.equals("java.lang.SecurityException")) { protected void processResponse(String response) throws Exception { } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( BaseJSONHandler.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/DownloadFileHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/DownloadFileHandler.java index 26866ecbb52250..cfe0219725f025 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/DownloadFileHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/DownloadFileHandler.java @@ -181,7 +181,7 @@ protected void doHandleResponse(HttpResponse httpResponse) } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( DownloadFileHandler.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/GetSyncDLObjectUpdateHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/GetSyncDLObjectUpdateHandler.java index 17ced78fdbc4cf..bddc839d781367 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/GetSyncDLObjectUpdateHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/GetSyncDLObjectUpdateHandler.java @@ -340,7 +340,7 @@ else if (targetSyncFile.isFile() && } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( GetSyncDLObjectUpdateHandler.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/UpdateFileEntryHandler.java b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/UpdateFileEntryHandler.java index 12e7f55c048272..2b60ee08086339 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/UpdateFileEntryHandler.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/documentlibrary/handler/UpdateFileEntryHandler.java @@ -79,7 +79,7 @@ protected void processResponse(String response) throws Exception { SyncFileService.update(localSyncFile); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( UpdateFileEntryHandler.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/BaseWatchEventListener.java b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/BaseWatchEventListener.java index 41087fb38b5fba..a088be9f1ebf64 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/BaseWatchEventListener.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/BaseWatchEventListener.java @@ -28,6 +28,6 @@ public long getSyncAccountId() { return _syncAccountId; } - private long _syncAccountId; + private final long _syncAccountId; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncSiteWatchEventListener.java b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncSiteWatchEventListener.java index 8b69bf2f40ac9f..61be338d80db2d 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncSiteWatchEventListener.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncSiteWatchEventListener.java @@ -144,7 +144,7 @@ protected boolean isDuplicateEvent( return true; } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncWatchEventService.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncWatchEventProcessor.java b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncWatchEventProcessor.java index 66efc69511fced..14221a175f0658 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncWatchEventProcessor.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/SyncWatchEventProcessor.java @@ -354,11 +354,11 @@ protected void modifyFile(SyncWatchEvent syncWatchEvent) throws Exception { SyncFileService.updateFileSyncFile(filePath, _syncAccountId, syncFile); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncWatchEventProcessor.class); private boolean _inProgress; - private Set _processedSyncWatchEventIds = new HashSet(); - private long _syncAccountId; + private final Set _processedSyncWatchEventIds = new HashSet(); + private final long _syncAccountId; } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/WatcherRegistry.java b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/WatcherRegistry.java index 4e92bef8f85a13..cd8a6c9f90f479 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/WatcherRegistry.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/filesystem/WatcherRegistry.java @@ -34,6 +34,6 @@ public static void unregister(long syncAccountId) { _watchers.remove(syncAccountId); } - private static Map _watchers = new HashMap(); + private static final Map _watchers = new HashMap(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncAccountModelListener.java b/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncAccountModelListener.java index b7d14cda8a419b..1f1917a4ca5a30 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncAccountModelListener.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncAccountModelListener.java @@ -86,6 +86,6 @@ protected void deactivateSyncAccount(SyncAccount syncAccount) { } } - private static Logger _logger = LoggerFactory.getLogger(SyncEngine.class); + private static final Logger _logger = LoggerFactory.getLogger(SyncEngine.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncFileModelListener.java b/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncFileModelListener.java index c3fd3cf7f27c65..7809d17fcab93b 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncFileModelListener.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/model/SyncFileModelListener.java @@ -63,7 +63,7 @@ public void onUpdate( IODeltaUtil.checksums(syncFile); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncFileModelListener.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncAccountService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncAccountService.java index a15e0015915155..68ae720da23c54 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncAccountService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncAccountService.java @@ -380,11 +380,11 @@ public static void updateSyncAccountSyncFile( } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncAccountService.class); private static Set _activeSyncAccountIds; - private static ScheduledExecutorService _scheduledExecutorService = + private static final ScheduledExecutorService _scheduledExecutorService = Executors.newScheduledThreadPool(5); private static SyncAccountPersistence _syncAccountPersistence = getSyncAccountPersistence(); diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncFileService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncFileService.java index c830427983789d..5515b5ca33e8c3 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncFileService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncFileService.java @@ -701,7 +701,7 @@ private static String _getName(Path filePath, SyncFile syncFile) { return name; } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncFileService.class); private static SyncFilePersistence _syncFilePersistence = diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncPropService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncPropService.java index 5ffa8d2236b00a..92319ee2edfc9c 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncPropService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncPropService.java @@ -100,7 +100,7 @@ public static SyncProp updateSyncProp(String key, Object value) return syncProp; } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncPropService.class); private static SyncPropPersistence _syncPropPersistence = diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncSiteService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncSiteService.java index 26a0e3e744ccea..ac942937241a3a 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncSiteService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncSiteService.java @@ -196,10 +196,10 @@ public static SyncSite update(SyncSite syncSite) { } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncSiteService.class); - private static Map> _activeSyncSiteIds = + private static final Map> _activeSyncSiteIds = new HashMap>(); private static SyncSitePersistence _syncSitePersistence = getSyncSitePersistence(); diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncUserService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncUserService.java index 44bdff544506ad..f7afab240f0535 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncUserService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncUserService.java @@ -98,7 +98,7 @@ public static SyncUser update(SyncUser syncUser) { } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncUserService.class); private static SyncUserPersistence _syncUserPersistence = diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncWatchEventService.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncWatchEventService.java index 409a4a9b324a2b..6a47551d43f563 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncWatchEventService.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/SyncWatchEventService.java @@ -159,7 +159,7 @@ public static SyncWatchEventPersistence getSyncWatchEventPersistence() { return _syncWatchEventPersistence; } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncWatchEventService.class); private static SyncWatchEventPersistence _syncWatchEventPersistence = diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/service/persistence/BasePersistenceImpl.java b/modules/util/sync-engine/src/com/liferay/sync/engine/service/persistence/BasePersistenceImpl.java index 07c83d4b475554..b42b956cf26328 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/service/persistence/BasePersistenceImpl.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/service/persistence/BasePersistenceImpl.java @@ -192,9 +192,9 @@ private static ConnectionSource _getConnectionSource() throws SQLException { private static ConnectionSource _connectionSource; - private List> _modelListeners = + private final List> _modelListeners = new ArrayList>(); - private Map _syncNotificationFieldNames = + private final Map _syncNotificationFieldNames = new HashMap(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/session/Session.java b/modules/util/sync-engine/src/com/liferay/sync/engine/session/Session.java index 1ebfe59c752210..4ed49e2841a646 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/session/Session.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/session/Session.java @@ -346,16 +346,16 @@ private StringBody _getStringBody(Object value) { Charset.defaultCharset())); } - private static Logger _logger = LoggerFactory.getLogger(Session.class); + private static final Logger _logger = LoggerFactory.getLogger(Session.class); private static HttpRoutePlanner _httpRoutePlanner; private static String _token; private BasicHttpContext _basicHttpContext; - private ExecutorService _executorService; - private HttpClient _httpClient; - private HttpHost _httpHost; - private Set _ignoredParameterKeys = new HashSet( + private final ExecutorService _executorService; + private final HttpClient _httpClient; + private final HttpHost _httpHost; + private final Set _ignoredParameterKeys = new HashSet( Arrays.asList("filePath", "syncFile", "syncSite", "uiEvent")); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/session/SessionManager.java b/modules/util/sync-engine/src/com/liferay/sync/engine/session/SessionManager.java index 0a04eca79a4ef9..947f919eb109f5 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/session/SessionManager.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/session/SessionManager.java @@ -70,9 +70,9 @@ public static void removeSession(long syncAccountId) { executorService.shutdownNow(); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SessionManager.class); - private static Map _sessions = new HashMap(); + private static final Map _sessions = new HashMap(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/BidirectionalMap.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/BidirectionalMap.java index 54f827e54e3f82..23cb281babe09d 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/BidirectionalMap.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/BidirectionalMap.java @@ -52,6 +52,6 @@ public K removeValue(Object value) { return key; } - private Map _invertedMap = new HashMap(); + private final Map _invertedMap = new HashMap(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/IODeltaUtil.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/IODeltaUtil.java index f1df6c98c24587..f7b0cef861dae4 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/IODeltaUtil.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/IODeltaUtil.java @@ -232,9 +232,9 @@ public static Path patch( } } - private static Logger _logger = LoggerFactory.getLogger(IODeltaUtil.class); + private static final Logger _logger = LoggerFactory.getLogger(IODeltaUtil.class); - private static Set _syncFilePatchingIgnoreFileExtensions = + private static final Set _syncFilePatchingIgnoreFileExtensions = new HashSet( Arrays.asList( PropsValues.SYNC_FILE_PATCHING_IGNORE_FILE_EXTENSIONS)); diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/PropsUtil.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/PropsUtil.java index 9e3ecae14b191f..b53229272c80d1 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/PropsUtil.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/PropsUtil.java @@ -77,11 +77,11 @@ private void _set(String key, String value) { _compositeConfiguration.setProperty(key, value); } - private static Logger _logger = LoggerFactory.getLogger(PropsUtil.class); + private static final Logger _logger = LoggerFactory.getLogger(PropsUtil.class); - private static PropsUtil _instance = new PropsUtil(); + private static final PropsUtil _instance = new PropsUtil(); - private CompositeConfiguration _compositeConfiguration = + private final CompositeConfiguration _compositeConfiguration = new CompositeConfiguration(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/ReleaseInfo.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/ReleaseInfo.java index 8765d6f49a16dd..6ade1c9102a36c 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/ReleaseInfo.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/ReleaseInfo.java @@ -56,7 +56,7 @@ public static boolean isServerCompatible(SyncContext syncContext) { private static final String _VERSION = "2.0.0"; - private static Pattern _pattern = Pattern.compile( + private static final Pattern _pattern = Pattern.compile( "(?:[0-9]+\\.){3}([0-9]+)"); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/StreamUtil.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/StreamUtil.java index 5eb948cbfd09da..86df805a348dec 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/StreamUtil.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/StreamUtil.java @@ -78,6 +78,6 @@ public static void cleanUp(OutputStream outputStream) { } } - private static Logger _log = LoggerFactory.getLogger(StreamUtil.class); + private static final Logger _log = LoggerFactory.getLogger(StreamUtil.class); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncClientUpdater.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncClientUpdater.java index bf96a2659ebde0..3260ab79da3ef1 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncClientUpdater.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncClientUpdater.java @@ -208,11 +208,11 @@ protected static HttpGet getHttpGet(String url) { return httpGet; } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncClientUpdater.class); private static Future _autoUpdateChecker; - private static ScheduledExecutorService _scheduledExecutorService = + private static final ScheduledExecutorService _scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); } \ No newline at end of file diff --git a/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncEngineUtil.java b/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncEngineUtil.java index b67371307acb00..48968ae38c1ab0 100644 --- a/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncEngineUtil.java +++ b/modules/util/sync-engine/src/com/liferay/sync/engine/util/SyncEngineUtil.java @@ -68,9 +68,9 @@ public static void unregisterSyncEngineListener( _syncEngineListeners.remove(syncEngineListener); } - private static ExecutorService _executorService = + private static final ExecutorService _executorService = Executors.newSingleThreadScheduledExecutor(); - private static List _syncEngineListeners = + private static final List _syncEngineListeners = new ArrayList(); } \ No newline at end of file diff --git a/modules/util/sync-engine/test/integration/com/liferay/sync/engine/SyncSystemTest.java b/modules/util/sync-engine/test/integration/com/liferay/sync/engine/SyncSystemTest.java index 9b8f62ecf16852..cf37d27308fab3 100644 --- a/modules/util/sync-engine/test/integration/com/liferay/sync/engine/SyncSystemTest.java +++ b/modules/util/sync-engine/test/integration/com/liferay/sync/engine/SyncSystemTest.java @@ -555,16 +555,16 @@ else if (operation.equals("notExists")) { } } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncSystemTest.class); private static boolean _liferayStarted; private static String _rootFilePathName; private static SyncAccount _syncAccount; - private static Map _syncAccountIds = + private static final Map _syncAccountIds = new HashMap(); - private Map _syncSiteIds = new HashMap(); - private Path _testFilePath; + private final Map _syncSiteIds = new HashMap(); + private final Path _testFilePath; } \ No newline at end of file diff --git a/modules/util/sync-engine/test/integration/com/liferay/sync/engine/util/SyncSystemTestUtil.java b/modules/util/sync-engine/test/integration/com/liferay/sync/engine/util/SyncSystemTestUtil.java index 77e750799f70c9..a4b2c153a4d226 100644 --- a/modules/util/sync-engine/test/integration/com/liferay/sync/engine/util/SyncSystemTestUtil.java +++ b/modules/util/sync-engine/test/integration/com/liferay/sync/engine/util/SyncSystemTestUtil.java @@ -263,7 +263,7 @@ protected static JsonNode toJsonNode(HttpResponse httpResponse) return objectMapper.readTree(response); } - private static Logger _logger = LoggerFactory.getLogger( + private static final Logger _logger = LoggerFactory.getLogger( SyncSystemTestUtil.class); private static long _adminRoleId; diff --git a/modules/util/sync-engine/test/unit/com/liferay/sync/engine/BaseTestCase.java b/modules/util/sync-engine/test/unit/com/liferay/sync/engine/BaseTestCase.java index 14e69c52d6486e..15fab312c68e2e 100644 --- a/modules/util/sync-engine/test/unit/com/liferay/sync/engine/BaseTestCase.java +++ b/modules/util/sync-engine/test/unit/com/liferay/sync/engine/BaseTestCase.java @@ -243,6 +243,6 @@ protected void setResponse(String fileName) throws Exception { protected String filePathName; protected SyncAccount syncAccount; - private static Logger _logger = LoggerFactory.getLogger(BaseTestCase.class); + private static final Logger _logger = LoggerFactory.getLogger(BaseTestCase.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/counter/service/persistence/impl/CounterFinderImpl.java b/portal-impl/src/com/liferay/counter/service/persistence/impl/CounterFinderImpl.java index 1c727002840592..313b2b20f97642 100644 --- a/portal-impl/src/com/liferay/counter/service/persistence/impl/CounterFinderImpl.java +++ b/portal-impl/src/com/liferay/counter/service/persistence/impl/CounterFinderImpl.java @@ -426,9 +426,9 @@ private CounterHolder _obtainIncrement( private static final String _SQL_UPDATE_NAME_BY_NAME = "update Counter set name = ? where name = ?"; - private Map _counterRegisterMap = + private final Map _counterRegisterMap = new ConcurrentHashMap(); - private Map _rangeSizeMap = + private final Map _rangeSizeMap = new ConcurrentHashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/mail/service/impl/MailServiceImpl.java b/portal-impl/src/com/liferay/mail/service/impl/MailServiceImpl.java index 2edf8d676591c0..080741697fa5a1 100644 --- a/portal-impl/src/com/liferay/mail/service/impl/MailServiceImpl.java +++ b/portal-impl/src/com/liferay/mail/service/impl/MailServiceImpl.java @@ -303,26 +303,26 @@ public void updatePassword(long companyId, long userId, String password) { MessageBusUtil.sendMessage(DestinationNames.MAIL, methodHandler); } - private static Log _log = LogFactoryUtil.getLog(MailServiceImpl.class); + private static final Log _log = LogFactoryUtil.getLog(MailServiceImpl.class); - private static MethodKey _addForwardMethodKey = new MethodKey( + private static final MethodKey _addForwardMethodKey = new MethodKey( Hook.class, "addForward", long.class, long.class, List.class, List.class, boolean.class); - private static MethodKey _addUserMethodKey = new MethodKey( + private static final MethodKey _addUserMethodKey = new MethodKey( Hook.class, "addUser", long.class, long.class, String.class, String.class, String.class, String.class, String.class); - private static MethodKey _addVacationMessageMethodKey = new MethodKey( + private static final MethodKey _addVacationMessageMethodKey = new MethodKey( Hook.class, "addVacationMessage", long.class, long.class, String.class, String.class); - private static MethodKey _deleteEmailAddressMethodKey = new MethodKey( + private static final MethodKey _deleteEmailAddressMethodKey = new MethodKey( Hook.class, "deleteEmailAddress", long.class, long.class); - private static MethodKey _deleteUserMethodKey = new MethodKey( + private static final MethodKey _deleteUserMethodKey = new MethodKey( Hook.class, "deleteUser", long.class, long.class); - private static MethodKey _updateBlockedMethodKey = new MethodKey( + private static final MethodKey _updateBlockedMethodKey = new MethodKey( Hook.class, "updateBlocked", long.class, long.class, List.class); - private static MethodKey _updateEmailAddressMethodKey = new MethodKey( + private static final MethodKey _updateEmailAddressMethodKey = new MethodKey( Hook.class, "updateEmailAddress", long.class, long.class, String.class); - private static MethodKey _updatePasswordMethodKey = new MethodKey( + private static final MethodKey _updatePasswordMethodKey = new MethodKey( Hook.class, "updatePassword", long.class, long.class, String.class); private String _beanIdentifier; diff --git a/portal-impl/src/com/liferay/mail/util/DummyHook.java b/portal-impl/src/com/liferay/mail/util/DummyHook.java index cf7a5da4d71f7c..e46c5b2ce2d5cc 100644 --- a/portal-impl/src/com/liferay/mail/util/DummyHook.java +++ b/portal-impl/src/com/liferay/mail/util/DummyHook.java @@ -94,6 +94,6 @@ public void updatePassword(long companyId, long userId, String password) { } } - private static Log _log = LogFactoryUtil.getLog(DummyHook.class); + private static final Log _log = LogFactoryUtil.getLog(DummyHook.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/mail/util/HookFactory.java b/portal-impl/src/com/liferay/mail/util/HookFactory.java index 1f148ec6bd615f..ed724a26607a03 100644 --- a/portal-impl/src/com/liferay/mail/util/HookFactory.java +++ b/portal-impl/src/com/liferay/mail/util/HookFactory.java @@ -37,8 +37,8 @@ private HookFactory() { _serviceTracker.open(); } - private static HookFactory _instance = new HookFactory(); + private static final HookFactory _instance = new HookFactory(); - private ServiceTracker _serviceTracker; + private final ServiceTracker _serviceTracker; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/mail/util/MailSessionFactoryBean.java b/portal-impl/src/com/liferay/mail/util/MailSessionFactoryBean.java index 73ad5bb293a161..d66dc9c804c6f9 100644 --- a/portal-impl/src/com/liferay/mail/util/MailSessionFactoryBean.java +++ b/portal-impl/src/com/liferay/mail/util/MailSessionFactoryBean.java @@ -81,7 +81,7 @@ protected Session createInstance() throws Exception { return session; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( MailSessionFactoryBean.class); private String _propertyPrefix; diff --git a/portal-impl/src/com/liferay/portal/action/LayoutAction.java b/portal-impl/src/com/liferay/portal/action/LayoutAction.java index 5030eb17b6f855..93b7308574d132 100644 --- a/portal-impl/src/com/liferay/portal/action/LayoutAction.java +++ b/portal-impl/src/com/liferay/portal/action/LayoutAction.java @@ -357,8 +357,8 @@ else if (themeDisplay.isLifecycleResource()) { } } - private static Log _log = LogFactoryUtil.getLog(LayoutAction.class); + private static final Log _log = LogFactoryUtil.getLog(LayoutAction.class); - private Set _layoutResetPortletIds; + private final Set _layoutResetPortletIds; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/action/RESTProxyAction.java b/portal-impl/src/com/liferay/portal/action/RESTProxyAction.java index 348f2fea5ebb25..6032350146a0c5 100644 --- a/portal-impl/src/com/liferay/portal/action/RESTProxyAction.java +++ b/portal-impl/src/com/liferay/portal/action/RESTProxyAction.java @@ -100,6 +100,6 @@ protected boolean validate(String url) { return false; } - private static Log _log = LogFactoryUtil.getLog(RESTProxyAction.class); + private static final Log _log = LogFactoryUtil.getLog(RESTProxyAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/action/TestAction.java b/portal-impl/src/com/liferay/portal/action/TestAction.java index a4eeb89b075998..76a06018192aeb 100644 --- a/portal-impl/src/com/liferay/portal/action/TestAction.java +++ b/portal-impl/src/com/liferay/portal/action/TestAction.java @@ -43,6 +43,6 @@ public ActionForward execute( return actionMapping.findForward("portal.test"); } - private static Log _log = LogFactoryUtil.getLog(TestAction.class); + private static final Log _log = LogFactoryUtil.getLog(TestAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/action/TestRedirectAction.java b/portal-impl/src/com/liferay/portal/action/TestRedirectAction.java index d59ff665e8a696..6d8773453b34c3 100644 --- a/portal-impl/src/com/liferay/portal/action/TestRedirectAction.java +++ b/portal-impl/src/com/liferay/portal/action/TestRedirectAction.java @@ -43,6 +43,6 @@ public ActionForward execute( return actionMapping.findForward("portal.test_redirect"); } - private static Log _log = LogFactoryUtil.getLog(TestRedirectAction.class); + private static final Log _log = LogFactoryUtil.getLog(TestRedirectAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayRequestDispatcher.java b/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayRequestDispatcher.java index ca49cb36f64558..c31c7db086d019 100644 --- a/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayRequestDispatcher.java +++ b/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayRequestDispatcher.java @@ -257,7 +257,7 @@ protected Set getServletURLPatterns( return portletApp.getServletURLPatterns(); } - private String _path; - private RequestDispatcher _requestDispatcher; + private final String _path; + private final RequestDispatcher _requestDispatcher; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayServletContext.java b/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayServletContext.java index 9b2705c039dfb9..614b0eb292dca5 100644 --- a/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayServletContext.java +++ b/portal-impl/src/com/liferay/portal/apache/bridges/struts/LiferayServletContext.java @@ -348,6 +348,6 @@ public String toString() { return _servletContext.toString(); } - private ServletContext _servletContext; + private final ServletContext _servletContext; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/asm/ASMUtil.java b/portal-impl/src/com/liferay/portal/asm/ASMUtil.java index 415b6b504fe009..d689a7ca177fe7 100644 --- a/portal-impl/src/com/liferay/portal/asm/ASMUtil.java +++ b/portal-impl/src/com/liferay/portal/asm/ASMUtil.java @@ -267,7 +267,7 @@ public static List removeMethodNodes( return removedMethodNodes; } - private static MethodVisitor _emptyMethodVisitor = + private static final MethodVisitor _emptyMethodVisitor = new MethodVisitor(Opcodes.ASM5) { }; diff --git a/portal-impl/src/com/liferay/portal/asm/MethodNodeGenerator.java b/portal-impl/src/com/liferay/portal/asm/MethodNodeGenerator.java index 688a617597d141..555f3b54140e56 100644 --- a/portal-impl/src/com/liferay/portal/asm/MethodNodeGenerator.java +++ b/portal-impl/src/com/liferay/portal/asm/MethodNodeGenerator.java @@ -129,6 +129,6 @@ private static MethodNode _createMethodNode(Method method) { return methodNode; } - private MethodNode _methodNode; + private final MethodNode _methodNode; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/aspectj/URLWeavingAdapter.java b/portal-impl/src/com/liferay/portal/aspectj/URLWeavingAdapter.java index 92e919dd68cafa..c30e099195e285 100644 --- a/portal-impl/src/com/liferay/portal/aspectj/URLWeavingAdapter.java +++ b/portal-impl/src/com/liferay/portal/aspectj/URLWeavingAdapter.java @@ -150,7 +150,7 @@ private JavaClass _classToJavaClass(Class aspectClass) { } } - private Map _generatedClasses = + private final Map _generatedClasses = new HashMap(); private class RecordGeneratedClassHandler implements GeneratedClassHandler { diff --git a/portal-impl/src/com/liferay/portal/aspectj/WeavingClassLoader.java b/portal-impl/src/com/liferay/portal/aspectj/WeavingClassLoader.java index 830ccd4bb8a94b..3ab22d0826d4dc 100644 --- a/portal-impl/src/com/liferay/portal/aspectj/WeavingClassLoader.java +++ b/portal-impl/src/com/liferay/portal/aspectj/WeavingClassLoader.java @@ -144,9 +144,9 @@ private Class _generateClass(String name, byte[] data) { return clazz; } - private static Log _log = LogFactoryUtil.getLog(WeavingClassLoader.class); + private static final Log _log = LogFactoryUtil.getLog(WeavingClassLoader.class); - private File _dumpDir; - private URLWeavingAdapter _urlWeavingAdapter; + private final File _dumpDir; + private final URLWeavingAdapter _urlWeavingAdapter; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/asset/LayoutAssetRenderer.java b/portal-impl/src/com/liferay/portal/asset/LayoutAssetRenderer.java index 51da91fd7d8ac4..d30aaecab3adb0 100644 --- a/portal-impl/src/com/liferay/portal/asset/LayoutAssetRenderer.java +++ b/portal-impl/src/com/liferay/portal/asset/LayoutAssetRenderer.java @@ -129,6 +129,6 @@ public String render( } } - private Layout _layout; + private final Layout _layout; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/asset/LayoutRevisionAssetRenderer.java b/portal-impl/src/com/liferay/portal/asset/LayoutRevisionAssetRenderer.java index db97fc21ff3a60..655d21ee240b64 100644 --- a/portal-impl/src/com/liferay/portal/asset/LayoutRevisionAssetRenderer.java +++ b/portal-impl/src/com/liferay/portal/asset/LayoutRevisionAssetRenderer.java @@ -173,8 +173,8 @@ public String render( } } - private LayoutBranch _layoutBranch; - private LayoutRevision _layoutRevision; - private LayoutSetBranch _layoutSetBranch; + private final LayoutBranch _layoutBranch; + private final LayoutRevision _layoutRevision; + private final LayoutSetBranch _layoutSetBranch; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/atom/AtomCollectionAdapterWrapper.java b/portal-impl/src/com/liferay/portal/atom/AtomCollectionAdapterWrapper.java index 47cc03b990a27a..80c9691acfcc89 100644 --- a/portal-impl/src/com/liferay/portal/atom/AtomCollectionAdapterWrapper.java +++ b/portal-impl/src/com/liferay/portal/atom/AtomCollectionAdapterWrapper.java @@ -299,6 +299,6 @@ else if (atomEntryContentType == AtomEntryContent.Type.XML) { } } - private AtomCollectionAdapter _atomCollectionAdapter; + private final AtomCollectionAdapter _atomCollectionAdapter; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/atom/AtomPager.java b/portal-impl/src/com/liferay/portal/atom/AtomPager.java index 477f107baef73b..a3517850d04299 100644 --- a/portal-impl/src/com/liferay/portal/atom/AtomPager.java +++ b/portal-impl/src/com/liferay/portal/atom/AtomPager.java @@ -137,14 +137,14 @@ public void setFeedPagingLinks(Feed feed, String url) { } } - private int _elementsPerPage; - private int _end; - private int _firstPage; - private int _lastPage; - private int _nextPage; - private int _page; - private int _previousPage; - private int _start; - private int _totalElements; + private final int _elementsPerPage; + private final int _end; + private final int _firstPage; + private final int _lastPage; + private final int _nextPage; + private final int _page; + private final int _previousPage; + private final int _start; + private final int _totalElements; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/atom/AtomRequestContextImpl.java b/portal-impl/src/com/liferay/portal/atom/AtomRequestContextImpl.java index eafd6ba8f8efd9..3528a6fd8458b6 100644 --- a/portal-impl/src/com/liferay/portal/atom/AtomRequestContextImpl.java +++ b/portal-impl/src/com/liferay/portal/atom/AtomRequestContextImpl.java @@ -115,6 +115,6 @@ public void setSessionAttribute(String name, Object value) { _requestContext.setAttribute(RequestContext.Scope.SESSION, name, value); } - private RequestContext _requestContext; + private final RequestContext _requestContext; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/atom/BaseEntityCollectionAdapter.java b/portal-impl/src/com/liferay/portal/atom/BaseEntityCollectionAdapter.java index 224297cd587634..f213805478d036 100644 --- a/portal-impl/src/com/liferay/portal/atom/BaseEntityCollectionAdapter.java +++ b/portal-impl/src/com/liferay/portal/atom/BaseEntityCollectionAdapter.java @@ -160,7 +160,7 @@ protected Feed createFeedBase(RequestContext requestContext) { protected String collectionName; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( BaseEntityCollectionAdapter.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/backgroundtask/BackgroundTaskStatusRegistryImpl.java b/portal-impl/src/com/liferay/portal/backgroundtask/BackgroundTaskStatusRegistryImpl.java index 69286dcf9731c7..81deeb29ea3fea 100644 --- a/portal-impl/src/com/liferay/portal/backgroundtask/BackgroundTaskStatusRegistryImpl.java +++ b/portal-impl/src/com/liferay/portal/backgroundtask/BackgroundTaskStatusRegistryImpl.java @@ -88,8 +88,8 @@ public BackgroundTaskStatus unregisterBackgroundTaskStatus( } } - private Map _backgroundTaskStatuses = + private final Map _backgroundTaskStatuses = new HashMap(); - private ReadWriteLock _readWriteLock = new ReentrantReadWriteLock(); + private final ReadWriteLock _readWriteLock = new ReentrantReadWriteLock(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java index bb05bbe07093ff..e910ea7f38be7d 100644 --- a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java +++ b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskMessageListener.java @@ -182,7 +182,7 @@ protected BackgroundTaskExecutor wrapBackgroundTaskExecutor( return backgroundTaskExecutor; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( BackgroundTaskMessageListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskStatusMessageListener.java b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskStatusMessageListener.java index db8d48a7b03c31..d0c87b0fedb7a3 100644 --- a/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskStatusMessageListener.java +++ b/portal-impl/src/com/liferay/portal/backgroundtask/messaging/BackgroundTaskStatusMessageListener.java @@ -63,11 +63,11 @@ protected void doReceive(Message message) throws Exception { backgroundTaskStatus, message); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( BackgroundTaskStatusMessageListener.class); - private long _backgroundTaskId; - private BackgroundTaskStatusMessageTranslator + private final long _backgroundTaskId; + private final BackgroundTaskStatusMessageTranslator _backgroundTaskStatusMessageTranslator; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/bean/BeanLocatorImpl.java b/portal-impl/src/com/liferay/portal/bean/BeanLocatorImpl.java index be0c12fb2bc44e..9958ba144d21b7 100644 --- a/portal-impl/src/com/liferay/portal/bean/BeanLocatorImpl.java +++ b/portal-impl/src/com/liferay/portal/bean/BeanLocatorImpl.java @@ -180,14 +180,14 @@ protected Object doLocate(String name) throws Exception { return _pacl.getBean(bean, _classLoader); } - private static Log _log = LogFactoryUtil.getLog(BeanLocatorImpl.class); + private static final Log _log = LogFactoryUtil.getLog(BeanLocatorImpl.class); - private static PACL _pacl = new NoPACL(); + private static final PACL _pacl = new NoPACL(); private ApplicationContext _applicationContext; - private ClassLoader _classLoader; + private final ClassLoader _classLoader; private String _paclServletContextName; - private Map _velocityBeans = + private final Map _velocityBeans = new ConcurrentHashMap(); private static class NoPACL implements PACL { diff --git a/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java b/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java index 745a197a6b92dc..f117ce2afe2403 100644 --- a/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java +++ b/portal-impl/src/com/liferay/portal/bean/IdentifiableBeanInvokerUtil.java @@ -89,7 +89,7 @@ private static Object _invoke( } } - private static MethodKey _invokeMethodKey = new MethodKey( + private static final MethodKey _invokeMethodKey = new MethodKey( IdentifiableBeanInvokerUtil.class, "_invoke", MethodHandler.class, String.class, String.class, String.class); diff --git a/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java b/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java index be1b1ddd71be60..4a6e280ed85487 100644 --- a/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java +++ b/portal-impl/src/com/liferay/portal/bean/VelocityBeanHandler.java @@ -62,7 +62,7 @@ public Object invoke(Object proxy, Method method, Object[] arguments) } } - private Object _bean; - private ClassLoader _classLoader; + private final Object _bean; + private final ClassLoader _classLoader; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/CacheRegistryImpl.java b/portal-impl/src/com/liferay/portal/cache/CacheRegistryImpl.java index 971945edfe8d7e..ea12a55a080cf2 100644 --- a/portal-impl/src/com/liferay/portal/cache/CacheRegistryImpl.java +++ b/portal-impl/src/com/liferay/portal/cache/CacheRegistryImpl.java @@ -102,10 +102,10 @@ public void unregister(String name) { _cacheRegistryItems.remove(name); } - private static Log _log = LogFactoryUtil.getLog(CacheRegistryImpl.class); + private static final Log _log = LogFactoryUtil.getLog(CacheRegistryImpl.class); private boolean _active = true; - private Map _cacheRegistryItems = + private final Map _cacheRegistryItems = new ConcurrentHashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoader.java b/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoader.java index 806157c884349d..74a4d2b3d03aec 100644 --- a/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoader.java +++ b/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoader.java @@ -77,7 +77,7 @@ protected void doLoad( } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterLinkBootstrapLoader.class); private final boolean _bootstrapAsynchronously; diff --git a/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoaderHelperUtil.java b/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoaderHelperUtil.java index 2fdb429d7e2f3a..02d31191581228 100644 --- a/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoaderHelperUtil.java +++ b/portal-impl/src/com/liferay/portal/cache/bootstrap/ClusterLinkBootstrapLoaderHelperUtil.java @@ -292,18 +292,18 @@ else if (object instanceof String) { private static final String _COMMAND_SOCKET_CLOSE = "${SOCKET_CLOSE}"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterLinkBootstrapLoaderHelperUtil.class); - private static MethodKey _createServerSocketFromClusterMethodKey = + private static final MethodKey _createServerSocketFromClusterMethodKey = new MethodKey( ClusterLinkBootstrapLoaderHelperUtil.class, "createServerSocketFromCluster", String.class, List.class); private static final Map> _deferredPortalCaches = new HashMap>(); - private static ServerSocketConfigurator _serverSocketConfigurator = + private static final ServerSocketConfigurator _serverSocketConfigurator = new SocketCacheServerSocketConfiguration(); - private static ThreadLocal _skipBootstrapLoaderThreadLocal = + private static final ThreadLocal _skipBootstrapLoaderThreadLocal = new InitialThreadLocal( ClusterLinkBootstrapLoaderHelperUtil.class + "._skipBootstrapLoaderThreadLocal", @@ -325,8 +325,8 @@ public Serializable getValue() { return _value; } - private Serializable _key; - private Serializable _value; + private final Serializable _key; + private final Serializable _value; } @@ -429,9 +429,9 @@ public void run() { } } - private String _portalCacheManagerName; - private List _portalCacheNames; - private ServerSocket _serverSocket; + private final String _portalCacheManagerName; + private final List _portalCacheNames; + private final ServerSocket _serverSocket; } diff --git a/portal-impl/src/com/liferay/portal/cache/bootstrap/EhcacheStreamBootstrapCacheLoader.java b/portal-impl/src/com/liferay/portal/cache/bootstrap/EhcacheStreamBootstrapCacheLoader.java index ca35a6a69a9df9..0ff1ef33c11ffe 100644 --- a/portal-impl/src/com/liferay/portal/cache/bootstrap/EhcacheStreamBootstrapCacheLoader.java +++ b/portal-impl/src/com/liferay/portal/cache/bootstrap/EhcacheStreamBootstrapCacheLoader.java @@ -85,7 +85,7 @@ public void load(Ehcache ehcache) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( EhcacheStreamBootstrapCacheLoader.class); private final boolean _bootstrapAsynchronously; @@ -120,7 +120,7 @@ public void run() { } } - private Ehcache _ehcache; + private final Ehcache _ehcache; } diff --git a/portal-impl/src/com/liferay/portal/cache/cluster/ClusterReplicationThreadLocal.java b/portal-impl/src/com/liferay/portal/cache/cluster/ClusterReplicationThreadLocal.java index 3b8ccb88759cfd..4398efaaa0a197 100644 --- a/portal-impl/src/com/liferay/portal/cache/cluster/ClusterReplicationThreadLocal.java +++ b/portal-impl/src/com/liferay/portal/cache/cluster/ClusterReplicationThreadLocal.java @@ -29,7 +29,7 @@ public static void setReplicate(boolean replicate) { _replicateThreadLocal.set(replicate); } - private static ThreadLocal _replicateThreadLocal = + private static final ThreadLocal _replicateThreadLocal = new InitialThreadLocal( ClusterReplicationThreadLocal.class + "._replicateThreadLocal", Boolean.TRUE); diff --git a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannel.java b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannel.java index 81d5f742b6e750..7ca18ad80c1058 100644 --- a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannel.java +++ b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannel.java @@ -53,7 +53,7 @@ public void dispatchEvent(PortalCacheClusterEvent portalCacheClusterEvent) { ClusterLinkUtil.sendMulticastMessage(message, _priority); } - private String _destinationName; - private Priority _priority; + private final String _destinationName; + private final Priority _priority; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannelFactory.java b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannelFactory.java index 4a26ebc814a6f6..eb84a2b7955c6b 100644 --- a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannelFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/ClusterLinkPortalCacheClusterChannelFactory.java @@ -54,7 +54,7 @@ public void setPriorities(List priorities) { Collections.sort(priorities); } - private AtomicInteger _counter = new AtomicInteger(0); + private final AtomicInteger _counter = new AtomicInteger(0); private String _destinationName; private List _priorities; diff --git a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/messaging/ClusterLinkPortalCacheClusterListener.java b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/messaging/ClusterLinkPortalCacheClusterListener.java index f64069246b95ec..5d0e352411a5c2 100644 --- a/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/messaging/ClusterLinkPortalCacheClusterListener.java +++ b/portal-impl/src/com/liferay/portal/cache/cluster/clusterlink/messaging/ClusterLinkPortalCacheClusterListener.java @@ -109,7 +109,7 @@ else if (portalCacheClusterEventType.equals( } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterLinkPortalCacheClusterListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/configurator/impl/PortalCacheConfiguratorImpl.java b/portal-impl/src/com/liferay/portal/cache/configurator/impl/PortalCacheConfiguratorImpl.java index febc001c685155..6fe6592fe7d774 100644 --- a/portal-impl/src/com/liferay/portal/cache/configurator/impl/PortalCacheConfiguratorImpl.java +++ b/portal-impl/src/com/liferay/portal/cache/configurator/impl/PortalCacheConfiguratorImpl.java @@ -93,7 +93,7 @@ public void reconfigureHibernateCache(URL url) { liferayEhcacheRegionFactory.reconfigureCaches(url); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortalCacheConfiguratorImpl.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/ClearEhcacheThreadUtil.java b/portal-impl/src/com/liferay/portal/cache/ehcache/ClearEhcacheThreadUtil.java index ad4980349d37f0..03a0cdd7e22b53 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/ClearEhcacheThreadUtil.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/ClearEhcacheThreadUtil.java @@ -53,7 +53,7 @@ public static void clearEhcacheReplicationThread() private static final long _WAIT_TIME = 1000; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClearEhcacheThreadUtil.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheBootstrapLoaderAdapter.java b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheBootstrapLoaderAdapter.java index b9f69147eb38d7..8723acf82ece3d 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheBootstrapLoaderAdapter.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheBootstrapLoaderAdapter.java @@ -58,7 +58,7 @@ public void load(String portalCacheManagerName, String portalCacheName) { _bootstrapCacheLoader.load(EhcacheUnwrapUtil.getEhcache(portalCache)); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( EhcacheBootstrapLoaderAdapter.class); private final BootstrapCacheLoader _bootstrapCacheLoader; diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheCallbackFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheCallbackFactory.java index 9400c1638720e1..be9bb1df2a73ac 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheCallbackFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcacheCallbackFactory.java @@ -163,7 +163,7 @@ public CacheManagerListener createCacheManagerListener( private EhcacheCallbackFactory() { } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( EhcacheCallbackFactory.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCache.java b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCache.java index e56dfe86cc303b..b8ef12a84ac724 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCache.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCache.java @@ -157,6 +157,6 @@ protected boolean doReplace(K key, V oldValue, V newValue, int timeToLive) { protected Ehcache ehcache; - private PortalCacheManager _portalCacheManager; + private final PortalCacheManager _portalCacheManager; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCacheManager.java b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCacheManager.java index 066055b9ae0bf9..fdcc6fe5b8a9ec 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCacheManager.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/EhcachePortalCacheManager.java @@ -225,7 +225,7 @@ protected void reconfigEhcache(Configuration configuration) { private static final String _DEFAULT_CLUSTERED_EHCACHE_CONFIG_FILE = "/ehcache/liferay-multi-vm-clustered.xml"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( EhcachePortalCacheManager.class); private CacheManager _cacheManager; diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsCacheManagerPeerProviderFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsCacheManagerPeerProviderFactory.java index 8c7bd85719694d..cff9c3355540cf 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsCacheManagerPeerProviderFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsCacheManagerPeerProviderFactory.java @@ -74,7 +74,7 @@ public CacheManagerPeerProvider createCachePeerProvider( private static final String _DEFAULT_CLUSTER_NAME = "Ehcache"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( JGroupsCacheManagerPeerProviderFactory.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsManager.java b/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsManager.java index 1003cc66636157..d7fedb00879e51 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsManager.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/JGroupsManager.java @@ -273,7 +273,7 @@ else if (event == JGroupEventMessage.PUT) { private static final String _SCHEME = "JGroups"; - private static Log _log = LogFactoryUtil.getLog(JGroupsManager.class); + private static final Log _log = LogFactoryUtil.getLog(JGroupsManager.class); private final CacheManager _cacheManager; private final JChannel _jChannel; diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayBootstrapCacheLoaderFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayBootstrapCacheLoaderFactory.java index 3ab35f3ead4337..bf8de9bafcec75 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayBootstrapCacheLoaderFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayBootstrapCacheLoaderFactory.java @@ -62,9 +62,9 @@ public T createBootstrapCacheLoader(Properties properties) { properties); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayBootstrapCacheLoaderFactory.class); - private BootstrapCacheLoaderFactory _bootstrapCacheLoaderFactory; + private final BootstrapCacheLoaderFactory _bootstrapCacheLoaderFactory; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheEventListenerFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheEventListenerFactory.java index 7cac4508e82404..c193ecce8dd28d 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheEventListenerFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheEventListenerFactory.java @@ -53,9 +53,9 @@ public CacheEventListener createCacheEventListener(Properties properties) { return _cacheEventListenerFactory.createCacheEventListener(properties); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayCacheEventListenerFactory.class); - private CacheEventListenerFactory _cacheEventListenerFactory; + private final CacheEventListenerFactory _cacheEventListenerFactory; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerListenerFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerListenerFactory.java index 7c1eb1373a7287..8f0a335e603788 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerListenerFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerListenerFactory.java @@ -127,7 +127,7 @@ public void notifyRemoveAll(Ehcache ehch) { }; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayCacheManagerPeerListenerFactory.class); private final CacheManagerPeerListenerFactory diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerProviderFactory.java b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerProviderFactory.java index 77a4e5c2ba9dbb..c73e63d80f065c 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerProviderFactory.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/LiferayCacheManagerPeerProviderFactory.java @@ -110,11 +110,11 @@ public CacheManagerPeerProvider createCachePeerProvider( cacheManager, portalProperties); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayCacheManagerPeerProviderFactory.class); - private static HtmlImpl _htmlUtil = new HtmlImpl(); + private static final HtmlImpl _htmlUtil = new HtmlImpl(); - private CacheManagerPeerProviderFactory _cacheManagerPeerProviderFactory; + private final CacheManagerPeerProviderFactory _cacheManagerPeerProviderFactory; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/LockBasedMVCCEhcachePortalCache.java b/portal-impl/src/com/liferay/portal/cache/ehcache/LockBasedMVCCEhcachePortalCache.java index d6543911bbf323..db3ad9321bd549 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/LockBasedMVCCEhcachePortalCache.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/LockBasedMVCCEhcachePortalCache.java @@ -100,6 +100,6 @@ protected void doPut(K key, V value, int timeToLive, boolean quiet) { } } - private Ehcache _ehcache; + private final Ehcache _ehcache; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/ModifiableEhcacheWrapper.java b/portal-impl/src/com/liferay/portal/cache/ehcache/ModifiableEhcacheWrapper.java index fab831ed648990..96b8e900d657f5 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/ModifiableEhcacheWrapper.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/ModifiableEhcacheWrapper.java @@ -787,6 +787,6 @@ protected boolean isStatusAlive() { } private Ehcache _ehcache; - private AtomicInteger _referenceCounter = new AtomicInteger(0); + private final AtomicInteger _referenceCounter = new AtomicInteger(0); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheCacheEventListener.java b/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheCacheEventListener.java index 22469818eb7cf3..b3f58aab29c4ea 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheCacheEventListener.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheCacheEventListener.java @@ -138,10 +138,10 @@ public void notifyRemoveAll(Ehcache ehcache) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortalCacheCacheEventListener.class); - private CacheListener _cacheListener; - private PortalCache _portalCache; + private final CacheListener _cacheListener; + private final PortalCache _portalCache; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheManagerEventListener.java b/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheManagerEventListener.java index 083f541b0068c1..5426d33182cdee 100644 --- a/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheManagerEventListener.java +++ b/portal-impl/src/com/liferay/portal/cache/ehcache/PortalCacheManagerEventListener.java @@ -82,6 +82,6 @@ public void notifyCacheRemoved(String name) { _cacheManagerListener.notifyCacheRemoved(name); } - private CacheManagerListener _cacheManagerListener; + private final CacheManagerListener _cacheManagerListener; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/memory/MemoryPortalCache.java b/portal-impl/src/com/liferay/portal/cache/memory/MemoryPortalCache.java index e8a4091247b41c..2aaf4ae9a9d239 100644 --- a/portal-impl/src/com/liferay/portal/cache/memory/MemoryPortalCache.java +++ b/portal-impl/src/com/liferay/portal/cache/memory/MemoryPortalCache.java @@ -160,6 +160,6 @@ protected boolean doReplace(K key, V oldValue, V newValue, int timeToLive) { private ConcurrentMap _concurrentMap; private String _name; - private PortalCacheManager _portalCacheManager; + private final PortalCacheManager _portalCacheManager; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/mvcc/MVCCPortalCache.java b/portal-impl/src/com/liferay/portal/cache/mvcc/MVCCPortalCache.java index f463b13c73cba8..ba28081e857f5c 100644 --- a/portal-impl/src/com/liferay/portal/cache/mvcc/MVCCPortalCache.java +++ b/portal-impl/src/com/liferay/portal/cache/mvcc/MVCCPortalCache.java @@ -91,6 +91,6 @@ protected void doPut(K key, V value, int timeToLive, boolean quiet) { } } - private LowLevelCache _lowLevelCache; + private final LowLevelCache _lowLevelCache; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cache/transactional/TransactionalPortalCacheHelper.java b/portal-impl/src/com/liferay/portal/cache/transactional/TransactionalPortalCacheHelper.java index cb397d88e37a20..ea9063257797a6 100644 --- a/portal-impl/src/com/liferay/portal/cache/transactional/TransactionalPortalCacheHelper.java +++ b/portal-impl/src/com/liferay/portal/cache/transactional/TransactionalPortalCacheHelper.java @@ -192,11 +192,11 @@ private static void _pushPortalCacheMap() { portalCacheMaps.add(new PortalCacheMap()); } - private static ValueEntry _NULL_HOLDER_VALUE_ENTRY = new ValueEntry( + private static final ValueEntry _NULL_HOLDER_VALUE_ENTRY = new ValueEntry( TransactionalPortalCache.NULL_HOLDER, PortalCache.DEFAULT_TIME_TO_LIVE, false); - private static ThreadLocal> + private static final ThreadLocal> _portalCacheMapsThreadLocal = new InitialThreadLocal>( TransactionalPortalCacheHelper.class.getName() + @@ -249,7 +249,7 @@ public void removeAll() { } private boolean _removeAll; - private Map _uncommittedMap = + private final Map _uncommittedMap = new HashMap(); } @@ -283,7 +283,7 @@ public void merge(ValueEntry valueEntry) { } private boolean _quiet; - private int _ttl; + private final int _ttl; private Object _value; } diff --git a/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java b/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java index 00ad69b07d4108..76a0eb4e4cfb62 100644 --- a/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java +++ b/portal-impl/src/com/liferay/portal/captcha/CaptchaImpl.java @@ -150,7 +150,7 @@ private void _initialize() { } } - private static Log _log = LogFactoryUtil.getLog(CaptchaImpl.class); + private static final Log _log = LogFactoryUtil.getLog(CaptchaImpl.class); private volatile Captcha _captcha; private Captcha _originalCaptcha; diff --git a/portal-impl/src/com/liferay/portal/captcha/CaptchaPortletAction.java b/portal-impl/src/com/liferay/portal/captcha/CaptchaPortletAction.java index 1e2215225f0bb6..7ff17c6f89e350 100644 --- a/portal-impl/src/com/liferay/portal/captcha/CaptchaPortletAction.java +++ b/portal-impl/src/com/liferay/portal/captcha/CaptchaPortletAction.java @@ -53,6 +53,6 @@ protected boolean isCheckMethodOnProcessAction() { private static final boolean _CHECK_METHOD_ON_PROCESS_ACTION = false; - private static Log _log = LogFactoryUtil.getLog(CaptchaPortletAction.class); + private static final Log _log = LogFactoryUtil.getLog(CaptchaPortletAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/captcha/recaptcha/ReCaptchaImpl.java b/portal-impl/src/com/liferay/portal/captcha/recaptcha/ReCaptchaImpl.java index cbfe710a68b261..86eb34500cc68d 100644 --- a/portal-impl/src/com/liferay/portal/captcha/recaptcha/ReCaptchaImpl.java +++ b/portal-impl/src/com/liferay/portal/captcha/recaptcha/ReCaptchaImpl.java @@ -140,6 +140,6 @@ protected boolean validateChallenge(PortletRequest portletRequest) private static final String _TAGLIB_PATH = "/html/taglib/ui/captcha/recaptcha.jsp"; - private static Log _log = LogFactoryUtil.getLog(ReCaptchaImpl.class); + private static final Log _log = LogFactoryUtil.getLog(ReCaptchaImpl.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/AddressImpl.java b/portal-impl/src/com/liferay/portal/cluster/AddressImpl.java index 00abd5234f70b0..f8a0e15345f78e 100644 --- a/portal-impl/src/com/liferay/portal/cluster/AddressImpl.java +++ b/portal-impl/src/com/liferay/portal/cluster/AddressImpl.java @@ -67,6 +67,6 @@ public String toString() { private static final long serialVersionUID = 7969878022424426497L; - private Address _address; + private final Address _address; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/BaseReceiver.java b/portal-impl/src/com/liferay/portal/cluster/BaseReceiver.java index 1f2240f7bfe078..387ea950460c62 100644 --- a/portal-impl/src/com/liferay/portal/cluster/BaseReceiver.java +++ b/portal-impl/src/com/liferay/portal/cluster/BaseReceiver.java @@ -69,6 +69,6 @@ public void viewAccepted(View view) { protected volatile View view; - private static Log _log = LogFactoryUtil.getLog(BaseReceiver.class); + private static final Log _log = LogFactoryUtil.getLog(BaseReceiver.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterBase.java b/portal-impl/src/com/liferay/portal/cluster/ClusterBase.java index a25a7317c5cead..13835c1d4a6070 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterBase.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterBase.java @@ -194,7 +194,7 @@ protected void initSystemProperties() { } } - private static Log _log = LogFactoryUtil.getLog(ClusterBase.class); + private static final Log _log = LogFactoryUtil.getLog(ClusterBase.class); private static boolean _initialized; diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterExecutorImpl.java b/portal-impl/src/com/liferay/portal/cluster/ClusterExecutorImpl.java index e6e8c2589d5a72..597a4eece9a555 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterExecutorImpl.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterExecutorImpl.java @@ -594,18 +594,18 @@ protected void sendNotifyRequest() { private static final String _DEFAULT_CLUSTER_NAME = "LIFERAY-CONTROL-CHANNEL"; - private static Log _log = LogFactoryUtil.getLog(ClusterExecutorImpl.class); + private static final Log _log = LogFactoryUtil.getLog(ClusterExecutorImpl.class); - private CopyOnWriteArrayList _clusterEventListeners = + private final CopyOnWriteArrayList _clusterEventListeners = new CopyOnWriteArrayList(); - private Map _clusterNodeAddresses = + private final Map _clusterNodeAddresses = new ConcurrentHashMap(); private JChannel _controlJChannel; private ExecutorService _executorService; private Map _futureClusterResponses = new ConcurrentReferenceValueHashMap( FinalizeManager.WEAK_REFERENCE_FACTORY); - private Map _liveInstances = + private final Map _liveInstances = new ConcurrentHashMap(); private Address _localAddress; private ClusterNode _localClusterNode; diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterForwardReceiver.java b/portal-impl/src/com/liferay/portal/cluster/ClusterForwardReceiver.java index 938088d9078ef1..a010030a44499d 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterForwardReceiver.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterForwardReceiver.java @@ -52,10 +52,10 @@ public void receive(Message message) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterForwardReceiver.class); - private ClusterForwardMessageListener _clusterForwardMessageListener; - private List _localTransportAddresses; + private final ClusterForwardMessageListener _clusterForwardMessageListener; + private final List _localTransportAddresses; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterMasterExecutorImpl.java b/portal-impl/src/com/liferay/portal/cluster/ClusterMasterExecutorImpl.java index aa8f548794790f..9fc5a414c1a54d 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterMasterExecutorImpl.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterMasterExecutorImpl.java @@ -257,14 +257,14 @@ protected void notifyMasterTokenTransitionListeners( private static final String _LOCK_CLASS_NAME = ClusterMasterExecutorImpl.class.getName(); - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterMasterExecutorImpl.class); private static volatile boolean _master; private ClusterEventListener _clusterEventListener; private ClusterExecutor _clusterExecutor; - private Set + private final Set _clusterMasterTokenTransitionListeners = new HashSet(); private volatile boolean _enabled; diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterRequestReceiver.java b/portal-impl/src/com/liferay/portal/cluster/ClusterRequestReceiver.java index ceee6a012c27a7..0c7d6fad1405c1 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterRequestReceiver.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterRequestReceiver.java @@ -321,11 +321,11 @@ protected boolean processLocalMessage(Object message) { return false; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClusterRequestReceiver.class); - private ClusterExecutorImpl _clusterExecutorImpl; - private CountDownLatch _countDownLatch; + private final ClusterExecutorImpl _clusterExecutorImpl; + private final CountDownLatch _countDownLatch; private volatile View _lastView; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterableContextThreadLocal.java b/portal-impl/src/com/liferay/portal/cluster/ClusterableContextThreadLocal.java index 9bea6b29805c6e..36eeaffda9cb1e 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterableContextThreadLocal.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterableContextThreadLocal.java @@ -40,7 +40,7 @@ protected static Map collectThreadLocalContext() { return context; } - private static ThreadLocal> + private static final ThreadLocal> _contextThreadLocal = new InitialThreadLocal>( ClusterableContextThreadLocal.class.getName() + diff --git a/portal-impl/src/com/liferay/portal/cluster/ClusterableInvokerUtil.java b/portal-impl/src/com/liferay/portal/cluster/ClusterableInvokerUtil.java index 4a8daffc83af1f..bf7cd04d6c5b71 100644 --- a/portal-impl/src/com/liferay/portal/cluster/ClusterableInvokerUtil.java +++ b/portal-impl/src/com/liferay/portal/cluster/ClusterableInvokerUtil.java @@ -195,7 +195,7 @@ private static void _populateThreadLocalsFromContext( } } - private static MethodKey _invokeMethodKey = new MethodKey( + private static final MethodKey _invokeMethodKey = new MethodKey( ClusterableInvokerUtil.class, "_invoke", MethodHandler.class, Class.class, Map.class); diff --git a/portal-impl/src/com/liferay/portal/cluster/DebuggingClusterEventListenerImpl.java b/portal-impl/src/com/liferay/portal/cluster/DebuggingClusterEventListenerImpl.java index 3a04cf721dd572..3cd6d97cb81826 100644 --- a/portal-impl/src/com/liferay/portal/cluster/DebuggingClusterEventListenerImpl.java +++ b/portal-impl/src/com/liferay/portal/cluster/DebuggingClusterEventListenerImpl.java @@ -57,7 +57,7 @@ public void processClusterEvent(ClusterEvent clusterEvent) { _log.info(sb.toString()); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DebuggingClusterEventListenerImpl.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/cluster/MethodHandlerProcessCallable.java b/portal-impl/src/com/liferay/portal/cluster/MethodHandlerProcessCallable.java index d5814a971321e6..58593d4139c78a 100644 --- a/portal-impl/src/com/liferay/portal/cluster/MethodHandlerProcessCallable.java +++ b/portal-impl/src/com/liferay/portal/cluster/MethodHandlerProcessCallable.java @@ -42,6 +42,6 @@ public T call() throws ProcessException { private static final long serialVersionUID = 1L; - private MethodHandler _methodHandler; + private final MethodHandler _methodHandler; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/comment/CommentManagerImpl.java b/portal-impl/src/com/liferay/portal/comment/CommentManagerImpl.java index 1d6c2409eabced..4d840001a520e4 100644 --- a/portal-impl/src/com/liferay/portal/comment/CommentManagerImpl.java +++ b/portal-impl/src/com/liferay/portal/comment/CommentManagerImpl.java @@ -121,6 +121,6 @@ protected void setDefaultCommentManager( private CommentManager _defaultCommentManager = new DummyCommentManagerImpl(); - private ServiceTracker _serviceTracker; + private final ServiceTracker _serviceTracker; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderAggregateProperties.java b/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderAggregateProperties.java index 8500daeab3df26..d7b0be284d9a04 100644 --- a/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderAggregateProperties.java +++ b/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderAggregateProperties.java @@ -364,20 +364,20 @@ private Long _getReloadDelay( return delay; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClassLoaderAggregateProperties.class); - private CompositeConfiguration _baseCompositeConfiguration = + private final CompositeConfiguration _baseCompositeConfiguration = new CompositeConfiguration(); private boolean _baseConfigurationLoaded; - private ClassLoader _classLoader; - private String _companyId; - private String _componentName; - private CompositeConfiguration _globalCompositeConfiguration = + private final ClassLoader _classLoader; + private final String _companyId; + private final String _componentName; + private final CompositeConfiguration _globalCompositeConfiguration = new CompositeConfiguration(); - private List _loadedSources = new ArrayList(); - private Configuration _prefixedSystemConfiguration; - private SystemConfiguration _systemConfiguration = + private final List _loadedSources = new ArrayList(); + private final Configuration _prefixedSystemConfiguration; + private final SystemConfiguration _systemConfiguration = new SystemConfiguration(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderComponentConfiguration.java b/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderComponentConfiguration.java index 6f8eb1bbd52cc9..11de281271801f 100644 --- a/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderComponentConfiguration.java +++ b/portal-impl/src/com/liferay/portal/configuration/easyconf/ClassLoaderComponentConfiguration.java @@ -139,7 +139,7 @@ private ComponentProperties _getAvailableProperties() { private static final Constructor _CONSTRUCTOR; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ClassLoaderComponentConfiguration.class); static { diff --git a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java index ca3b3d655bae59..5792951a204e55 100644 --- a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java +++ b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibrary.java @@ -401,7 +401,7 @@ public void performAction(Object object) { JCRStore.class.getName(), S3Store.class.getName() }; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ConvertDocumentLibrary.class); private Store _sourceStore; diff --git a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibraryExtraSettings.java b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibraryExtraSettings.java index b062b2cf5f822b..98d10ec47e2900 100644 --- a/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibraryExtraSettings.java +++ b/portal-impl/src/com/liferay/portal/convert/ConvertDocumentLibraryExtraSettings.java @@ -49,7 +49,7 @@ public boolean isEnabled() { protected void doConvert() throws Exception { } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ConvertDocumentLibraryExtraSettings.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/convert/ConvertProcess.java b/portal-impl/src/com/liferay/portal/convert/ConvertProcess.java index 1b6b15d0680aab..6959455e421578 100644 --- a/portal-impl/src/com/liferay/portal/convert/ConvertProcess.java +++ b/portal-impl/src/com/liferay/portal/convert/ConvertProcess.java @@ -89,7 +89,7 @@ public void validate() throws ConvertException { protected abstract void doConvert() throws Exception; - private static Log _log = LogFactoryUtil.getLog(ConvertProcess.class); + private static final Log _log = LogFactoryUtil.getLog(ConvertProcess.class); private String[] _paramValues = null; diff --git a/portal-impl/src/com/liferay/portal/convert/messaging/ConvertProcessMessageListener.java b/portal-impl/src/com/liferay/portal/convert/messaging/ConvertProcessMessageListener.java index b1af38c5459fb1..d0fc7a5051cba2 100644 --- a/portal-impl/src/com/liferay/portal/convert/messaging/ConvertProcessMessageListener.java +++ b/portal-impl/src/com/liferay/portal/convert/messaging/ConvertProcessMessageListener.java @@ -48,7 +48,7 @@ protected void doReceive(Message message) throws Exception { convertProcess.convert(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ConvertProcessMessageListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java b/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java index 3f1b81b3a82cbf..ada140c02bb8d8 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/DB2DB.java @@ -286,6 +286,6 @@ else if (line.contains(DROP_INDEX)) { private static final boolean _SUPPORTS_SCROLLABLE_RESULTS = false; - private static DB2DB _instance = new DB2DB(); + private static final DB2DB _instance = new DB2DB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/DBFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/db/DBFactoryImpl.java index 03ed38f3953da9..934db3d16694a8 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/DBFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/db/DBFactoryImpl.java @@ -231,7 +231,7 @@ public void setDB(String type) { } } - private static Log _log = LogFactoryUtil.getLog(DBFactoryImpl.class); + private static final Log _log = LogFactoryUtil.getLog(DBFactoryImpl.class); private static DB _db; diff --git a/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java b/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java index 8bb98a9506aeac..9e15e697ebc565 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/FirebirdDB.java @@ -146,6 +146,6 @@ else if (line.contains(DROP_INDEX)) { " varchar(4000)", " blob", " varchar", "", "commit" }; - private static FirebirdDB _instance = new FirebirdDB(); + private static final FirebirdDB _instance = new FirebirdDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java b/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java index d4c6672ba3284a..7ad0e17555b8db 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/HypersonicDB.java @@ -119,6 +119,6 @@ else if (line.contains(DROP_INDEX)) { " longvarchar", " longvarchar", " varchar", "", "commit" }; - private static HypersonicDB _instance = new HypersonicDB(); + private static final HypersonicDB _instance = new HypersonicDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java b/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java index 9e508cfc3f5534..d50ca055b37d3d 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/InformixDB.java @@ -189,6 +189,6 @@ else if (line.contains("create table")) { " int8", " lvarchar", " text", " varchar", "", "commit" }; - private static InformixDB _instance = new InformixDB(); + private static final InformixDB _instance = new InformixDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/InterBaseDB.java b/portal-impl/src/com/liferay/portal/dao/db/InterBaseDB.java index 1a834ceeda79eb..887230331c8cf2 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/InterBaseDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/InterBaseDB.java @@ -34,6 +34,6 @@ protected String getServerName() { return "interbase"; } - private static InterBaseDB _instance = new InterBaseDB(); + private static final InterBaseDB _instance = new InterBaseDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java b/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java index e8217ee33d54ee..29b7d81957f6ac 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/JDataStoreDB.java @@ -64,6 +64,6 @@ protected String[] getTemplate() { " long varchar", " long varchar", " varchar", "", "commit" }; - private static JDataStoreDB _instance = new JDataStoreDB(); + private static final JDataStoreDB _instance = new JDataStoreDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java b/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java index d23796b2a7ed56..ef0eb6b2ad2532 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/MySQLDB.java @@ -212,6 +212,6 @@ else if (line.startsWith(ALTER_TABLE_NAME)) { private static final boolean _SUPPORTS_UPDATE_WITH_INNER_JOIN = true; - private static MySQLDB _instance = new MySQLDB(); + private static final MySQLDB _instance = new MySQLDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java b/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java index 792e11b73cac33..9705eebd1bd873 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/OracleDB.java @@ -305,9 +305,9 @@ private String _preBuildSQL(String template) throws IOException { private static final boolean _SUPPORTS_INLINE_DISTINCT = false; - private static OracleDB _instance = new OracleDB(); + private static final OracleDB _instance = new OracleDB(); - private static Pattern _varcharPattern = Pattern.compile( + private static final Pattern _varcharPattern = Pattern.compile( "VARCHAR\\((\\d+)\\)"); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java b/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java index 2eed1f53720acb..12faac3d54e625 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/PostgreSQLDB.java @@ -209,6 +209,6 @@ else if (line.contains("\\\'")) { private static final boolean _SUPPORTS_QUERYING_AFTER_EXCEPTION = false; - private static PostgreSQLDB _instance = new PostgreSQLDB(); + private static final PostgreSQLDB _instance = new PostgreSQLDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java b/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java index b03cd180fb7a4f..0dbc30b4dfe7e0 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/SAPDB.java @@ -110,6 +110,6 @@ else if (line.startsWith(ALTER_TABLE_NAME)) { " varchar", " varchar", " varchar", "", "commit" }; - private static SAPDB _instance = new SAPDB(); + private static final SAPDB _instance = new SAPDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java b/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java index 7dfc2ea3646189..ddbaccf164430b 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/SQLServerDB.java @@ -223,6 +223,6 @@ else if (line.contains(DROP_INDEX)) { private static final boolean _SUPPORTS_ALTER_COLUMN_TYPE = false; - private static SQLServerDB _instance = new SQLServerDB(); + private static final SQLServerDB _instance = new SQLServerDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java b/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java index 22bc920b34958e..20541e2a4b6dff 100644 --- a/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java +++ b/portal-impl/src/com/liferay/portal/dao/db/SybaseDB.java @@ -175,6 +175,6 @@ else if (line.contains(DROP_INDEX)) { " text", " varchar", " identity(1,1)", "go" }; - private static SybaseDB _instance = new SybaseDB(); + private static final SybaseDB _instance = new SybaseDB(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java index fa0f18b083fa2a..104b6bee40de02 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/DataSourceFactoryImpl.java @@ -404,10 +404,10 @@ protected void testClassForName(Properties properties) throws Exception { private static final String _TOMCAT_JDBC_POOL_OBJECT_NAME_PREFIX = "TomcatJDBCPool:type=ConnectionPool,name="; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DataSourceFactoryImpl.class); - private static PACL _pacl = new NoPACL(); + private static final PACL _pacl = new NoPACL(); private static class NoPACL implements PACL { diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceAdvice.java b/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceAdvice.java index dc1461a6648eae..cf9ae29367a14f 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceAdvice.java @@ -101,7 +101,7 @@ protected void setServiceBeanAopCacheManager( MasterDataSource.class, null); } - private static MasterDataSource _nullMasterDataSource = + private static final MasterDataSource _nullMasterDataSource = new MasterDataSource() { @Override diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceTargetSource.java b/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceTargetSource.java index b56d4816952225..4d63e59f1d331d 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceTargetSource.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/aop/DynamicDataSourceTargetSource.java @@ -125,12 +125,12 @@ protected boolean inOperation() { return !methodStack.empty(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DynamicDataSourceTargetSource.class); - private static ThreadLocal> _methodStack = + private static final ThreadLocal> _methodStack = new ThreadLocal>(); - private static ThreadLocal _operationType = + private static final ThreadLocal _operationType = new ThreadLocal(); private DataSource _readDataSource; diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/pool/c3p0/PortalConnectionCustomizer.java b/portal-impl/src/com/liferay/portal/dao/jdbc/pool/c3p0/PortalConnectionCustomizer.java index f789bc5f5274f7..478852ba824ea8 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/pool/c3p0/PortalConnectionCustomizer.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/pool/c3p0/PortalConnectionCustomizer.java @@ -65,7 +65,7 @@ public void onDestroy( Connection connection, String parentDataSourceIdentityToken) { } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortalConnectionCustomizer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/spring/MappingSqlQueryImpl.java b/portal-impl/src/com/liferay/portal/dao/jdbc/spring/MappingSqlQueryImpl.java index fb2fb302a93a86..2a8431b1568e8c 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/spring/MappingSqlQueryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/spring/MappingSqlQueryImpl.java @@ -51,6 +51,6 @@ protected T mapRow(ResultSet rs, int rowNumber) throws SQLException { return _rowMapper.mapRow(rs, rowNumber); } - private RowMapper _rowMapper; + private final RowMapper _rowMapper; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/jdbc/util/DataSourceSwapper.java b/portal-impl/src/com/liferay/portal/dao/jdbc/util/DataSourceSwapper.java index b71cf254b7e08a..95d7f9d833dc34 100644 --- a/portal-impl/src/com/liferay/portal/dao/jdbc/util/DataSourceSwapper.java +++ b/portal-impl/src/com/liferay/portal/dao/jdbc/util/DataSourceSwapper.java @@ -160,7 +160,7 @@ else if (_log.isWarnEnabled()) { } } - private static Log _log = LogFactoryUtil.getLog(DataSourceSwapper.class); + private static final Log _log = LogFactoryUtil.getLog(DataSourceSwapper.class); private static BeanFactory _beanFactory; private static DataSourceWrapper _counterDataSourceWrapper; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/common/EntityCacheImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/common/EntityCacheImpl.java index cc3c4b84391938..b93703f1c1e936 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/common/EntityCacheImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/common/EntityCacheImpl.java @@ -413,7 +413,7 @@ private Serializable _toEntityModel(Serializable result) { private static final boolean _LOCAL_CACHE_AVAILABLE; - private static Log _log = LogFactoryUtil.getLog(EntityCacheImpl.class); + private static final Log _log = LogFactoryUtil.getLog(EntityCacheImpl.class); private static final ThreadLocal _localCache; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ConjunctionImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ConjunctionImpl.java index 716e3395e293c7..f3e5e389395cf7 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ConjunctionImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ConjunctionImpl.java @@ -42,6 +42,6 @@ public org.hibernate.criterion.Conjunction getWrappedConjunction() { return _conjunction; } - private org.hibernate.criterion.Conjunction _conjunction; + private final org.hibernate.criterion.Conjunction _conjunction; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/CriterionImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/CriterionImpl.java index 9fb74bfb1aa998..558b7b8c024971 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/CriterionImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/CriterionImpl.java @@ -29,6 +29,6 @@ public org.hibernate.criterion.Criterion getWrappedCriterion() { return _criterion; } - private org.hibernate.criterion.Criterion _criterion; + private final org.hibernate.criterion.Criterion _criterion; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DialectImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DialectImpl.java index b58e0454b7dbf5..e99e8cbb623890 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DialectImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DialectImpl.java @@ -34,6 +34,6 @@ public boolean supportsLimit() { return _dialect.supportsLimit(); } - private org.hibernate.dialect.Dialect _dialect; + private final org.hibernate.dialect.Dialect _dialect; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DisjunctionImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DisjunctionImpl.java index fa8472abae4020..d9dff62cde67ba 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DisjunctionImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DisjunctionImpl.java @@ -42,6 +42,6 @@ public org.hibernate.criterion.Disjunction getWrappedDisjunction() { return _disjunction; } - private org.hibernate.criterion.Disjunction _disjunction; + private final org.hibernate.criterion.Disjunction _disjunction; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java index 4274cbc943dab6..8b72b478b6d856 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryFactoryImpl.java @@ -130,12 +130,12 @@ protected Class getImplClass( return clazz; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DynamicQueryFactoryImpl.class); - private Map>> _classes = + private final Map>> _classes = new HashMap>>(); - private ClassLoader _portalClassLoader = + private final ClassLoader _portalClassLoader = DynamicQueryFactoryImpl.class.getClassLoader(); private class DynamicQueryPrivilegedAction @@ -156,8 +156,8 @@ public DynamicQuery run() { return new DynamicQueryImpl(DetachedCriteria.forClass(_clazz)); } - private String _alias; - private Class _clazz; + private final String _alias; + private final Class _clazz; } diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryImpl.java index 7ff5bfaa2f4e3f..e5e3bf3da8076d 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/DynamicQueryImpl.java @@ -139,7 +139,7 @@ public String toString() { } private Criteria _criteria; - private DetachedCriteria _detachedCriteria; + private final DetachedCriteria _detachedCriteria; private Integer _end; private Integer _start; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/MapType.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/MapType.java index 164a2945623d23..a0bbf3d1d6cdea 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/MapType.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/MapType.java @@ -124,6 +124,6 @@ public Class returnedClass() { public void setPropertyValue(Object component, int property, Object value) { } - private static JSONFactory _jsonFactory = new JSONFactoryImpl(); + private static final JSONFactory _jsonFactory = new JSONFactoryImpl(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/OrderImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/OrderImpl.java index efb3b512147706..dbc7a551458c58 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/OrderImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/OrderImpl.java @@ -29,6 +29,6 @@ public org.hibernate.criterion.Order getWrappedOrder() { return _criterion; } - private org.hibernate.criterion.Order _criterion; + private final org.hibernate.criterion.Order _criterion; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PortletSessionFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PortletSessionFactoryImpl.java index 52104d2a6be817..2a3fa362cadf27 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PortletSessionFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PortletSessionFactoryImpl.java @@ -193,12 +193,12 @@ protected Session wrapSession(org.hibernate.Session session) { return DoPrivilegedUtil.wrapWhenActive(super.wrapSession(session)); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortletSessionFactoryImpl.class); private BeanFactory _beanFactory; private DataSource _dataSource; - private Map _sessionFactories = + private final Map _sessionFactories = new HashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionImpl.java index 3349e93ba2478f..d2ff4037e35eac 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionImpl.java @@ -34,6 +34,6 @@ public String toString() { return _projection.toString(); } - private org.hibernate.criterion.Projection _projection; + private final org.hibernate.criterion.Projection _projection; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionListImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionListImpl.java index 6377b1cc3d03c4..08b2d38ac7de69 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionListImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ProjectionListImpl.java @@ -53,6 +53,6 @@ public org.hibernate.criterion.ProjectionList getWrappedProjectionList() { return _projectionList; } - private org.hibernate.criterion.ProjectionList _projectionList; + private final org.hibernate.criterion.ProjectionList _projectionList; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PropertyImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PropertyImpl.java index b4383ef8c05103..3b4a89090836f9 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PropertyImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/PropertyImpl.java @@ -409,6 +409,6 @@ protected DynamicQueryImpl getDynamicQueryImpl(DynamicQuery subselect) { throw new IllegalArgumentException("Uanble to unwrap " + subselect); } - private org.hibernate.criterion.Property _property; + private final org.hibernate.criterion.Property _property; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SQLServerLimitStringUtil.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SQLServerLimitStringUtil.java index bb5b77acb49390..89549065d03d29 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SQLServerLimitStringUtil.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SQLServerLimitStringUtil.java @@ -171,9 +171,9 @@ private static final String[] _splitOrderBy( }; } - private static Pattern _qualifiedColumnPattern = Pattern.compile( + private static final Pattern _qualifiedColumnPattern = Pattern.compile( "\\w+\\.([\\w\\*]+)"); - private static Pattern _selectPattern = Pattern.compile( + private static final Pattern _selectPattern = Pattern.compile( "SELECT ", Pattern.CASE_INSENSITIVE); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ScrollableResultsImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ScrollableResultsImpl.java index f523864043984f..d554bb41526054 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ScrollableResultsImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/ScrollableResultsImpl.java @@ -98,6 +98,6 @@ public boolean scroll(int i) throws ORMException { } } - private org.hibernate.ScrollableResults _scrollableResults; + private final org.hibernate.ScrollableResults _scrollableResults; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java index b35d9b30bd6b47..23bc8206851233 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionFactoryImpl.java @@ -152,7 +152,7 @@ protected Session wrapSession(org.hibernate.Session session) { PropsValues. SPRING_HIBERNATE_SESSION_FACTORY_PRELOAD_CLASSLOADER_CLASSES; - private static Log _log = LogFactoryUtil.getLog(SessionFactoryImpl.class); + private static final Log _log = LogFactoryUtil.getLog(SessionFactoryImpl.class); private ClassLoader _sessionFactoryClassLoader; private SessionFactoryImplementor _sessionFactoryImplementor; diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionImpl.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionImpl.java index d9dde5914008d5..7997b00c958bce 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionImpl.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/SessionImpl.java @@ -268,6 +268,6 @@ public void saveOrUpdate(Object object) throws ORMException { } } - private org.hibernate.Session _session; + private final org.hibernate.Session _session; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/BaseRegionWrapper.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/BaseRegionWrapper.java index 37223bc5e745fc..97a9d783f3ffc7 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/BaseRegionWrapper.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/BaseRegionWrapper.java @@ -128,6 +128,6 @@ protected EhcacheDataRegion getEhcacheDataRegion() { return _ehcacheDataRegion; } - private EhcacheDataRegion _ehcacheDataRegion; + private final EhcacheDataRegion _ehcacheDataRegion; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/LiferayEhcacheRegionFactory.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/LiferayEhcacheRegionFactory.java index cb4d6a38175c57..f64c9945197d16 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/LiferayEhcacheRegionFactory.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/LiferayEhcacheRegionFactory.java @@ -303,7 +303,7 @@ protected void reconfigureCache(Ehcache replacementCache) { private static final String _DEFAULT_CLUSTERED_EHCACHE_CONFIG_FILE = "/ehcache/hibernate-clustered.xml"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayEhcacheRegionFactory.class); private MBeanRegisteringPortalLifecycle _mBeanRegisteringPortalLifecycle; @@ -407,8 +407,8 @@ public void unregisterCacheManagerListeners() { throw new UnsupportedOperationException(); } - private CacheManager _cacheManager; - private Map> + private final CacheManager _cacheManager; + private final Map> _portalCaches = new HashMap>(); diff --git a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/MBeanRegisteringPortalLifecycle.java b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/MBeanRegisteringPortalLifecycle.java index 9c03bf3472a0ac..edd1c1ba99355c 100644 --- a/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/MBeanRegisteringPortalLifecycle.java +++ b/portal-impl/src/com/liferay/portal/dao/orm/hibernate/region/MBeanRegisteringPortalLifecycle.java @@ -50,7 +50,7 @@ protected void doPortalInit() throws Exception { private static final String _MBEAN_SERVER_BEAN_NAME = "registryAwareMBeanServer"; - private CacheManager _cacheManager; + private final CacheManager _cacheManager; private ManagementService _managementService; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSource.java b/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSource.java index 40161e7a86154a..5cf14cb407cf64 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSource.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSource.java @@ -98,6 +98,6 @@ protected DataSource getDataSource() { return ShardUtil.getDataSource(); } - private static ShardDataSource _instance = new ShardDataSource(); + private static final ShardDataSource _instance = new ShardDataSource(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSourceTargetSource.java b/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSourceTargetSource.java index a86c1c7805088d..9786254a08d98c 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSourceTargetSource.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/ShardDataSourceTargetSource.java @@ -90,12 +90,12 @@ public void setDataSources(Map dataSources) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ShardDataSourceTargetSource.class); private static String[] _availableShardNames; - private static ThreadLocal _dataSource = + private static final ThreadLocal _dataSource = new CentralizedThreadLocal(false) { @Override diff --git a/portal-impl/src/com/liferay/portal/dao/shard/ShardPollerProcessorWrapper.java b/portal-impl/src/com/liferay/portal/dao/shard/ShardPollerProcessorWrapper.java index cc483a64fcdbb8..a75685f3f42056 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/ShardPollerProcessorWrapper.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/ShardPollerProcessorWrapper.java @@ -55,6 +55,6 @@ public void send(PollerRequest pollerRequest) throws PollerException { } } - private PollerProcessor _pollerProcessor; + private final PollerProcessor _pollerProcessor; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/dao/shard/ShardSessionFactoryTargetSource.java b/portal-impl/src/com/liferay/portal/dao/shard/ShardSessionFactoryTargetSource.java index d4a2fe40d0d4d2..7e33b3282fc103 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/ShardSessionFactoryTargetSource.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/ShardSessionFactoryTargetSource.java @@ -98,10 +98,10 @@ public void setShardDataSourceTargetSource( _shardDataSourceTargetSource = shardDataSourceTargetSource; } - private static Map _sessionFactories = + private static final Map _sessionFactories = new HashMap(); - private static ThreadLocal _sessionFactory = + private static final ThreadLocal _sessionFactory = new CentralizedThreadLocal(false) { @Override diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardAdvice.java index e5dad29d798f82..8e3edecb3a3d3a 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardAdvice.java @@ -195,7 +195,7 @@ private String _setShardNameByCompanyId(long companyId) return shardName; } - private static Log _log = LogFactoryUtil.getLog(ShardAdvice.class); + private static final Log _log = LogFactoryUtil.getLog(ShardAdvice.class); private static final ThreadLocal> _companyServiceStack = new ThreadLocal>(); diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardCompanyAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardCompanyAdvice.java index 03d3ce06a8d2e9..255244e6e74597 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardCompanyAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardCompanyAdvice.java @@ -115,7 +115,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog(ShardCompanyAdvice.class); + private static final Log _log = LogFactoryUtil.getLog(ShardCompanyAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardGloballyAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardGloballyAdvice.java index 889275fd9d5efe..f4dd8f6c45239c 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardGloballyAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardGloballyAdvice.java @@ -78,7 +78,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog(ShardGloballyAdvice.class); + private static final Log _log = LogFactoryUtil.getLog(ShardGloballyAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardIterativelyAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardIterativelyAdvice.java index 8dd1fad8249821..15bbbd93bc5f85 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardIterativelyAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardIterativelyAdvice.java @@ -69,7 +69,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ShardIterativelyAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardParameterAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardParameterAdvice.java index b568eea515a1e4..d0947012c9c30a 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardParameterAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardParameterAdvice.java @@ -65,7 +65,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog(ShardParameterAdvice.class); + private static final Log _log = LogFactoryUtil.getLog(ShardParameterAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPersistenceAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPersistenceAdvice.java index c5dce9a01a404e..384576f53812df 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPersistenceAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPersistenceAdvice.java @@ -118,7 +118,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ShardPersistenceAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPortletAdvice.java b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPortletAdvice.java index ee701587b7c858..eaa720af826482 100644 --- a/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPortletAdvice.java +++ b/portal-impl/src/com/liferay/portal/dao/shard/advice/ShardPortletAdvice.java @@ -99,7 +99,7 @@ public void setShardAdvice(ShardAdvice shardAdvice) { _shardAdvice = shardAdvice; } - private static Log _log = LogFactoryUtil.getLog(ShardPortletAdvice.class); + private static final Log _log = LogFactoryUtil.getLog(ShardPortletAdvice.class); private ShardAdvice _shardAdvice; diff --git a/portal-impl/src/com/liferay/portal/deploy/DeployManagerImpl.java b/portal-impl/src/com/liferay/portal/deploy/DeployManagerImpl.java index 3f7d861da5b6ec..d70a6bc7a22376 100644 --- a/portal-impl/src/com/liferay/portal/deploy/DeployManagerImpl.java +++ b/portal-impl/src/com/liferay/portal/deploy/DeployManagerImpl.java @@ -217,11 +217,11 @@ public void undeploy(String context) throws Exception { DeployUtil.undeploy(ServerDetector.getServerId(), deployDir); } - private static Log _log = LogFactoryUtil.getLog(DeployManagerImpl.class); + private static final Log _log = LogFactoryUtil.getLog(DeployManagerImpl.class); - private List _levelsRequiredDeploymentContexts = + private final List _levelsRequiredDeploymentContexts = new ArrayList(); - private List _levelsRequiredDeploymentWARFileNames = + private final List _levelsRequiredDeploymentWARFileNames = new ArrayList(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java b/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java index 1595fdcf6125f8..c82b774b83c61b 100644 --- a/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java +++ b/portal-impl/src/com/liferay/portal/deploy/DeployUtil.java @@ -284,8 +284,8 @@ private String _getResourcePath(String resource) throws IOException { return FileUtil.getAbsolutePath(file); } - private static Log _log = LogFactoryUtil.getLog(DeployUtil.class); + private static final Log _log = LogFactoryUtil.getLog(DeployUtil.class); - private static DeployUtil _instance = new DeployUtil(); + private static final DeployUtil _instance = new DeployUtil(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployListener.java index 8997cab2d153f1..e3620fcacb0404 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployListener.java @@ -63,9 +63,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ExtAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployer.java index ba832d86faec43..c7a1669ea73f9f 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ExtAutoDeployer.java @@ -66,6 +66,6 @@ public ExtAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog(ExtAutoDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(ExtAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployListener.java index 92118999f0ce57..4a059354a3dbbe 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployListener.java @@ -61,9 +61,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( HookAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployer.java index 6d83d27277d331..827b116bf3cc19 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/HookAutoDeployer.java @@ -69,6 +69,6 @@ public HookAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog(HookAutoDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(HookAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployListener.java index 599d77de4ca65f..5747d7bd8b8a6f 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployListener.java @@ -64,9 +64,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LayoutTemplateAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployer.java index 3ca185dd977445..cf9d797b7cb9a0 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/LayoutTemplateAutoDeployer.java @@ -71,7 +71,7 @@ public LayoutTemplateAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LayoutTemplateAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployListener.java index 7ea3aa26ff9846..2739258fe00727 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployListener.java @@ -62,9 +62,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayPackageAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployer.java index 5fc4e18c33d828..4cf25603a451f0 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/LiferayPackageAutoDeployer.java @@ -134,7 +134,7 @@ public AutoDeployer cloneAutoDeployer() { return new LiferayPackageAutoDeployer(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LiferayPackageAutoDeployer.class); private final String _baseDir; diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ModuleAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/ModuleAutoDeployListener.java index 9d05d0726dd095..ead54ced2dda18 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ModuleAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ModuleAutoDeployListener.java @@ -122,9 +122,9 @@ protected boolean isModule(File file) throws AutoDeployException { return Validator.isNotNull(bundleSymbolicName); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ModuleAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployListener.java index 41ee5383b0661b..3278a8a28da1ef 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployListener.java @@ -120,10 +120,10 @@ protected AutoDeployer getWaiDeployer() throws AutoDeployException { return _waiAutoDeployer; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortletAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; private MVCPortletAutoDeployer _mvcPortletAutoDeployer; private PHPPortletAutoDeployer _phpPortletAutoDeployer; private WAIAutoDeployer _waiAutoDeployer; diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployer.java index 2760b6859415c8..dae17bede87805 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/PortletAutoDeployer.java @@ -81,6 +81,6 @@ public PortletAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog(PortletAutoDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(PortletAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployListener.java index 1389eef068ad13..433c4103fc3ae4 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployListener.java @@ -62,9 +62,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ThemeAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployer.java index 2f4d21b51bea36..7619aa5411ce4c 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ThemeAutoDeployer.java @@ -72,6 +72,6 @@ public ThemeAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog(ThemeAutoDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(ThemeAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/ThreadSafeAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/ThreadSafeAutoDeployer.java index 078c66fe355a52..714ddbccf9670f 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/ThreadSafeAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/ThreadSafeAutoDeployer.java @@ -41,6 +41,6 @@ public AutoDeployer cloneAutoDeployer() { throw new UnsupportedOperationException(); } - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployListener.java index 50eb97de50deb5..ec9006a9e04b7a 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployListener.java @@ -61,9 +61,9 @@ public int deploy(AutoDeploymentContext autoDeploymentContext) return code; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( WebAutoDeployListener.class); - private AutoDeployer _autoDeployer; + private final AutoDeployer _autoDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployer.java b/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployer.java index ac810340ddfba9..9e0e0882475bef 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployer.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/WebAutoDeployer.java @@ -69,6 +69,6 @@ public WebAutoDeployer() { } } - private static Log _log = LogFactoryUtil.getLog(WebAutoDeployer.class); + private static final Log _log = LogFactoryUtil.getLog(WebAutoDeployer.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/BaseExplodedTomcatListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/BaseExplodedTomcatListener.java index 4ddabaf1fac2f3..8b78410ec05c65 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/BaseExplodedTomcatListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/BaseExplodedTomcatListener.java @@ -147,10 +147,10 @@ public boolean isMatchingFileExtension(File file) { protected abstract int deploy(File file) throws AutoDeployException; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( BaseExplodedTomcatListener.class); - private static SystemConfiguration _systemConfiguration = + private static final SystemConfiguration _systemConfiguration = new SystemConfiguration(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/HookExplodedTomcatListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/HookExplodedTomcatListener.java index e47317e7fa26d9..032a1d74a1001a 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/HookExplodedTomcatListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/HookExplodedTomcatListener.java @@ -65,9 +65,9 @@ protected int deploy(File file) throws AutoDeployException { return AutoDeployer.CODE_DEFAULT; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( HookExplodedTomcatListener.class); - private ExplodedTomcatDeployer _deployer; + private final ExplodedTomcatDeployer _deployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/LayoutTemplateExplodedTomcatListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/LayoutTemplateExplodedTomcatListener.java index 3ca95455d72d41..bde59cc34f0770 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/LayoutTemplateExplodedTomcatListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/LayoutTemplateExplodedTomcatListener.java @@ -62,9 +62,9 @@ protected int deploy(File file) throws AutoDeployException { return AutoDeployer.CODE_DEFAULT; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LayoutTemplateExplodedTomcatListener.class); - private ExplodedTomcatDeployer _deployer; + private final ExplodedTomcatDeployer _deployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/PortletExplodedTomcatListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/PortletExplodedTomcatListener.java index 0159a9a7fec105..bb87f4418a3c0a 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/PortletExplodedTomcatListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/PortletExplodedTomcatListener.java @@ -83,10 +83,10 @@ protected ExplodedTomcatDeployer getPhpDeployer() return _phpDeployer; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortletExplodedTomcatListener.class); - private ExplodedTomcatDeployer _deployer; + private final ExplodedTomcatDeployer _deployer; private PHPPortletExplodedTomcatDeployer _phpDeployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/ThemeExplodedTomcatListener.java b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/ThemeExplodedTomcatListener.java index cb5daaa059154e..2924ca585066ea 100644 --- a/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/ThemeExplodedTomcatListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/auto/exploded/tomcat/ThemeExplodedTomcatListener.java @@ -60,9 +60,9 @@ protected int deploy(File file) throws AutoDeployException { return AutoDeployer.CODE_DEFAULT; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ThemeExplodedTomcatListener.class); - private ExplodedTomcatDeployer _deployer; + private final ExplodedTomcatDeployer _deployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ExtHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/ExtHotDeployListener.java index 14cd6161e64634..78bb721f73f312 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ExtHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ExtHotDeployListener.java @@ -255,6 +255,6 @@ protected void mergeWebXml(String portalWebDir, String pluginWebDir) { FileUtil.deltree(tmpDir); } - private static Log _log = LogFactoryUtil.getLog(ExtHotDeployListener.class); + private static final Log _log = LogFactoryUtil.getLog(ExtHotDeployListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/IndexerPostProcessorRegistry.java b/portal-impl/src/com/liferay/portal/deploy/hot/IndexerPostProcessorRegistry.java index acba1c50e8cc55..e9b82ad3d03c28 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/IndexerPostProcessorRegistry.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/IndexerPostProcessorRegistry.java @@ -49,10 +49,10 @@ public void close() { _serviceTracker.close(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( IndexerPostProcessorRegistry.class); - private ServiceTracker + private final ServiceTracker _serviceTracker; private class IndexerPostProcessorServiceTrackerCustomizer diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/LayoutTemplateHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/LayoutTemplateHotDeployListener.java index 932d5ad315e5e0..111cf95c6fdcc9 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/LayoutTemplateHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/LayoutTemplateHotDeployListener.java @@ -160,10 +160,10 @@ protected void doInvokeUndeploy(HotDeployEvent hotDeployEvent) } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( LayoutTemplateHotDeployListener.class); - private static Map> _layoutTemplates = + private static final Map> _layoutTemplates = new HashMap>(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/PluginPackageHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/PluginPackageHotDeployListener.java index 32c7d1e501bfa8..3d3e3bdc0a6123 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/PluginPackageHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/PluginPackageHotDeployListener.java @@ -290,7 +290,7 @@ protected void reconfigureCaches(ClassLoader classLoader) throws Exception { PropsKeys.NET_SF_EHCACHE_CONFIGURATION_RESOURCE_NAME)); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PluginPackageHotDeployListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/PortletHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/PortletHotDeployListener.java index 6e16f9d799e8d9..f14f7c8e44fb4d 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/PortletHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/PortletHotDeployListener.java @@ -632,12 +632,12 @@ protected void unbindDataSource(String servletContextName) { private static final String _JNDI_JDBC_LIFERAY_POOL = _JNDI_JDBC + "/LiferayPool"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortletHotDeployListener.class); - private static Map _dataSourceBindStates = + private static final Map _dataSourceBindStates = new HashMap(); - private static Map> _portlets = + private static final Map> _portlets = new HashMap>(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/SchedulerEntryRegistry.java b/portal-impl/src/com/liferay/portal/deploy/hot/SchedulerEntryRegistry.java index cd6355cd23511c..de32fefe0d8bea 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/SchedulerEntryRegistry.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/SchedulerEntryRegistry.java @@ -66,7 +66,7 @@ public void close() { _serviceTracker.close(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( SchedulerEntryRegistry.class); private final ServiceTracker diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ServiceBag.java b/portal-impl/src/com/liferay/portal/deploy/hot/ServiceBag.java index e3f8de984aa077..31d44a0face917 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ServiceBag.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ServiceBag.java @@ -139,7 +139,7 @@ public void replace() throws Exception { } } - private AdvisedSupport _advisedSupport; - private ServiceWrapper _serviceWrapper; + private final AdvisedSupport _advisedSupport; + private final ServiceWrapper _serviceWrapper; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ServiceWrapperRegistry.java b/portal-impl/src/com/liferay/portal/deploy/hot/ServiceWrapperRegistry.java index a8df952a50620b..ecdeaf925a738a 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ServiceWrapperRegistry.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ServiceWrapperRegistry.java @@ -51,10 +51,10 @@ public void close() { _serviceTracker.close(); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ServiceWrapperRegistry.class); - private ServiceTracker, ServiceBag> _serviceTracker; + private final ServiceTracker, ServiceBag> _serviceTracker; private class ServiceWrapperServiceTrackerCustomizer implements ServiceTrackerCustomizer, ServiceBag> { diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/SocialHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/SocialHotDeployListener.java index da402f26d2ffba..c49def75d97f17 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/SocialHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/SocialHotDeployListener.java @@ -154,9 +154,9 @@ else if (tupleObject1 instanceof SocialActivityCounterDefinition) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( SocialHotDeployListener.class); - private static Map _objects = new HashMap(); + private static final Map _objects = new HashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java index 4f061a0c137a24..ec1c2e100881cb 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/SpringHotDeployListener.java @@ -115,7 +115,7 @@ protected void doInvokeUndeploy(HotDeployEvent hotDeployEvent) } } - private static Map _contextLoaderListeners = + private static final Map _contextLoaderListeners = new HashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java index 5ae24515c31bb2..f00f8af50169d0 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeHotDeployListener.java @@ -174,10 +174,10 @@ protected void doInvokeUndeploy(HotDeployEvent hotDeployEvent) } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ThemeHotDeployListener.class); - private static Map> _themes = + private static final Map> _themes = new HashMap>(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeLoaderHotDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeLoaderHotDeployListener.java index 2507419a46ef4b..c57a56e6cc6072 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/ThemeLoaderHotDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/ThemeLoaderHotDeployListener.java @@ -113,7 +113,7 @@ protected void doInvokeUndeploy(HotDeployEvent hotDeployEvent) } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ThemeLoaderHotDeployListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/hot/messaging/HotDeployMessageListener.java b/portal-impl/src/com/liferay/portal/deploy/hot/messaging/HotDeployMessageListener.java index d4bf281f769ac0..c3839f2a51e01f 100644 --- a/portal-impl/src/com/liferay/portal/deploy/hot/messaging/HotDeployMessageListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/hot/messaging/HotDeployMessageListener.java @@ -40,7 +40,7 @@ else if (command.equals("undeploy")) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( HotDeployMessageListener.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/sandbox/BaseSandboxHandler.java b/portal-impl/src/com/liferay/portal/deploy/sandbox/BaseSandboxHandler.java index fed9691c8b66d2..f00d0285a36fa5 100644 --- a/portal-impl/src/com/liferay/portal/deploy/sandbox/BaseSandboxHandler.java +++ b/portal-impl/src/com/liferay/portal/deploy/sandbox/BaseSandboxHandler.java @@ -209,10 +209,10 @@ protected File getEngineHostDir() { protected abstract String getPluginType(); - private static Log _log = LogFactoryUtil.getLog(BaseSandboxHandler.class); + private static final Log _log = LogFactoryUtil.getLog(BaseSandboxHandler.class); - private Deployer _deployer; + private final Deployer _deployer; private File _engineHostDir; - private String _pluginType; + private final String _pluginType; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxDeployListener.java index ed38e5fd2d5704..f127d91108afc6 100644 --- a/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxDeployListener.java @@ -75,6 +75,6 @@ public void undeploy(File dir) throws SandboxDeployException { _sandboxHandler.undeploy(dir); } - private SandboxHandler _sandboxHandler; + private final SandboxHandler _sandboxHandler; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxHandler.java b/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxHandler.java index d205784621c1d4..3b64ebb15ecd99 100644 --- a/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxHandler.java +++ b/portal-impl/src/com/liferay/portal/deploy/sandbox/PortletSandboxHandler.java @@ -166,6 +166,6 @@ protected void updatePortletXML(File dir) throws Exception { private static final String _PLUGIN_TYPE = "portlet"; - private Deployer _deployer; + private final Deployer _deployer; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/deploy/sandbox/ThemeSandboxDeployListener.java b/portal-impl/src/com/liferay/portal/deploy/sandbox/ThemeSandboxDeployListener.java index 1fe586041b1e44..b2c431a0184422 100644 --- a/portal-impl/src/com/liferay/portal/deploy/sandbox/ThemeSandboxDeployListener.java +++ b/portal-impl/src/com/liferay/portal/deploy/sandbox/ThemeSandboxDeployListener.java @@ -79,6 +79,6 @@ public void undeploy(File dir) throws SandboxDeployException { _sandboxHandler.undeploy(dir); } - private SandboxHandler _sandboxHandler; + private final SandboxHandler _sandboxHandler; } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/ChannelHubAppShutdownAction.java b/portal-impl/src/com/liferay/portal/events/ChannelHubAppShutdownAction.java index 738d07c1fd3dd9..6c9bdd6bb398f1 100644 --- a/portal-impl/src/com/liferay/portal/events/ChannelHubAppShutdownAction.java +++ b/portal-impl/src/com/liferay/portal/events/ChannelHubAppShutdownAction.java @@ -42,7 +42,7 @@ public void run(String[] ids) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ChannelHubAppShutdownAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/ChannelHubAppStartupAction.java b/portal-impl/src/com/liferay/portal/events/ChannelHubAppStartupAction.java index a5fd98322af6fc..87563d394b32fc 100644 --- a/portal-impl/src/com/liferay/portal/events/ChannelHubAppStartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/ChannelHubAppStartupAction.java @@ -49,7 +49,7 @@ public void run(String[] ids) throws ActionException { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ChannelHubAppStartupAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/ChannelLoginPostAction.java b/portal-impl/src/com/liferay/portal/events/ChannelLoginPostAction.java index ffbb0a6bc7c737..50b390a59862b9 100644 --- a/portal-impl/src/com/liferay/portal/events/ChannelLoginPostAction.java +++ b/portal-impl/src/com/liferay/portal/events/ChannelLoginPostAction.java @@ -48,7 +48,7 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ChannelLoginPostAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/ChannelSessionDestroyAction.java b/portal-impl/src/com/liferay/portal/events/ChannelSessionDestroyAction.java index ad74b26152a052..727b0f41a1b79a 100644 --- a/portal-impl/src/com/liferay/portal/events/ChannelSessionDestroyAction.java +++ b/portal-impl/src/com/liferay/portal/events/ChannelSessionDestroyAction.java @@ -78,7 +78,7 @@ public void run(HttpSession session) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ChannelSessionDestroyAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/CryptoStartupAction.java b/portal-impl/src/com/liferay/portal/events/CryptoStartupAction.java index 3933e1ec298a22..a5ccd3869b4310 100644 --- a/portal-impl/src/com/liferay/portal/events/CryptoStartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/CryptoStartupAction.java @@ -38,6 +38,6 @@ public void run(String[] ids) { } } - private static Log _log = LogFactoryUtil.getLog(CryptoStartupAction.class); + private static final Log _log = LogFactoryUtil.getLog(CryptoStartupAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/DefaultLandingPageAction.java b/portal-impl/src/com/liferay/portal/events/DefaultLandingPageAction.java index edc69149f66255..444249c49da964 100644 --- a/portal-impl/src/com/liferay/portal/events/DefaultLandingPageAction.java +++ b/portal-impl/src/com/liferay/portal/events/DefaultLandingPageAction.java @@ -106,7 +106,7 @@ protected void doRun( session.setAttribute(WebKeys.LAST_PATH, lastPath);*/ } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DefaultLandingPageAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/DefaultLogoutPageAction.java b/portal-impl/src/com/liferay/portal/events/DefaultLogoutPageAction.java index afae2666df9d57..39afdc17003b01 100644 --- a/portal-impl/src/com/liferay/portal/events/DefaultLogoutPageAction.java +++ b/portal-impl/src/com/liferay/portal/events/DefaultLogoutPageAction.java @@ -77,7 +77,7 @@ protected void doRun( session.setAttribute(WebKeys.LAST_PATH, lastPath);*/ } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( DefaultLogoutPageAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/EventsProcessorUtil.java b/portal-impl/src/com/liferay/portal/events/EventsProcessorUtil.java index 90d977295a8e54..1c302dba2ce390 100644 --- a/portal-impl/src/com/liferay/portal/events/EventsProcessorUtil.java +++ b/portal-impl/src/com/liferay/portal/events/EventsProcessorUtil.java @@ -161,11 +161,11 @@ private void _unregisterEvent(String key, Object event) { lifecycleActions.remove(event); } - private static Log _log = LogFactoryUtil.getLog(EventsProcessorUtil.class); + private static final Log _log = LogFactoryUtil.getLog(EventsProcessorUtil.class); - private static EventsProcessorUtil _instance = new EventsProcessorUtil(); + private static final EventsProcessorUtil _instance = new EventsProcessorUtil(); - private ConcurrentMap> + private final ConcurrentMap> _lifecycleActions = new ConcurrentHashMap>(); diff --git a/portal-impl/src/com/liferay/portal/events/GarbageCollectorAction.java b/portal-impl/src/com/liferay/portal/events/GarbageCollectorAction.java index 0ef70cc8bd6604..69dd26ef5e1d64 100644 --- a/portal-impl/src/com/liferay/portal/events/GarbageCollectorAction.java +++ b/portal-impl/src/com/liferay/portal/events/GarbageCollectorAction.java @@ -52,7 +52,7 @@ public void run(HttpSession session) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( GarbageCollectorAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java b/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java index 178b2222be974e..860b90e9c0ee56 100644 --- a/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/GlobalStartupAction.java @@ -351,7 +351,7 @@ protected void doPortalInit() { } } - private static Log _log = LogFactoryUtil.getLog(GlobalStartupAction.class); + private static final Log _log = LogFactoryUtil.getLog(GlobalStartupAction.class); private static List _autoDeployListeners; private static List _hotDeployListeners; diff --git a/portal-impl/src/com/liferay/portal/events/LogMemoryUsageAction.java b/portal-impl/src/com/liferay/portal/events/LogMemoryUsageAction.java index a40ee216d44f18..dac66c89ba6ac2 100644 --- a/portal-impl/src/com/liferay/portal/events/LogMemoryUsageAction.java +++ b/portal-impl/src/com/liferay/portal/events/LogMemoryUsageAction.java @@ -45,6 +45,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LogMemoryUsageAction.class); + private static final Log _log = LogFactoryUtil.getLog(LogMemoryUsageAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LogSessionIdAction.java b/portal-impl/src/com/liferay/portal/events/LogSessionIdAction.java index 2bd06e2459f28c..898ccd8c302ab6 100644 --- a/portal-impl/src/com/liferay/portal/events/LogSessionIdAction.java +++ b/portal-impl/src/com/liferay/portal/events/LogSessionIdAction.java @@ -38,6 +38,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LogSessionIdAction.class); + private static final Log _log = LogFactoryUtil.getLog(LogSessionIdAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LogThreadCountAction.java b/portal-impl/src/com/liferay/portal/events/LogThreadCountAction.java index 6053a08a1cdd68..16d27c84d61fdb 100644 --- a/portal-impl/src/com/liferay/portal/events/LogThreadCountAction.java +++ b/portal-impl/src/com/liferay/portal/events/LogThreadCountAction.java @@ -33,6 +33,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LogThreadCountAction.class); + private static final Log _log = LogFactoryUtil.getLog(LogThreadCountAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LoginPostAction.java b/portal-impl/src/com/liferay/portal/events/LoginPostAction.java index 5642e6f4f720fa..e328905b45742e 100644 --- a/portal-impl/src/com/liferay/portal/events/LoginPostAction.java +++ b/portal-impl/src/com/liferay/portal/events/LoginPostAction.java @@ -108,6 +108,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) } } - private static Log _log = LogFactoryUtil.getLog(LoginPostAction.class); + private static final Log _log = LogFactoryUtil.getLog(LoginPostAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LoginPreAction.java b/portal-impl/src/com/liferay/portal/events/LoginPreAction.java index 46944904ed06ad..cfe1fb839f0b3a 100644 --- a/portal-impl/src/com/liferay/portal/events/LoginPreAction.java +++ b/portal-impl/src/com/liferay/portal/events/LoginPreAction.java @@ -33,6 +33,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LoginPreAction.class); + private static final Log _log = LogFactoryUtil.getLog(LoginPreAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LogoutPostAction.java b/portal-impl/src/com/liferay/portal/events/LogoutPostAction.java index 594e8edccec056..5d14b06918e830 100644 --- a/portal-impl/src/com/liferay/portal/events/LogoutPostAction.java +++ b/portal-impl/src/com/liferay/portal/events/LogoutPostAction.java @@ -33,6 +33,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LogoutPostAction.class); + private static final Log _log = LogFactoryUtil.getLog(LogoutPostAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/LogoutPreAction.java b/portal-impl/src/com/liferay/portal/events/LogoutPreAction.java index 5578539bae3f4a..b4de0983558c6e 100644 --- a/portal-impl/src/com/liferay/portal/events/LogoutPreAction.java +++ b/portal-impl/src/com/liferay/portal/events/LogoutPreAction.java @@ -33,6 +33,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(LogoutPreAction.class); + private static final Log _log = LogFactoryUtil.getLog(LogoutPreAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/RandomLayoutAction.java b/portal-impl/src/com/liferay/portal/events/RandomLayoutAction.java index 8959fd0748b763..819c97131a89bb 100644 --- a/portal-impl/src/com/liferay/portal/events/RandomLayoutAction.java +++ b/portal-impl/src/com/liferay/portal/events/RandomLayoutAction.java @@ -95,6 +95,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) } } - private static Log _log = LogFactoryUtil.getLog(RandomLayoutAction.class); + private static final Log _log = LogFactoryUtil.getLog(RandomLayoutAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/RandomLookAndFeelAction.java b/portal-impl/src/com/liferay/portal/events/RandomLookAndFeelAction.java index a8d2d867df3220..d1cc210acd6023 100644 --- a/portal-impl/src/com/liferay/portal/events/RandomLookAndFeelAction.java +++ b/portal-impl/src/com/liferay/portal/events/RandomLookAndFeelAction.java @@ -104,7 +104,7 @@ public void run(HttpServletRequest request, HttpServletResponse response) } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( RandomLookAndFeelAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/SampleAppStartupAction.java b/portal-impl/src/com/liferay/portal/events/SampleAppStartupAction.java index fe79a770e918e0..d43580bdc0b716 100644 --- a/portal-impl/src/com/liferay/portal/events/SampleAppStartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/SampleAppStartupAction.java @@ -116,7 +116,7 @@ protected void doRun(long companyId) throws Exception { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( SampleAppStartupAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/SecureRequestAction.java b/portal-impl/src/com/liferay/portal/events/SecureRequestAction.java index c39fdbef5f18be..dff0725b3a527e 100644 --- a/portal-impl/src/com/liferay/portal/events/SecureRequestAction.java +++ b/portal-impl/src/com/liferay/portal/events/SecureRequestAction.java @@ -96,6 +96,6 @@ protected boolean isRequiresSecure(HttpServletRequest request) { private static final boolean _REQUIRES_SECURE = true; - private static Log _log = LogFactoryUtil.getLog(SecureRequestAction.class); + private static final Log _log = LogFactoryUtil.getLog(SecureRequestAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/ServicePostAction.java b/portal-impl/src/com/liferay/portal/events/ServicePostAction.java index 7178a964ce3367..b468ad9a6956f9 100644 --- a/portal-impl/src/com/liferay/portal/events/ServicePostAction.java +++ b/portal-impl/src/com/liferay/portal/events/ServicePostAction.java @@ -46,6 +46,6 @@ public void run(HttpServletRequest request, HttpServletResponse response) { } } - private static Log _log = LogFactoryUtil.getLog(ServicePostAction.class); + private static final Log _log = LogFactoryUtil.getLog(ServicePostAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/SessionCreateAction.java b/portal-impl/src/com/liferay/portal/events/SessionCreateAction.java index ac33138c1071b7..77180e7846b11f 100644 --- a/portal-impl/src/com/liferay/portal/events/SessionCreateAction.java +++ b/portal-impl/src/com/liferay/portal/events/SessionCreateAction.java @@ -32,6 +32,6 @@ public void run(HttpSession session) { } } - private static Log _log = LogFactoryUtil.getLog(SessionCreateAction.class); + private static final Log _log = LogFactoryUtil.getLog(SessionCreateAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/SessionDestroyAction.java b/portal-impl/src/com/liferay/portal/events/SessionDestroyAction.java index 8339f4ae6aef39..5d56f9576fde79 100644 --- a/portal-impl/src/com/liferay/portal/events/SessionDestroyAction.java +++ b/portal-impl/src/com/liferay/portal/events/SessionDestroyAction.java @@ -32,6 +32,6 @@ public void run(HttpSession session) { } } - private static Log _log = LogFactoryUtil.getLog(SessionDestroyAction.class); + private static final Log _log = LogFactoryUtil.getLog(SessionDestroyAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/SiteMinderLogoutAction.java b/portal-impl/src/com/liferay/portal/events/SiteMinderLogoutAction.java index f28c6993542164..5ea84810cc5a2d 100644 --- a/portal-impl/src/com/liferay/portal/events/SiteMinderLogoutAction.java +++ b/portal-impl/src/com/liferay/portal/events/SiteMinderLogoutAction.java @@ -78,7 +78,7 @@ public void run(HttpServletRequest request, HttpServletResponse response) { private static final String _SMSESSION = "SMSESSION"; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( SiteMinderLogoutAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/StartupAction.java b/portal-impl/src/com/liferay/portal/events/StartupAction.java index dd4165cdb5ff2b..3891f91ff903cb 100644 --- a/portal-impl/src/com/liferay/portal/events/StartupAction.java +++ b/portal-impl/src/com/liferay/portal/events/StartupAction.java @@ -222,6 +222,6 @@ protected void doRun(String[] ids) throws Exception { CachedLoggerProvider.install(); } - private static Log _log = LogFactoryUtil.getLog(StartupAction.class); + private static final Log _log = LogFactoryUtil.getLog(StartupAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/events/StartupHelper.java b/portal-impl/src/com/liferay/portal/events/StartupHelper.java index 7d90da85024a19..40c6cc123ad010 100644 --- a/portal-impl/src/com/liferay/portal/events/StartupHelper.java +++ b/portal-impl/src/com/liferay/portal/events/StartupHelper.java @@ -182,7 +182,7 @@ protected String[] getUpgradeProcessClassNames(String key) { return StringUtil.split(GetterUtil.getString(PropsUtil.get(key))); } - private static Log _log = LogFactoryUtil.getLog(StartupHelper.class); + private static final Log _log = LogFactoryUtil.getLog(StartupHelper.class); private boolean _dropIndexes; private boolean _startupFinished; diff --git a/portal-impl/src/com/liferay/portal/events/ThemeServicePreAction.java b/portal-impl/src/com/liferay/portal/events/ThemeServicePreAction.java index 1b9f0ebc626435..678a6c04059e38 100644 --- a/portal-impl/src/com/liferay/portal/events/ThemeServicePreAction.java +++ b/portal-impl/src/com/liferay/portal/events/ThemeServicePreAction.java @@ -110,7 +110,7 @@ protected void servicePre( themeDisplay.setLookAndFeel(theme, colorScheme); } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( ThemeServicePreAction.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/executor/PortalExecutorManagerImpl.java b/portal-impl/src/com/liferay/portal/executor/PortalExecutorManagerImpl.java index 5985fa3d98d1da..9bc3c641ef61cb 100644 --- a/portal-impl/src/com/liferay/portal/executor/PortalExecutorManagerImpl.java +++ b/portal-impl/src/com/liferay/portal/executor/PortalExecutorManagerImpl.java @@ -175,7 +175,7 @@ public void shutdown(String name, boolean interrupt) { } } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( PortalExecutorManagerImpl.class); private PortalExecutorFactory _portalExecutorFactory; diff --git a/portal-impl/src/com/liferay/portal/expression/ExpressionImpl.java b/portal-impl/src/com/liferay/portal/expression/ExpressionImpl.java index 3b54b13036d9c2..77a9870f8d79a0 100644 --- a/portal-impl/src/com/liferay/portal/expression/ExpressionImpl.java +++ b/portal-impl/src/com/liferay/portal/expression/ExpressionImpl.java @@ -269,11 +269,11 @@ protected VariableDependencies populateVariableDependenciesMap( return variableDependencies; } - private Class _expressionClass; - private String _expressionString; - private VariableNamesExtractor _variableNamesExtractor = + private final Class _expressionClass; + private final String _expressionString; + private final VariableNamesExtractor _variableNamesExtractor = new VariableNamesExtractor(); - private Map _variables = new TreeMap(); - private Map _variableValues = new HashMap(); + private final Map _variables = new TreeMap(); + private final Map _variableValues = new HashMap(); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/expression/VariableNamesExtractor.java b/portal-impl/src/com/liferay/portal/expression/VariableNamesExtractor.java index 0cac3c1a703e28..5fcc6dec09b4fb 100644 --- a/portal-impl/src/com/liferay/portal/expression/VariableNamesExtractor.java +++ b/portal-impl/src/com/liferay/portal/expression/VariableNamesExtractor.java @@ -41,7 +41,7 @@ public List extract(String expressionString) { return variableNames; } - private static Pattern _pattern = Pattern.compile( + private static final Pattern _pattern = Pattern.compile( "\\b([a-zA-Z]+[\\w\\._]*)(?!\\()\\b", Pattern.MULTILINE); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/CompressionLevel.java b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/CompressionLevel.java index 4c6120bbe68e4e..87ce886231b55b 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/CompressionLevel.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/CompressionLevel.java @@ -50,7 +50,7 @@ private CompressionLevel(int level) { _level = level; } - private static Map _compressionLevels = + private static final Map _compressionLevels = new HashMap(); static { diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/FileHelperUtil.java b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/FileHelperUtil.java index 91493334edbd5d..3830150ac3e289 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/FileHelperUtil.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/FileHelperUtil.java @@ -396,6 +396,6 @@ public FileVisitResult visitFile( return rawSize.get(); } - private static Log _log = LogFactoryUtil.getLog(FileHelperUtil.class); + private static final Log _log = LogFactoryUtil.getLog(FileHelperUtil.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileResponseChannelHandler.java b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileResponseChannelHandler.java index 06656bcfa0599a..6b146b0c609787 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileResponseChannelHandler.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileResponseChannelHandler.java @@ -73,7 +73,7 @@ public FileResponse channelRead0( return null; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( FileResponseChannelHandler.class); private final AsyncBroker _asyncBroker; diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileUploadChannelHandler.java b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileUploadChannelHandler.java index a79a7324086ca3..bc51bf0d85ddc2 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileUploadChannelHandler.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/fileserver/handlers/FileUploadChannelHandler.java @@ -200,7 +200,7 @@ protected boolean receive(ByteBuf byteBuf) throws IOException { protected final FileResponse fileResponse; protected final Path tempFilePath; - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( FileUploadChannelHandler.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCRequest.java b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCRequest.java index e42ad499c6b74b..e765425e1639bf 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCRequest.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCRequest.java @@ -137,7 +137,7 @@ protected LogErrorFutureListener(RPCResponse rpcResponse) { } - private static Log _log = LogFactoryUtil.getLog(RPCRequest.class); + private static final Log _log = LogFactoryUtil.getLog(RPCRequest.class); private static final long serialVersionUID = 1L; diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCResponse.java b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCResponse.java index 90318fa3077b50..5bcc959ef6acc3 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCResponse.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCResponse.java @@ -98,7 +98,7 @@ public String toString() { return sb.toString(); } - private static Log _log = LogFactoryUtil.getLog(RPCResponse.class); + private static final Log _log = LogFactoryUtil.getLog(RPCResponse.class); private static final long serialVersionUID = 1L; diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCUtil.java b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCUtil.java index b7fdc6cf9d5080..cc8badfd19fba1 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCUtil.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/rpc/RPCUtil.java @@ -74,6 +74,6 @@ public void operationComplete(ChannelFuture channelFuture) { return noticeableFuture; } - private static Log _log = LogFactoryUtil.getLog(RPCUtil.class); + private static final Log _log = LogFactoryUtil.getLog(RPCUtil.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/fabric/netty/util/NettyUtil.java b/portal-impl/src/com/liferay/portal/fabric/netty/util/NettyUtil.java index a98561ed7a213a..dfa2d5d316307a 100644 --- a/portal-impl/src/com/liferay/portal/fabric/netty/util/NettyUtil.java +++ b/portal-impl/src/com/liferay/portal/fabric/netty/util/NettyUtil.java @@ -86,6 +86,6 @@ public void complete(Future future) { }); } - private static Log _log = LogFactoryUtil.getLog(NettyUtil.class); + private static final Log _log = LogFactoryUtil.getLog(NettyUtil.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/facebook/FacebookConnectImpl.java b/portal-impl/src/com/liferay/portal/facebook/FacebookConnectImpl.java index 6201833ed60eb0..71fa7d936ba3d1 100644 --- a/portal-impl/src/com/liferay/portal/facebook/FacebookConnectImpl.java +++ b/portal-impl/src/com/liferay/portal/facebook/FacebookConnectImpl.java @@ -206,6 +206,6 @@ public boolean isVerifiedAccountRequired(long companyId) { PropsValues.FACEBOOK_CONNECT_VERIFIED_ACCOUNT_REQUIRED); } - private static Log _log = LogFactoryUtil.getLog(FacebookConnectImpl.class); + private static final Log _log = LogFactoryUtil.getLog(FacebookConnectImpl.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/facebook/FacebookServlet.java b/portal-impl/src/com/liferay/portal/facebook/FacebookServlet.java index aa9ea8d18039c8..1d554eb5bfabfa 100644 --- a/portal-impl/src/com/liferay/portal/facebook/FacebookServlet.java +++ b/portal-impl/src/com/liferay/portal/facebook/FacebookServlet.java @@ -102,6 +102,6 @@ protected String fixFbml(String fbml) { return fbml; } - private static Log _log = LogFactoryUtil.getLog(FacebookServlet.class); + private static final Log _log = LogFactoryUtil.getLog(FacebookServlet.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerServletResourceParser.java b/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerServletResourceParser.java index 2d3ac0f863cfa2..ab1e0eba6b3566 100644 --- a/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerServletResourceParser.java +++ b/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerServletResourceParser.java @@ -83,7 +83,7 @@ public URL getURL(String name) throws IOException { return url; } - private static Log _log = LogFactoryUtil.getLog( + private static final Log _log = LogFactoryUtil.getLog( FreeMarkerServletResourceParser.class); } \ No newline at end of file diff --git a/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerTemplate.java b/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerTemplate.java index 6d419670d1568d..83e0345d382337 100644 --- a/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerTemplate.java +++ b/portal-impl/src/com/liferay/portal/freemarker/FreeMarkerTemplate.java @@ -130,8 +130,8 @@ protected void processTemplate( } } - private Configuration _configuration; - private boolean _privileged; + private final Configuration _configuration; + private final boolean _privileged; private class TemplatePrivilegedExceptionAction implements PrivilegedExceptionAction