You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/20 15:42:31 UTC
svn commit: r1596243 - in
/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster:
RoleLaunchService.java web/SliderAMWebApp.java
web/SliderAmFilterInitializer.java web/SliderAmIpFilter.java
web/WebAppApiImpl.java
Author: stevel
Date: Tue May 20 13:42:30 2014
New Revision: 1596243
URL: http://svn.apache.org/r1596243
Log:
quick cleanup of some of the AM utility classes
Modified:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java?rev=1596243&r1=1596242&r2=1596243&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/RoleLaunchService.java Tue May 20 13:42:30 2014
@@ -60,7 +60,7 @@ public class RoleLaunchService extends A
* the AM that it has finished
*/
private final Map<RoleLauncher, Thread> launchThreads =
- new HashMap<RoleLauncher, Thread>();
+ new HashMap<>();
/**
* Callback to whatever has the task of actually running the container
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java?rev=1596243&r1=1596242&r2=1596243&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java Tue May 20 13:42:30 2014
@@ -97,7 +97,7 @@ public class SliderAMWebApp extends WebA
String regex = "(?!/ws)";
serveRegex(regex).with(SliderDefaultWrapperServlet.class);
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put(ResourceConfig.FEATURE_IMPLICIT_VIEWABLES, "true");
params.put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, "true");
params.put(FeaturesAndProperties.FEATURE_XMLROOTELEMENT_PROCESSING, "true");
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java?rev=1596243&r1=1596242&r2=1596243&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java Tue May 20 13:42:30 2014
@@ -43,7 +43,7 @@ public class SliderAmFilterInitializer e
@Override
public void initFilter(FilterContainer container, Configuration conf) {
configuration = conf;
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
String proxy = WebAppUtils.getProxyHostAndPort(conf);
String[] parts = proxy.split(":");
params.put(SliderAmIpFilter.PROXY_HOST, parts[0]);
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java?rev=1596243&r1=1596242&r2=1596243&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java Tue May 20 13:42:30 2014
@@ -67,7 +67,7 @@ public class SliderAmIpFilter implements
synchronized(this) {
if(proxyAddresses == null || (lastUpdate + updateInterval) >= now) {
try {
- proxyAddresses = new HashSet<String>();
+ proxyAddresses = new HashSet<>();
for(InetAddress add : InetAddress.getAllByName(proxyHost)) {
if (log.isDebugEnabled()) {
log.debug("proxy address is: " + add.getHostAddress());
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java?rev=1596243&r1=1596242&r2=1596243&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java Tue May 20 13:42:30 2014
@@ -114,13 +114,15 @@ public class WebAppApiImpl implements We
* @param statusById
* @return A Map of RoleStatus by the role name
*/
- private TreeMap<String,RoleStatus> getRoleStatusesByName(Map<Integer,ProviderRole> rolesById, Map<Integer,RoleStatus> statusById) {
- TreeMap<String,RoleStatus> statusByName = new TreeMap<String,RoleStatus>();
- for (Entry<Integer,ProviderRole> role : rolesById.entrySet()) {
+ private TreeMap<String, RoleStatus> getRoleStatusesByName(Map<Integer, ProviderRole> rolesById,
+ Map<Integer, RoleStatus> statusById) {
+ TreeMap<String, RoleStatus> statusByName = new TreeMap<>();
+ for (Entry<Integer, ProviderRole> role : rolesById.entrySet()) {
final RoleStatus status = statusById.get(role.getKey());
if (null == status) {
- log.error("Found ID ({}) which has no known ProviderRole", role.getKey());
+ log.error("Found ID ({}) which has no known ProviderRole",
+ role.getKey());
} else {
statusByName.put(role.getValue().name, status);
}