Skip to content

Commit

Permalink
LPS-52534 Generated - Apply diamond operators
Browse files Browse the repository at this point in the history
  • Loading branch information
@hhuijser @brianchandotcom
hhuijser authored and brianchandotcom committed Jan 20, 2015
1 parent bdc07f4 commit 50c0b6c
Show file tree
Hide file tree
Showing 250 changed files with 742 additions and 928 deletions.
3 changes: 1 addition & 2 deletions ...s/apps/web-proxy/web-proxy-web/src/com/liferay/web/proxy/web/portlet/WebProxyPortlet.java
View file
Expand Up @@ -177,8 +177,7 @@ protected void doInit() {
PortletConfig portletConfig = getPortletConfig();
PortletContext portletContext = getPortletContext();

Dictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
Dictionary<String, Object> properties = new HashMapDictionary<>();

properties.put(
HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT,
Expand Down
8 changes: 3 additions & 5 deletions modules/core/portal-bootstrap/src/com/liferay/portal/bootstrap/ModuleFrameworkImpl.java
View file
Expand Up @@ -328,8 +328,7 @@ public void registerExtraPackages() {

Map<String, List<URL>> extraPackageMap = getExtraPackageMap();

Dictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
Dictionary<String, Object> properties = new HashMapDictionary<>();

properties.put("jsp.compiler.resource.map", "portal.extra.packages");

Expand Down Expand Up @@ -1292,7 +1291,7 @@ private void _registerService(
}

HashMapDictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
new HashMapDictionary<>();

Map<String, Object> osgiBeanProperties =
OSGiBeanProperties.Convert.fromObject(bean);
Expand All @@ -1312,8 +1311,7 @@ private void _registerService(
private void _registerServletContext(ServletContext servletContext) {
BundleContext bundleContext = _framework.getBundleContext();

Dictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
Dictionary<String, Object> properties = new HashMapDictionary<>();

properties.put(
ServicePropsKeys.BEAN_ID, ServletContext.class.getName());
Expand Down
24 changes: 12 additions & 12 deletions modules/core/registry-api/src/com/liferay/registry/BasicRegistryImpl.java
View file
Expand Up @@ -180,7 +180,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -200,7 +200,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -214,7 +214,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -234,7 +234,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -256,7 +256,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -282,7 +282,7 @@ public <T> ServiceRegistration<T> registerService(

_addingService(basicServiceReference, service);

return new BasicServiceRegistration<T>(basicServiceReference);
return new BasicServiceRegistration<>(basicServiceReference);
}

@Override
Expand All @@ -295,7 +295,7 @@ public <S, T> ServiceTracker<S, T> trackServices(Class<S> clazz) {
Filter filter = new BasicFilter(
"(objectClass=" + clazz.getName() + ")");

return new BasicServiceTracker<S, T>(filter);
return new BasicServiceTracker<>(filter);
}

@Override
Expand All @@ -306,25 +306,25 @@ public <S, T> ServiceTracker<S, T> trackServices(
Filter filter = new BasicFilter(
"(objectClass=" + clazz.getName() + ")");

return new BasicServiceTracker<S, T>(filter, serviceTrackerCustomizer);
return new BasicServiceTracker<>(filter, serviceTrackerCustomizer);
}

@Override
public <S, T> ServiceTracker<S, T> trackServices(Filter filter) {
return new BasicServiceTracker<S, T>(filter);
return new BasicServiceTracker<>(filter);
}

@Override
public <S, T> ServiceTracker<S, T> trackServices(
Filter filter,
ServiceTrackerCustomizer<S, T> serviceTrackerCustomizer) {

return new BasicServiceTracker<S, T>(filter, serviceTrackerCustomizer);
return new BasicServiceTracker<>(filter, serviceTrackerCustomizer);
}

@Override
public <S, T> ServiceTracker<S, T> trackServices(String className) {
return new BasicServiceTracker<S, T>(
return new BasicServiceTracker<>(
new BasicFilter("(objectClass=" + className + ")"));
}

Expand All @@ -335,7 +335,7 @@ public <S, T> ServiceTracker<S, T> trackServices(

Filter filter = new BasicFilter("(objectClass=" + className + ")");

return new BasicServiceTracker<S, T>(filter, serviceTrackerCustomizer);
return new BasicServiceTracker<>(filter, serviceTrackerCustomizer);
}

@Override
Expand Down
14 changes: 7 additions & 7 deletions ...les/core/registry-api/src/com/liferay/registry/collections/ServiceTrackerCollections.java
View file
Expand Up @@ -36,21 +36,21 @@
public class ServiceTrackerCollections {

public static <S> ServiceTrackerList<S> list(Class<S> clazz) {
return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, (Filter)null, null, new HashMap<String, Object>());
}

public static <S> ServiceTrackerList<S> list(
Class<S> clazz, Filter filter) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, filter, null, new HashMap<String, Object>());
}

public static <S> ServiceTrackerList<S> list(
Class<S> clazz, Filter filter, Map<String, Object> properties) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, filter, null, properties);
}

Expand All @@ -68,14 +68,14 @@ public static <S> ServiceTrackerList<S> list(
ServiceTrackerCustomizer<S, S> serviceTrackerCustomizer,
Map<String, Object> properties) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, filter, serviceTrackerCustomizer, properties);
}

public static <S> ServiceTrackerList<S> list(
Class<S> clazz, Map<String, Object> properties) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, (Filter)null, null, properties);
}

Expand All @@ -92,7 +92,7 @@ public static <S> ServiceTrackerList<S> list(
Class<S> clazz, ServiceTrackerCustomizer<S, S> serviceTrackerCustomizer,
Map<String, Object> properties) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, (Filter)null, serviceTrackerCustomizer, properties);
}

Expand All @@ -107,7 +107,7 @@ clazz, _getFilter(filterString), null,
public static <S> ServiceTrackerList<S> list(
Class<S> clazz, String filterString, Map<String, Object> properties) {

return new ServiceTrackerCollectionImpl<S>(
return new ServiceTrackerCollectionImpl<>(
clazz, _getFilter(filterString), null, properties);
}

Expand Down
4 changes: 2 additions & 2 deletions ...ore/registry-api/src/com/liferay/registry/collections/internal/ServiceTrackerMapImpl.java
View file
Expand Up @@ -126,7 +126,7 @@ public ServiceReferenceServiceTuple<SR, TS> addingService(
final ServiceReference<SR> serviceReference) {

final Holder<ServiceReferenceServiceTuple<SR, TS>> holder =
new Holder<ServiceReferenceServiceTuple<SR, TS>>();
new Holder<>();

_serviceReferenceMapper.map(
serviceReference,
Expand Down Expand Up @@ -160,7 +160,7 @@ public void emit(K key) {
serviceReference);

serviceReferenceServiceTuple =
new ServiceReferenceServiceTuple<SR, TS>(
new ServiceReferenceServiceTuple<>(
serviceReference, service);

holder.set(serviceReferenceServiceTuple);
Expand Down
5 changes: 2 additions & 3 deletions ...src/com/liferay/registry/collections/internal/SingleValueServiceTrackerBucketFactory.java
View file
Expand Up @@ -56,9 +56,8 @@ public SingleBucket() {
serviceReferenceServiceTupleComparator =
new ServiceReferenceServiceTupleComparator<>(_comparator);

_serviceReferences =
new PriorityQueue<ServiceReferenceServiceTuple<SR, TS>>(
1, serviceReferenceServiceTupleComparator);
_serviceReferences = new PriorityQueue<>(
1, serviceReferenceServiceTupleComparator);
}

@Override
Expand Down
22 changes: 11 additions & 11 deletions modules/core/registry-impl/src/com/liferay/registry/internal/RegistryImpl.java
View file
Expand Up @@ -101,7 +101,7 @@ public <T> ServiceReference<T> getServiceReference(Class<T> clazz) {
return null;
}

return new ServiceReferenceWrapper<T>(serviceReference);
return new ServiceReferenceWrapper<>(serviceReference);
}

@Override
Expand All @@ -114,7 +114,7 @@ public <T> ServiceReference<T> getServiceReference(String className) {
return null;
}

return new ServiceReferenceWrapper<T>(serviceReference);
return new ServiceReferenceWrapper<>(serviceReference);
}

@Override
Expand All @@ -141,7 +141,7 @@ public <T> Collection<ServiceReference<T>> getServiceReferences(
iterator.next();

ServiceReference<T> serviceReference =
new ServiceReferenceWrapper<T>(osgiServiceReference);
new ServiceReferenceWrapper<>(osgiServiceReference);

serviceReferences.add(serviceReference);
}
Expand Down Expand Up @@ -169,7 +169,7 @@ public <T> ServiceReference<T>[] getServiceReferences(
org.osgi.framework.ServiceReference<T> osgiServiceReference =
osgiServiceReferences[i];

serviceReferences[i] = new ServiceReferenceWrapper<T>(
serviceReferences[i] = new ServiceReferenceWrapper<>(
osgiServiceReference);
}

Expand Down Expand Up @@ -255,7 +255,7 @@ public <T> ServiceRegistration<T> registerService(
_bundleContext.registerService(
clazz, service, new MapWrapper(properties));

return new ServiceRegistrationWrapper<T>(serviceRegistration);
return new ServiceRegistrationWrapper<>(serviceRegistration);
}

@Override
Expand Down Expand Up @@ -311,7 +311,7 @@ public <S, T> ServiceTracker<S, T> trackServices(Class<S> clazz) {
new org.osgi.util.tracker.ServiceTracker<S, T>(
_bundleContext, clazz, null);

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand All @@ -325,7 +325,7 @@ public <S, T> ServiceTracker<S, T> trackServices(
new ServiceTrackerCustomizerAdapter<S, T>(
serviceTrackerCustomizer));

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand All @@ -340,7 +340,7 @@ public <S, T> ServiceTracker<S, T> trackServices(Filter filter) {
new org.osgi.util.tracker.ServiceTracker<S, T>(
_bundleContext, filterWrapper.getFilter(), null);

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand All @@ -360,7 +360,7 @@ public <S, T> ServiceTracker<S, T> trackServices(
new ServiceTrackerCustomizerAdapter<S, T>(
serviceTrackerCustomizer));

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand All @@ -369,7 +369,7 @@ public <S, T> ServiceTracker<S, T> trackServices(String className) {
new org.osgi.util.tracker.ServiceTracker<S, T>(
_bundleContext, className, null);

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand All @@ -383,7 +383,7 @@ public <S, T> ServiceTracker<S, T> trackServices(
new ServiceTrackerCustomizerAdapter<S, T>(
serviceTrackerCustomizer));

return new ServiceTrackerWrapper<S, T>(serviceTracker);
return new ServiceTrackerWrapper<>(serviceTracker);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion modules/core/registry-impl/src/com/liferay/registry/internal/ServiceRegistrationWrapper.java
View file
Expand Up @@ -49,7 +49,7 @@ public boolean equals(Object object) {

@Override
public ServiceReference<T> getServiceReference() {
return new ServiceReferenceWrapper<T>(
return new ServiceReferenceWrapper<>(
_serviceRegistration.getReference());
}

Expand Down
6 changes: 3 additions & 3 deletions modules/core/registry-impl/src/com/liferay/registry/internal/ServiceTrackerWrapper.java
View file
Expand Up @@ -78,7 +78,7 @@ public T getService(ServiceReference<S> serviceReference) {

@Override
public ServiceReference<S> getServiceReference() {
return new ServiceReferenceWrapper<S>(
return new ServiceReferenceWrapper<>(
_serviceTracker.getServiceReference());
}

Expand Down Expand Up @@ -111,7 +111,7 @@ public ServiceReference<S>[] getServiceReferences() {
org.osgi.framework.ServiceReference<S> osgiServiceReference =
osgiServiceReferences[i];

serviceReferences[i] = new ServiceReferenceWrapper<S>(
serviceReferences[i] = new ServiceReferenceWrapper<>(
osgiServiceReference);
}

Expand Down Expand Up @@ -148,7 +148,7 @@ public SortedMap<ServiceReference<S>, T> getTrackedServiceReferences() {
T service = entry.getValue();

ServiceReferenceWrapper<S> serviceReferenceWrapper =
new ServiceReferenceWrapper<S>(osgiServiceReference);
new ServiceReferenceWrapper<>(osgiServiceReference);

trackedServiceReferences.put(serviceReferenceWrapper, service);
}
Expand Down
6 changes: 2 additions & 4 deletions ...gistry-test/test/integration/com/liferay/registry/internal/ListServiceTrackerMapTest.java
View file
Expand Up @@ -328,8 +328,7 @@ protected ServiceRegistration<TrackedOne> registerService(
protected ServiceRegistration<TrackedOne> registerService(
TrackedOne trackedOne, int ranking, String target) {

Dictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
Dictionary<String, Object> properties = new HashMapDictionary<>();

properties.put("service.ranking", ranking);
properties.put("target", target);
Expand All @@ -341,8 +340,7 @@ protected ServiceRegistration<TrackedOne> registerService(
protected ServiceRegistration<TrackedOne> registerService(
TrackedOne trackedOne, String target) {

Dictionary<String, Object> properties =
new HashMapDictionary<String, Object>();
Dictionary<String, Object> properties = new HashMapDictionary<>();

properties.put("target", target);

Expand Down

0 comments on commit 50c0b6c

Please sign in to comment.