Polishing

spring-expression/src/test/java/org/springframework/expression/spel/MapAccessTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,11 @@
 
 package org.springframework.expression.spel;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
+
 import org.springframework.expression.AccessException;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
@@ -32,6 +30,8 @@ import org.springframework.expression.TypedValue;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
+import static org.junit.Assert.*;
+
 /**
  * Testing variations on map access.
  *
@@ -73,64 +73,60 @@ public class MapAccessTests extends ExpressionTestCase {
 
 	@Test
 	public void testGetValue(){
-
-		Map props1= new HashMap<String,String>();
+		Map<String,String> props1 = new HashMap<String,String>();
 		props1.put("key1", "value1");
 		props1.put("key2", "value2");
 		props1.put("key3", "value3");
 
-
-		Object bean = new TestBean("name1",new TestBean("name2",null,"Description 2",15,props1),"description 1", 6,props1);
+		Object bean = new TestBean("name1", new TestBean("name2", null, "Description 2", 15, props1), "description 1", 6, props1);
 
 		ExpressionParser parser = new SpelExpressionParser();
 		Expression exp = parser.parseExpression("testBean.properties['key2']");
 		String key = (String) exp.getValue(bean);
 		assertNotNull(key);
-
 	}
 
-	public static class TestBean
-	{
+
+	public static class TestBean {
+
 		private String name;
 		private TestBean testBean;
 		private String description;
 		private Integer priority;
-		private Map properties;
+		private Map<String, String> properties;
 
-
-		public TestBean() {
-			super();
-		}
-
-		public TestBean(String name, TestBean testBean, String description,Integer priority,Map props) {
-			super();
+		public TestBean(String name, TestBean testBean, String description, Integer priority, Map<String, String> props) {
 			this.name = name;
 			this.testBean = testBean;
 			this.description = description;
-			this.priority=priority;
-			this.properties=props;
+			this.priority = priority;
+			this.properties = props;
 		}
 
 		public String getName() {
 			return name;
 		}
+
 		public void setName(String name) {
 			this.name = name;
 		}
+
 		public TestBean getTestBean() {
 			return testBean;
 		}
+
 		public void setTestBean(TestBean testBean) {
 			this.testBean = testBean;
 		}
+
 		public String getDescription() {
 			return description;
 		}
+
 		public void setDescription(String description) {
 			this.description = description;
 		}
 
-
 		public Integer getPriority() {
 			return priority;
 		}
@@ -168,16 +164,14 @@ public class MapAccessTests extends ExpressionTestCase {
 
 		@Override
 		@SuppressWarnings("unchecked")
-		public void write(EvaluationContext context, Object target, String name, Object newValue)
-				throws AccessException {
+		public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
 			((Map) target).put(name, newValue);
 		}
 
 		@Override
 		public Class<?>[] getSpecificTargetClasses() {
-			return new Class[] { Map.class };
+			return new Class<?>[] {Map.class};
 		}
-
 	}
 
 }