[update] update testUserListMix method of ControllerTest and reformat…

… the repository
jdk8 · Aug 24, 2016 · 2d51317 · 2d51317
1 parent cf8c096
commit 2d51317
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 29 deletions.
diff --git a/pom.xml b/pom.xml
@@ -266,7 +266,6 @@
                 <version>1.4.9</version>
             </dependency>
 
-
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/spring-aop/pom.xml b/spring-aop/pom.xml
@@ -38,7 +38,7 @@
             <artifactId>spring-aspects</artifactId>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-instrument</artifactId>
         </dependency>

diff --git a/spring-aop/src/main/java/com/brianway/learning/spring/aop/aspectj/advanced/TestAspect.java b/spring-aop/src/main/java/com/brianway/learning/spring/aop/aspectj/advanced/TestAspect.java
@@ -1,10 +1,6 @@
 package com.brianway.learning.spring.aop.aspectj.advanced;
 
-import com.brianway.learning.spring.aop.aspectj.Monitorable;
-import com.brianway.learning.spring.aop.aspectj.Waiter;
 import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.After;
-import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;

diff --git a/spring-aop/src/main/java/com/brianway/learning/spring/aop/aspectj/function/TestAspect.java b/spring-aop/src/main/java/com/brianway/learning/spring/aop/aspectj/function/TestAspect.java
@@ -2,7 +2,6 @@
 
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
 
 @Aspect
 public class TestAspect {

diff --git a/spring-aop/src/main/java/com/brianway/learning/spring/aop/instrument/Transformer.java b/spring-aop/src/main/java/com/brianway/learning/spring/aop/instrument/Transformer.java
@@ -10,7 +10,7 @@
 public class Transformer implements ClassFileTransformer {
     public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer)
             throws IllegalClassFormatException {
-        System.out.println("Hello "+className+"!");
+        System.out.println("Hello " + className + "!");
         return null;
     }
 }
diff --git a/spring-mvc/src/main/java/com/brianway/learning/spring/mvc/web/UserListPdfView.java b/spring-mvc/src/main/java/com/brianway/learning/spring/mvc/web/UserListPdfView.java
@@ -5,11 +5,9 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.Element;
 import com.lowagie.text.Font;
-import static com.lowagie.text.FontFactory.TIMES_ROMAN;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.Table;
 import com.lowagie.text.pdf.BaseFont;
-
 import com.lowagie.text.pdf.PdfWriter;
 import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.web.servlet.view.document.AbstractPdfView;

diff --git a/spring-mvc/src/main/resources/conf/applicationContext.xml b/spring-mvc/src/main/resources/conf/applicationContext.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:p="http://www.springframework.org/schema/p"
-       xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-    http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
+	http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
 </beans>
diff --git a/spring-mvc/src/main/webapp/WEB-INF/views/success.jsp b/spring-mvc/src/main/webapp/WEB-INF/views/success.jsp
@@ -1,10 +1,10 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <html>
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>操作成功</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>操作成功</title>
 </head>
 <body>
-     操作成功！
+操作成功！
 </body>
 </html>
diff --git a/spring-mvc/src/main/webapp/WEB-INF/views/user/registerUserValidator.jsp b/spring-mvc/src/main/webapp/WEB-INF/views/user/registerUserValidator.jsp
@@ -15,9 +15,11 @@
 <body>
 <spring:bind path="user.*">
     <c:forEach var="error" items="${status.errorMessages}">
-        <B><CSS color=RED>
-            <BR><c:out value="${error}"/>
-        </CSS></B>
+        <B>
+            <CSS color=RED>
+                <BR><c:out value="${error}"/>
+            </CSS>
+        </B>
     </c:forEach>
 </spring:bind>
 

diff --git a/spring-mvc/src/test/java/com/brianway/learning/spring/mvc/web/UserControllerTest.java b/spring-mvc/src/test/java/com/brianway/learning/spring/mvc/web/UserControllerTest.java
@@ -100,23 +100,20 @@ public void testUserListMix() {
         String url = URL_PREFIX + "userListMix";
         RestTemplate restTemplate = new RestTemplate();
 
+        //默认使用jsp
         String responseJsp = restTemplate.getForObject(url, String.class);
         Assert.assertNotNull(responseJsp);
         System.out.println(responseJsp);
 
+        //根据请求参数"format"
         String responseJson = restTemplate.getForObject(url + "?format=json", String.class);
-        String responseJson2 = restTemplate.getForObject(url + ".json", String.class);
         Assert.assertNotNull(responseJson);
-        Assert.assertNotNull(responseJson2);
         System.out.println(responseJson);
-        System.out.println(responseJson2);
 
-        String responseXml = restTemplate.getForObject(url + "?format=xml", String.class);
-        String responseXml2 = restTemplate.getForObject(url + ".xml", String.class);
+        //根据文件拓展名
+        String responseXml = restTemplate.getForObject(url + ".xml", String.class);
         Assert.assertNotNull(responseXml);
-        Assert.assertNotNull(responseXml2);
         System.out.println(responseXml);
-        System.out.println(responseXml2);
     }
 
 }