瀏覽代碼

Clean Code

xuxueli 7 年之前
父節點
當前提交
1970f7f3b8

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java 查看文件

1
 package com.xxl.job.admin.controller.resolver;
1
 package com.xxl.job.admin.controller.resolver;
2
 
2
 
3
-import com.xxl.job.admin.core.util.JacksonUtil;
4
 import com.xxl.job.core.biz.model.ReturnT;
3
 import com.xxl.job.core.biz.model.ReturnT;
4
+import com.xxl.job.core.util.JacksonUtil;
5
 import org.slf4j.Logger;
5
 import org.slf4j.Logger;
6
 import org.slf4j.LoggerFactory;
6
 import org.slf4j.LoggerFactory;
7
 import org.springframework.web.bind.annotation.ResponseBody;
7
 import org.springframework.web.bind.annotation.ResponseBody;

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoConcurrentJobBean.java 查看文件

21
 //		try {
21
 //		try {
22
 //			TimeUnit.SECONDS.sleep(10);
22
 //			TimeUnit.SECONDS.sleep(10);
23
 //		} catch (InterruptedException e) {
23
 //		} catch (InterruptedException e) {
24
-//			e.printStackTrace();
24
+//			logger.error(e.getMessage(), e);
25
 //		}
25
 //		}
26
 //		
26
 //		
27
 //		return false;
27
 //		return false;

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/impl/DemoNomalJobBean.java 查看文件

23
 //		try {
23
 //		try {
24
 //			TimeUnit.SECONDS.sleep(10);
24
 //			TimeUnit.SECONDS.sleep(10);
25
 //		} catch (InterruptedException e) {
25
 //		} catch (InterruptedException e) {
26
-//			e.printStackTrace();
26
+//			logger.error(e.getMessage(), e);
27
 //		}
27
 //		}
28
 //		
28
 //		
29
 //		return false;
29
 //		return false;

+ 2 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/schedule/XxlJobDynamicScheduler.java 查看文件

143
 			}
143
 			}
144
 			
144
 			
145
 		} catch (SchedulerException e) {
145
 		} catch (SchedulerException e) {
146
-			e.printStackTrace();
146
+			logger.error(e.getMessage(), e);
147
 		}
147
 		}
148
 	}
148
 	}
149
 	
149
 	
377
             }
377
             }
378
 
378
 
379
         } catch (SchedulerException e) {
379
         } catch (SchedulerException e) {
380
-            e.printStackTrace();
380
+            logger.error(e.getMessage(), e);
381
             return null;
381
             return null;
382
         }
382
         }
383
         return jobList;
383
         return jobList;

+ 0 - 93
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java 查看文件

1
-package com.xxl.job.admin.core.util;
2
-
3
-
4
-import org.codehaus.jackson.JsonGenerationException;
5
-import org.codehaus.jackson.JsonParseException;
6
-import org.codehaus.jackson.map.JsonMappingException;
7
-import org.codehaus.jackson.map.ObjectMapper;
8
-import org.codehaus.jackson.type.TypeReference;
9
-
10
-import java.io.IOException;
11
-import java.util.HashMap;
12
-import java.util.Map;
13
-
14
-/**
15
- * Jackson util
16
- * 
17
- * 1、obj need private and set/get;
18
- * 2、do not support inner class;
19
- * 
20
- * @author xuxueli 2015-9-25 18:02:56
21
- */
22
-public class JacksonUtil {
23
-    private final static ObjectMapper objectMapper = new ObjectMapper();
24
-    public static ObjectMapper getInstance() {
25
-        return objectMapper;
26
-    }
27
-
28
-    /**
29
-     * bean、array、List、Map --> json
30
-     * 
31
-     * @param obj
32
-     * @return json string
33
-     * @throws Exception
34
-     */
35
-    public static String writeValueAsString(Object obj) {
36
-    	try {
37
-			return getInstance().writeValueAsString(obj);
38
-		} catch (JsonGenerationException e) {
39
-			e.printStackTrace();
40
-		} catch (JsonMappingException e) {
41
-			e.printStackTrace();
42
-		} catch (IOException e) {
43
-			e.printStackTrace();
44
-		}
45
-        return null;
46
-    }
47
-
48
-    /**
49
-     * string --> bean、Map、List(array)
50
-     * 
51
-     * @param jsonStr
52
-     * @param clazz
53
-     * @return obj
54
-     * @throws Exception
55
-     */
56
-    public static <T> T readValue(String jsonStr, Class<T> clazz) {
57
-    	try {
58
-			return getInstance().readValue(jsonStr, clazz);
59
-		} catch (JsonParseException e) {
60
-			e.printStackTrace();
61
-		} catch (JsonMappingException e) {
62
-			e.printStackTrace();
63
-		} catch (IOException e) {
64
-			e.printStackTrace();
65
-		}
66
-    	return null;
67
-    }
68
-    public static <T> T readValueRefer(String jsonStr, Class<T> clazz) {
69
-    	try {
70
-			return getInstance().readValue(jsonStr, new TypeReference<T>() { });
71
-		} catch (JsonParseException e) {
72
-			e.printStackTrace();
73
-		} catch (JsonMappingException e) {
74
-			e.printStackTrace();
75
-		} catch (IOException e) {
76
-			e.printStackTrace();
77
-		}
78
-    	return null;
79
-    }
80
-
81
-    public static void main(String[] args) {
82
-		try {
83
-			Map<String, String> map = new HashMap<String, String>();
84
-			map.put("aaa", "111");
85
-			map.put("bbb", "222");
86
-			String json = writeValueAsString(map);
87
-			System.out.println(json);
88
-			System.out.println(readValue(json, Map.class));
89
-		} catch (Exception e) {
90
-			e.printStackTrace();
91
-		}
92
-	}
93
-}

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/MailUtil.java 查看文件

147
 			mailSender.send(mimeMessage);
147
 			mailSender.send(mimeMessage);
148
 			return true;
148
 			return true;
149
 		} catch (Exception e) {
149
 		} catch (Exception e) {
150
-			e.printStackTrace();
150
+			logger.error(e.getMessage(), e);
151
 		}
151
 		}
152
 		return false;
152
 		return false;
153
 	}
153
 	}

+ 4 - 4
xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java 查看文件

226
 			xxlJobLogGlueDao.deleteByJobId(id);
226
 			xxlJobLogGlueDao.deleteByJobId(id);
227
 			return ReturnT.SUCCESS;
227
 			return ReturnT.SUCCESS;
228
 		} catch (SchedulerException e) {
228
 		} catch (SchedulerException e) {
229
-			e.printStackTrace();
229
+			logger.error(e.getMessage(), e);
230
 		}
230
 		}
231
 		return ReturnT.FAIL;
231
 		return ReturnT.FAIL;
232
 	}
232
 	}
241
             boolean ret = XxlJobDynamicScheduler.pauseJob(name, group);	// jobStatus do not store
241
             boolean ret = XxlJobDynamicScheduler.pauseJob(name, group);	// jobStatus do not store
242
             return ret?ReturnT.SUCCESS:ReturnT.FAIL;
242
             return ret?ReturnT.SUCCESS:ReturnT.FAIL;
243
 		} catch (SchedulerException e) {
243
 		} catch (SchedulerException e) {
244
-			e.printStackTrace();
244
+			logger.error(e.getMessage(), e);
245
 			return ReturnT.FAIL;
245
 			return ReturnT.FAIL;
246
 		}
246
 		}
247
 	}
247
 	}
256
 			boolean ret = XxlJobDynamicScheduler.resumeJob(name, group);
256
 			boolean ret = XxlJobDynamicScheduler.resumeJob(name, group);
257
 			return ret?ReturnT.SUCCESS:ReturnT.FAIL;
257
 			return ret?ReturnT.SUCCESS:ReturnT.FAIL;
258
 		} catch (SchedulerException e) {
258
 		} catch (SchedulerException e) {
259
-			e.printStackTrace();
259
+			logger.error(e.getMessage(), e);
260
 			return ReturnT.FAIL;
260
 			return ReturnT.FAIL;
261
 		}
261
 		}
262
 	}
262
 	}
271
 			XxlJobDynamicScheduler.triggerJob(name, group);
271
 			XxlJobDynamicScheduler.triggerJob(name, group);
272
 			return ReturnT.SUCCESS;
272
 			return ReturnT.SUCCESS;
273
 		} catch (SchedulerException e) {
273
 		} catch (SchedulerException e) {
274
-			e.printStackTrace();
274
+			logger.error(e.getMessage(), e);
275
 			return ReturnT.FAIL;
275
 			return ReturnT.FAIL;
276
 		}
276
 		}
277
 	}
277
 	}

+ 1 - 1
xxl-job-admin/src/test/java/com/xxl/job/dao/impl/AdminBizTest.java 查看文件

43
         AdminBiz adminBiz = (AdminBiz) new NetComClientProxy(AdminBiz.class, addressUrl, accessToken).getObject();
43
         AdminBiz adminBiz = (AdminBiz) new NetComClientProxy(AdminBiz.class, addressUrl, accessToken).getObject();
44
 
44
 
45
         int jobId = 1;
45
         int jobId = 1;
46
-        ReturnT<String> returnT = adminBiz.triggerJob(1);
46
+        ReturnT<String> returnT = adminBiz.triggerJob(jobId);
47
         Assert.assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE);
47
         Assert.assertTrue(returnT.getCode() == ReturnT.SUCCESS_CODE);
48
     }
48
     }
49
 
49
 

+ 2 - 2
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueFactory.java 查看文件

75
 				try {
75
 				try {
76
 					field.set(instance, fieldBean);
76
 					field.set(instance, fieldBean);
77
 				} catch (IllegalArgumentException e) {
77
 				} catch (IllegalArgumentException e) {
78
-					e.printStackTrace();
78
+					logger.error(e.getMessage(), e);
79
 				} catch (IllegalAccessException e) {
79
 				} catch (IllegalAccessException e) {
80
-					e.printStackTrace();
80
+					logger.error(e.getMessage(), e);
81
 				}
81
 				}
82
 			}
82
 			}
83
 		}
83
 		}

+ 2 - 2
xxl-job-core/src/main/java/com/xxl/job/core/log/XxlJobFileAppender.java 查看文件

174
 				return sb.toString();
174
 				return sb.toString();
175
 			}
175
 			}
176
 		} catch (IOException e) {
176
 		} catch (IOException e) {
177
-			e.printStackTrace();
177
+			logger.error(e.getMessage(), e);
178
 		} finally {
178
 		} finally {
179
 			if (reader != null) {
179
 			if (reader != null) {
180
 				try {
180
 				try {
181
 					reader.close();
181
 					reader.close();
182
 				} catch (IOException e) {
182
 				} catch (IOException e) {
183
-					e.printStackTrace();
183
+					logger.error(e.getMessage(), e);
184
 				}
184
 				}
185
 			}
185
 			}
186
 		}
186
 		}

+ 2 - 2
xxl-job-core/src/main/java/com/xxl/job/core/util/HttpClientUtil.java 查看文件

71
 			try {
71
 			try {
72
 				httpClient.close();
72
 				httpClient.close();
73
 			} catch (IOException e) {
73
 			} catch (IOException e) {
74
-				e.printStackTrace();
74
+				logger.error(e.getMessage(), e);
75
 			}
75
 			}
76
 		}
76
 		}
77
 		return responseBytes;
77
 		return responseBytes;
101
 				}
101
 				}
102
 				return message;
102
 				return message;
103
 			} catch (IOException e) {
103
 			} catch (IOException e) {
104
-				e.printStackTrace();
104
+				logger.error(e.getMessage(), e);
105
 				throw e;
105
 				throw e;
106
 			}
106
 			}
107
 		}
107
 		}

+ 14 - 10
xxl-job-core/src/main/java/com/xxl/job/core/util/JacksonUtil.java 查看文件

6
 import org.codehaus.jackson.map.JsonMappingException;
6
 import org.codehaus.jackson.map.JsonMappingException;
7
 import org.codehaus.jackson.map.ObjectMapper;
7
 import org.codehaus.jackson.map.ObjectMapper;
8
 import org.codehaus.jackson.type.TypeReference;
8
 import org.codehaus.jackson.type.TypeReference;
9
+import org.slf4j.Logger;
10
+import org.slf4j.LoggerFactory;
9
 
11
 
10
 import java.io.IOException;
12
 import java.io.IOException;
11
 import java.util.HashMap;
13
 import java.util.HashMap;
20
  * @author xuxueli 2015-9-25 18:02:56
22
  * @author xuxueli 2015-9-25 18:02:56
21
  */
23
  */
22
 public class JacksonUtil {
24
 public class JacksonUtil {
25
+	private static Logger logger = LoggerFactory.getLogger(JacksonUtil.class);
26
+
23
     private final static ObjectMapper objectMapper = new ObjectMapper();
27
     private final static ObjectMapper objectMapper = new ObjectMapper();
24
     public static ObjectMapper getInstance() {
28
     public static ObjectMapper getInstance() {
25
         return objectMapper;
29
         return objectMapper;
36
     	try {
40
     	try {
37
 			return getInstance().writeValueAsString(obj);
41
 			return getInstance().writeValueAsString(obj);
38
 		} catch (JsonGenerationException e) {
42
 		} catch (JsonGenerationException e) {
39
-			e.printStackTrace();
43
+			logger.error(e.getMessage(), e);
40
 		} catch (JsonMappingException e) {
44
 		} catch (JsonMappingException e) {
41
-			e.printStackTrace();
45
+			logger.error(e.getMessage(), e);
42
 		} catch (IOException e) {
46
 		} catch (IOException e) {
43
-			e.printStackTrace();
47
+			logger.error(e.getMessage(), e);
44
 		}
48
 		}
45
         return null;
49
         return null;
46
     }
50
     }
57
     	try {
61
     	try {
58
 			return getInstance().readValue(jsonStr, clazz);
62
 			return getInstance().readValue(jsonStr, clazz);
59
 		} catch (JsonParseException e) {
63
 		} catch (JsonParseException e) {
60
-			e.printStackTrace();
64
+			logger.error(e.getMessage(), e);
61
 		} catch (JsonMappingException e) {
65
 		} catch (JsonMappingException e) {
62
-			e.printStackTrace();
66
+			logger.error(e.getMessage(), e);
63
 		} catch (IOException e) {
67
 		} catch (IOException e) {
64
-			e.printStackTrace();
68
+			logger.error(e.getMessage(), e);
65
 		}
69
 		}
66
     	return null;
70
     	return null;
67
     }
71
     }
69
     	try {
73
     	try {
70
 			return getInstance().readValue(jsonStr, new TypeReference<T>() { });
74
 			return getInstance().readValue(jsonStr, new TypeReference<T>() { });
71
 		} catch (JsonParseException e) {
75
 		} catch (JsonParseException e) {
72
-			e.printStackTrace();
76
+			logger.error(e.getMessage(), e);
73
 		} catch (JsonMappingException e) {
77
 		} catch (JsonMappingException e) {
74
-			e.printStackTrace();
78
+			logger.error(e.getMessage(), e);
75
 		} catch (IOException e) {
79
 		} catch (IOException e) {
76
-			e.printStackTrace();
80
+			logger.error(e.getMessage(), e);
77
 		}
81
 		}
78
     	return null;
82
     	return null;
79
     }
83
     }
87
 			System.out.println(json);
91
 			System.out.println(json);
88
 			System.out.println(readValue(json, Map.class));
92
 			System.out.println(readValue(json, Map.class));
89
 		} catch (Exception e) {
93
 		} catch (Exception e) {
90
-			e.printStackTrace();
94
+			logger.error(e.getMessage(), e);
91
 		}
95
 		}
92
 	}
96
 	}
93
 }
97
 }