http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java index 6653dba..df4ab8e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleStatus.java @@ -264,7 +264,7 @@ public final class RoleStatus implements Cloneable { * @return a map for use in statistics reports */ public Map<String, Integer> buildStatistics() { - Map<String, Integer> stats = new HashMap<>(); + Map<String, Integer> stats = new HashMap<String, Integer>(); stats.put(StatusKeys.STATISTICS_CONTAINERS_ACTIVE_REQUESTS, getRequested()); stats.put(StatusKeys.STATISTICS_CONTAINERS_COMPLETED, getCompleted()); stats.put(StatusKeys.STATISTICS_CONTAINERS_DESIRED, getDesired());
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java index 4f290af..9192efe 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAMWebApp.java @@ -96,7 +96,7 @@ public class SliderAMWebApp extends WebApp { String regex = "(?!/ws)"; serveRegex(regex).with(SliderDefaultWrapperServlet.class); - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<String, String>(); params.put(ResourceConfig.FEATURE_IMPLICIT_VIEWABLES, "true"); params.put(ServletContainer.FEATURE_FILTER_FORWARD_ON_404, "true"); params.put(ResourceConfig.FEATURE_XMLROOTELEMENT_PROCESSING, "true"); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java index 606c05d..5fffa4a 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmFilterInitializer.java @@ -43,7 +43,7 @@ public class SliderAmFilterInitializer extends FilterInitializer { @Override public void initFilter(FilterContainer container, Configuration conf) { configuration = conf; - Map<String, String> params = new HashMap<>(); + Map<String, String> params = new HashMap<String, String>(); String proxy = WebAppUtils.getProxyHostAndPort(conf); String[] parts = proxy.split(":"); params.put(SliderAmIpFilter.PROXY_HOST, parts[0]); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java index ad5e219..aad443e 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/SliderAmIpFilter.java @@ -70,7 +70,7 @@ public class SliderAmIpFilter implements Filter { synchronized(this) { if(proxyAddresses == null || (lastUpdate + updateInterval) >= now) { try { - proxyAddresses = new HashSet<>(); + proxyAddresses = new HashSet<String>(); for(InetAddress add : InetAddress.getAllByName(proxyHost)) { if (log.isDebugEnabled()) { log.debug("proxy address is: " + add.getHostAddress()); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java index 4eebd45..4d595a9 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/WebAppApiImpl.java @@ -126,7 +126,7 @@ public class WebAppApiImpl implements WebAppApi { */ private TreeMap<String, RoleStatus> getRoleStatusesByName(Map<Integer, ProviderRole> rolesById, Map<Integer, RoleStatus> statusById) { - TreeMap<String, RoleStatus> statusByName = new TreeMap<>(); + TreeMap<String, RoleStatus> statusByName = new TreeMap<String, RoleStatus>(); for (Entry<Integer, ProviderRole> role : rolesById.entrySet()) { final RoleStatus status = statusById.get(role.getKey()); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java index a439d9b..5d8b657 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/web/rest/publisher/PublisherResource.java @@ -110,7 +110,7 @@ public class PublisherResource { @Produces({MediaType.APPLICATION_JSON}) public Set<URL> getAMClassPath() { URL[] urls = ((URLClassLoader) getClass().getClassLoader()).getURLs(); - return new LinkedHashSet<>(Arrays.asList(urls)); + return new LinkedHashSet<URL>(Arrays.asList(urls)); } @GET @@ -231,7 +231,7 @@ public class PublisherResource { propertyName, config); throw new NotFoundException("Property not found: " + propertyName); } - Map<String,String> rtnVal = new HashMap<>(); + Map<String, String> rtnVal = new HashMap<String, String>(); rtnVal.put(propertyName, propVal); return rtnVal; http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/avro/RoleHistoryWriter.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/avro/RoleHistoryWriter.java b/slider-core/src/main/java/org/apache/slider/server/avro/RoleHistoryWriter.java index 2120be5..422ffeb 100644 --- a/slider-core/src/main/java/org/apache/slider/server/avro/RoleHistoryWriter.java +++ b/slider-core/src/main/java/org/apache/slider/server/avro/RoleHistoryWriter.java @@ -90,7 +90,7 @@ public class RoleHistoryWriter { throws IOException { try { DatumWriter<RoleHistoryRecord> writer = - new SpecificDatumWriter<>(RoleHistoryRecord.class); + new SpecificDatumWriter<RoleHistoryRecord>(RoleHistoryRecord.class); int roles = history.getRoleSize(); RoleHistoryHeader header = new RoleHistoryHeader(); @@ -184,7 +184,7 @@ public class RoleHistoryWriter { BadConfigException { try { DatumReader<RoleHistoryRecord> reader = - new SpecificDatumReader<>(RoleHistoryRecord.class); + new SpecificDatumReader<RoleHistoryRecord>(RoleHistoryRecord.class); Decoder decoder = DecoderFactory.get().jsonDecoder(RoleHistoryRecord.getClassSchema(), in); @@ -336,7 +336,7 @@ public class RoleHistoryWriter { PathFilter filter = new GlobFilter(SliderKeys.HISTORY_FILENAME_GLOB_PATTERN); FileStatus[] stats = fs.listStatus(dir, filter); - List<Path> paths = new ArrayList<>(stats.length); + List<Path> paths = new ArrayList<Path>(stats.length); for (FileStatus stat : stats) { log.debug("Possible entry: {}", stat.toString()); if (stat.isFile() && (includeEmptyFiles || stat.getLen() > 0)) { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java index 3b2c6d7..a4447e3 100644 --- a/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java +++ b/slider-core/src/main/java/org/apache/slider/server/servicemonitor/MonitorUtils.java @@ -50,7 +50,7 @@ public final class MonitorUtils { * @return a list view with no empty strings */ public static List<String> prepareArgs(String[] args) { - List<String> argsList = new ArrayList<>(args.length); + List<String> argsList = new ArrayList<String>(args.length); StringBuilder argsStr = new StringBuilder("Arguments: ["); for (String arg : args) { argsStr.append('"').append(arg).append("\" "); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java index 14b78a7..b3e2ff2 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/curator/RegistryBinderService.java @@ -54,10 +54,10 @@ public class RegistryBinderService<Payload> extends CuratorService { private final ServiceDiscovery<Payload> discovery; private final Map<String, ServiceInstance<Payload>> entries = - new HashMap<>(); + new HashMap<String, ServiceInstance<Payload>>(); private JsonSerDeser<CuratorServiceInstance<Payload>> deser = - new JsonSerDeser<>(CuratorServiceInstance.class); + new JsonSerDeser<CuratorServiceInstance<Payload>>(CuratorServiceInstance.class); /** * Create an instance @@ -221,7 +221,7 @@ public class RegistryBinderService<Payload> extends CuratorService { try { List<String> instanceIDs = instanceIDs(servicetype); List<CuratorServiceInstance<Payload>> instances = - new ArrayList<>(instanceIDs.size()); + new ArrayList<CuratorServiceInstance<Payload>>(instanceIDs.size()); for (String instanceID : instanceIDs) { CuratorServiceInstance<Payload> instance = queryForInstance(servicetype, instanceID); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/services/registry/RegistryRestResources.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/registry/RegistryRestResources.java b/slider-core/src/main/java/org/apache/slider/server/services/registry/RegistryRestResources.java index 4938adf..e4e8523 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/registry/RegistryRestResources.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/registry/RegistryRestResources.java @@ -100,7 +100,8 @@ public class RegistryRestResources extends DiscoveryResource<ServiceInstanceData try { List<CuratorServiceInstance<ServiceInstanceData>> instances = registry.listInstances(name); - return Response.ok(new CuratorServiceInstances<>(instances)).build(); + return Response.ok( + new CuratorServiceInstances<ServiceInstanceData>(instances)).build(); } catch (Exception e) { log.error("Error during generation of response", e); return Response.serverError().build(); http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/services/registry/SliderRegistryService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/services/registry/SliderRegistryService.java b/slider-core/src/main/java/org/apache/slider/server/services/registry/SliderRegistryService.java index 1904df5..ca4d180 100644 --- a/slider-core/src/main/java/org/apache/slider/server/services/registry/SliderRegistryService.java +++ b/slider-core/src/main/java/org/apache/slider/server/services/registry/SliderRegistryService.java @@ -53,7 +53,7 @@ public class SliderRegistryService IOException { List<CuratorServiceInstance<ServiceInstanceData>> services = listInstances(serviceType); - List<ServiceInstanceData> payloads = new ArrayList<>(services.size()); + List<ServiceInstanceData> payloads = new ArrayList<ServiceInstanceData>(services.size()); for (CuratorServiceInstance<ServiceInstanceData> instance : services) { payloads.add(instance.payload); }
