Skip to content

Commit fb956e9

Browse files
xuwei-kjknack
authored andcommitted
use diamond operator (#628)
diamond operator is Java 7 feature. handlebars already dropped Java 6 #426
1 parent fc4f0f4 commit fb956e9

38 files changed

+88
-88
lines changed

handlebars/src/main/java/com/github/jknack/handlebars/Context.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public Object resolve(final Object context) {
218218

219219
@Override
220220
public Set<Entry<String, Object>> propertySet(final Object context) {
221-
Set<Entry<String, Object>> propertySet = new LinkedHashSet<Map.Entry<String, Object>>();
221+
Set<Entry<String, Object>> propertySet = new LinkedHashSet<>();
222222
for (ValueResolver resolver : resolvers) {
223223
propertySet.addAll(resolver.propertySet(context));
224224
}
@@ -453,7 +453,7 @@ protected Context(final Object model) {
453453
private static Context root(final Object model) {
454454
Context root = new Context(model);
455455
root.extendedContext = new Context(new HashMap<String, Object>());
456-
root.data = new HashMap<String, Object>();
456+
root.data = new HashMap<>();
457457
root.data.put(PARTIALS, new HashMap<String, Template>());
458458
LinkedList<Map<String, Template>> partials = new LinkedList<>();
459459
partials.push(new HashMap<String, Template>());
@@ -738,7 +738,7 @@ public static Context newContext(final Context parent, final Object model) {
738738
*/
739739
public static Context newBlockParamContext(final Context parent, final List<String> names,
740740
final List<Object> values) {
741-
Map<String, Object> hash = new HashMap<String, Object>();
741+
Map<String, Object> hash = new HashMap<>();
742742
for (int i = 0; i < Math.min(values.size(), names.size()); i++) {
743743
hash.put(names.get(i), values.get(i));
744744
}

handlebars/src/main/java/com/github/jknack/handlebars/Handlebars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ public static CharSequence escapeExpression(final CharSequence input) {
310310
private String handlebarsJsFile = "/handlebars-v4.0.4.js";
311311

312312
/** List of formatters. */
313-
private List<Formatter> formatters = new ArrayList<Formatter>();
313+
private List<Formatter> formatters = new ArrayList<>();
314314

315315
/** Default formatter. */
316316
private Formatter.Chain formatter = Formatter.NOOP;

handlebars/src/main/java/com/github/jknack/handlebars/cache/HighConcurrencyTemplateCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private Template cacheGet(final TemplateSource source, final Parser parser) thro
161161
*/
162162
private FutureTask<Pair<TemplateSource, Template>> newTask(final TemplateSource source,
163163
final Parser parser) {
164-
return new FutureTask<Pair<TemplateSource, Template>>(
164+
return new FutureTask<>(
165165
new Callable<Pair<TemplateSource, Template>>() {
166166
@Override
167167
public Pair<TemplateSource, Template> call() throws IOException {

handlebars/src/main/java/com/github/jknack/handlebars/context/FieldValueResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ protected Object invokeMember(final FieldWrapper field, final Object context) {
221221

222222
@Override
223223
protected Set<FieldWrapper> members(final Class<?> clazz) {
224-
Set<FieldWrapper> members = new LinkedHashSet<FieldWrapper>();
224+
Set<FieldWrapper> members = new LinkedHashSet<>();
225225
if (clazz.isArray()) {
226226
members.add(ArrayLengthMember.LENGTH);
227227
} else {

handlebars/src/main/java/com/github/jknack/handlebars/context/MemberValueResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public Set<Entry<String, Object>> propertySet(final Object context) {
163163
return Collections.emptySet();
164164
}
165165
Collection<M> members = cache(context.getClass()).values();
166-
Map<String, Object> propertySet = new LinkedHashMap<String, Object>();
166+
Map<String, Object> propertySet = new LinkedHashMap<>();
167167
for (M member : members) {
168168
String name = memberName(member);
169169
propertySet.put(name, resolve(context, name));

handlebars/src/main/java/com/github/jknack/handlebars/context/MethodValueResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected Object invokeMember(final Method member, final Object context) {
6868

6969
@Override
7070
protected Set<Method> members(final Class<?> clazz) {
71-
Set<Method> members = new LinkedHashSet<Method>();
71+
Set<Method> members = new LinkedHashSet<>();
7272
members(clazz, members);
7373
return members;
7474
}

handlebars/src/main/java/com/github/jknack/handlebars/helper/BlockHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public Object apply(final Object context, final Options options)
8181
template = options.fn;
8282
}
8383
// Get hash from current block and merge partial hash (if any).
84-
Map<String, Object> hash = new LinkedHashMap<String, Object>(options.hash);
84+
Map<String, Object> hash = new LinkedHashMap<>(options.hash);
8585
Map<String, Object> partialHash = options.data(Context.PARTIALS + "#" + context + "#hash");
8686
if (partialHash != null) {
8787
hash.putAll(partialHash);

handlebars/src/main/java/com/github/jknack/handlebars/helper/DefaultHelperRegistry.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public class DefaultHelperRegistry implements HelperRegistry {
5959
/**
6060
* The helper registry.
6161
*/
62-
private final Map<String, Helper<?>> helpers = new HashMap<String, Helper<?>>();
62+
private final Map<String, Helper<?>> helpers = new HashMap<>();
6363

6464
/** Decorators. */
6565
private final Map<String, Decorator> decorators = new HashMap<>();
@@ -191,7 +191,7 @@ public Set<Entry<String, Helper<?>>> helpers() {
191191
*/
192192
private void registerDynamicHelper(final Object source, final Class<?> clazz) {
193193
if (clazz != Object.class) {
194-
Set<String> overloaded = new HashSet<String>();
194+
Set<String> overloaded = new HashSet<>();
195195
// Keep backing up the inheritance hierarchy.
196196
Method[] methods = clazz.getDeclaredMethods();
197197
for (Method method : methods) {

handlebars/src/main/java/com/github/jknack/handlebars/helper/I18nHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public DefI18nSource(final Charset charset, final String baseName, final Locale
410410
@Override
411411
public String[] keys(final String basename, final Locale locale) {
412412
Enumeration<String> keys = bundle.getKeys();
413-
List<String> result = new ArrayList<String>();
413+
List<String> result = new ArrayList<>();
414414
while (keys.hasMoreElements()) {
415415
String key = keys.nextElement();
416416
result.add(key);

handlebars/src/main/java/com/github/jknack/handlebars/internal/BaseTemplate.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,11 +342,11 @@ public Object invoke(final Object proxy, final Method method, final Object[] met
342342
@Override
343343
public List<String> collect(final TagType... tagType) {
344344
isTrue(tagType.length > 0, "At least one tag type is required.");
345-
Set<String> tagNames = new LinkedHashSet<String>();
345+
Set<String> tagNames = new LinkedHashSet<>();
346346
for (TagType tt : tagType) {
347347
collect(tagNames, tt);
348348
}
349-
return new ArrayList<String>(tagNames);
349+
return new ArrayList<>(tagNames);
350350
}
351351

352352
/**
@@ -361,9 +361,9 @@ protected void collect(final Collection<String> result, final TagType tagType) {
361361

362362
@Override
363363
public List<String> collectReferenceParameters() {
364-
Set<String> paramNames = new LinkedHashSet<String>();
364+
Set<String> paramNames = new LinkedHashSet<>();
365365
collectReferenceParameters(paramNames);
366-
return new ArrayList<String>(paramNames);
366+
return new ArrayList<>(paramNames);
367367
}
368368

369369
/**

0 commit comments

Comments
 (0)