LPS-49294 Ran ant format-source

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;
 
 }

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;
 
 }

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<String, Map<String, String>> _symbolsPool =
+	private static final Map<String, Map<String, String>> _symbolsPool =
 		new ConcurrentHashMap<String, Map<String, String>>();
 
-	private Set<String> _currencyIds;
+	private final Set<String> _currencyIds;
 
 }

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;
 
 }

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;
 
 }

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);
 
 }

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;
 
 }

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);
 
 }

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();
 
 }

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<String, List<URL>> _extraPackageMap;
 	private List<URL> _extraPackageURLs;
 	private Framework _framework;
@@ -1329,8 +1329,8 @@ public void frameworkEvent(FrameworkEvent frameworkEvent) {
 			}
 		}
 
-		private List<Bundle> _lazyActivationBundles;
-		private List<Bundle> _startBundles;
+		private final List<Bundle> _lazyActivationBundles;
+		private final List<Bundle> _startBundles;
 
 	}
 

modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java

@@ -432,10 +432,10 @@ private <S, T> void _removedService(
 		}
 	}
 
-	private AtomicLong _serviceIdCounter = new AtomicLong();
-	private Map<ServiceReference<?>, Object> _services =
+	private final AtomicLong _serviceIdCounter = new AtomicLong();
+	private final Map<ServiceReference<?>, Object> _services =
 		new ConcurrentSkipListMap<ServiceReference<?>, Object>();
-	private Map<ServiceTracker<?, ?>, Filter> _serviceTrackers =
+	private final Map<ServiceTracker<?, ?>, Filter> _serviceTrackers =
 		new ConcurrentHashMap<ServiceTracker<?, ?>, Filter>();
 
 	private class BasicFilter implements Filter {
@@ -600,7 +600,7 @@ else if (value instanceof Collection) {
 			return stringBuilder.toString();
 		}
 
-		private Map<String, Object> _properties = new LowerCaseKeyTreeMap();
+		private final Map<String, Object> _properties = new LowerCaseKeyTreeMap();
 
 	}
 
@@ -632,7 +632,7 @@ public void unregister() {
 			_removedService(_basicServiceReference);
 		}
 
-		private BasicServiceReference<S> _basicServiceReference;
+		private final BasicServiceReference<S> _basicServiceReference;
 
 	}
 
@@ -846,9 +846,9 @@ public T waitForService(long timeout) throws InterruptedException {
 
 		private volatile CountDownLatch _countDownLatch = new CountDownLatch(1);
 		private Filter _filter;
-		private ServiceTrackerCustomizer<S, T> _serviceTrackerCustomizer;
-		private AtomicInteger _stateCounter = new AtomicInteger();
-		private NavigableMap<ServiceReference<S>, T> _trackedServices =
+		private final ServiceTrackerCustomizer<S, T> _serviceTrackerCustomizer;
+		private final AtomicInteger _stateCounter = new AtomicInteger();
+		private final NavigableMap<ServiceReference<S>, T> _trackedServices =
 			new ConcurrentSkipListMap<ServiceReference<S>, T>();
 
 	}

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<SR> _serviceReference;
+	private final TS _service;
+	private final ServiceReference<SR> _serviceReference;
 
 }

modules/core/registry-api/src/com/liferay/registry/collections/ServiceReferenceServiceTupleComparator.java

@@ -48,6 +48,6 @@ public int compare(
 			serviceReferenceServiceTuple2.getServiceReference());
 	}
 
-	private Comparator<ServiceReference<S>> _comparator;
+	private final Comparator<ServiceReference<S>> _comparator;
 
 }

modules/core/registry-api/src/com/liferay/registry/collections/internal/MultiValueServiceTrackerBucketFactory.java

@@ -48,7 +48,7 @@ public ServiceTrackerBucket<SR, TS, List<TS>> create() {
 		return new ListServiceTrackerBucket();
 	}
 
-	private Comparator<ServiceReference<SR>> _comparator;
+	private final Comparator<ServiceReference<SR>> _comparator;
 
 	private class ListServiceTrackerBucket
 		implements ServiceTrackerBucket<SR, TS, List<TS>> {
@@ -106,7 +106,7 @@ private ListServiceTrackerBucket() {
 					serviceReferenceServiceTupleComparator);
 		}
 
-		private Set<ServiceReferenceServiceTuple<SR, TS>>
+		private final Set<ServiceReferenceServiceTuple<SR, TS>>
 			_serviceReferenceServiceTuples;
 		private List<TS> _services = new ArrayList<TS>();
 

modules/core/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java

@@ -93,14 +93,14 @@ public void open() {
 		_serviceTracker.open();
 	}
 
-	private ServiceReferenceMapper<K, SR> _serviceReferenceMapper;
-	private ServiceTracker<SR, ServiceReferenceServiceTuple<SR, TS>>
+	private final ServiceReferenceMapper<K, SR> _serviceReferenceMapper;
+	private final ServiceTracker<SR, ServiceReferenceServiceTuple<SR, TS>>
 		_serviceTracker;
-	private ConcurrentHashMap<K, ServiceTrackerBucket<SR, TS, R>>
+	private final ConcurrentHashMap<K, ServiceTrackerBucket<SR, TS, R>>
 		_serviceTrackerBuckets =
 			new ConcurrentHashMap<K, ServiceTrackerBucket<SR, TS, R>>();
-	private ServiceTrackerCustomizer<SR, TS> _serviceTrackerCustomizer;
-	private ServiceTrackerBucketFactory<SR, TS, R>
+	private final ServiceTrackerCustomizer<SR, TS> _serviceTrackerCustomizer;
+	private final ServiceTrackerBucketFactory<SR, TS, R>
 		_serviceTrackerMapBucketFactory;
 
 	private class Holder<T> {

modules/core/registry-api/src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java

@@ -45,7 +45,7 @@ public ServiceTrackerBucket<SR, TS, TS> create() {
 		return new SingleBucket();
 	}
 
-	private Comparator<ServiceReference<SR>> _comparator;
+	private final Comparator<ServiceReference<SR>> _comparator;
 
 	private class SingleBucket implements ServiceTrackerBucket<SR, TS, TS> {
 
@@ -98,7 +98,7 @@ public synchronized void store(
 		}
 
 		private TS _service;
-		private PriorityQueue<ServiceReferenceServiceTuple<SR, TS>>
+		private final PriorityQueue<ServiceReferenceServiceTuple<SR, TS>>
 			_serviceReferences;
 
 	}

modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableDictionaryMap.java

@@ -103,6 +103,6 @@ public Collection<V> values() {
 		return _map.values();
 	}
 
-	private Map<K, V> _map;
+	private final Map<K, V> _map;
 
 }

modules/core/registry-api/src/com/liferay/registry/util/UnmodifiableMapDictionary.java

@@ -71,8 +71,8 @@ public int size() {
 		return _map.size();
 	}
 
-	private Enumeration<V> _elements;
-	private Enumeration<K> _keys;
-	private Map<K, V> _map;
+	private final Enumeration<V> _elements;
+	private final Enumeration<K> _keys;
+	private final Map<K, V> _map;
 
 }

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;
 
 }

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<T> _serviceReference;
+	private final org.osgi.framework.ServiceReference<T> _serviceReference;
 
 }

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<T> _serviceRegistration;
+	private final org.osgi.framework.ServiceRegistration<T> _serviceRegistration;
 
 }

modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerCustomizerAdapter.java

@@ -52,6 +52,6 @@ public void removedService(
 			new ServiceReferenceWrapper<S>(serviceReference), service);
 	}
 
-	private ServiceTrackerCustomizer<S, T> _serviceTrackerCustomizer;
+	private final ServiceTrackerCustomizer<S, T> _serviceTrackerCustomizer;
 
 }

modules/core/registry-test/src/com/liferay/registry/internal/RegistryWrapper.java

@@ -230,8 +230,8 @@ public <T> boolean ungetService(ServiceReference<T> serviceReference) {
 		return _registry.ungetService(serviceReference);
 	}
 
-	private Registry _registry;
-	private ConcurrentHashMap<ServiceReference<?>, AtomicInteger>
+	private final Registry _registry;
+	private final ConcurrentHashMap<ServiceReference<?>, AtomicInteger>
 		_serviceReferenceCountsMap =
 			new ConcurrentHashMap<ServiceReference<?>, AtomicInteger>();
 

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;
 
 }

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;
 
 }

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<TrackedOne> _referenceA;
-		private AtomicReference<TrackedOne> _referenceB;
+		private final InterfaceOne _interfaceOneA;
+		private final InterfaceOne _interfaceOneB;
+		private final AtomicReference<TrackedOne> _referenceA;
+		private final AtomicReference<TrackedOne> _referenceB;
 
 	}
 

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;
 
 	}
 

modules/portal/portal-portlet-tracker/src/com/liferay/portal/portlet/tracker/internal/BundlePluginPackage.java

@@ -256,9 +256,9 @@ public void setTags(List<String> tags) {
 	public void setTypes(List<String> types) {
 	}
 
-	private Bundle _bundle;
-	private Dictionary<String, String> _headers;
-	private PortletApp _portletApp;
-	private Version _version;
+	private final Bundle _bundle;
+	private final Dictionary<String, String> _headers;
+	private final PortletApp _portletApp;
+	private final Version _version;
 
 }