有人说不支持JDK6了，然后我就妥协降级了；有人说一堆bean配置在一起不好区分，然后我又妥协进行了拆分

henryyan · Dec 10, 2015 · 49c28a8 · 49c28a8
1 parent 9e6125a
commit 49c28a8
Show file tree

Hide file tree

Showing 18 changed files with 338 additions and 492 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>me.kafeitu.demo</groupId>
     <artifactId>kft-activiti-demo</artifactId>
-    <version>1.14.1</version>
+    <version>1.14.2</version>
     <packaging>war</packaging>
     <name>Activiti demo</name>
     <description>activiti demo for version 5.17+</description>
@@ -21,7 +21,7 @@
 
     <!-- 项目属性 -->
     <properties>
-        <jdk.version>1.7</jdk.version>
+        <jdk.version>1.6</jdk.version>
         <spring.version>4.1.5.RELEASE</spring.version>
         <hibernate.version>4.2.5.Final</hibernate.version>
         <spring-data-jpa.version>1.9.1.RELEASE</spring-data-jpa.version>

diff --git a/src/main/java/me/kafeitu/demo/activiti/web/management/DatabaseController.java b/src/main/java/me/kafeitu/demo/activiti/web/management/DatabaseController.java
@@ -36,11 +36,11 @@ public ModelAndView index(@RequestParam(value = "tableName", required = false) S
 
         // 读取表
         Map<String, Long> tableCount = managementService.getTableCount();
-        List<String> keys = new ArrayList<>();
+        List<String> keys = new ArrayList<String>();
         keys.addAll(tableCount.keySet());
         Collections.sort(keys);
 
-        TreeMap<String, Long> sortedTableCount = new TreeMap<>();
+        TreeMap<String, Long> sortedTableCount = new TreeMap<String, Long>();
 
         for (String key : keys) {
             sortedTableCount.put(key, tableCount.get(key));
@@ -52,7 +52,7 @@ public ModelAndView index(@RequestParam(value = "tableName", required = false) S
         if (StringUtils.isNotBlank(tableName)) {
             TableMetaData tableMetaData = managementService.getTableMetaData(tableName);
             mav.addObject("tableMetaData", tableMetaData);
-            Page<Map<String, Object>> page = new Page<>(10);
+            Page<Map<String, Object>> page = new Page<Map<String, Object>>(10);
             int[] pageParams = PageUtil.init(page, request);
             TablePage tablePages = managementService.createTablePageQuery().tableName(tableName).listPage(pageParams[0], pageParams[1]);
 

diff --git a/src/main/java/me/kafeitu/demo/activiti/web/management/JobController.java b/src/main/java/me/kafeitu/demo/activiti/web/management/JobController.java
@@ -51,7 +51,7 @@ public ModelAndView jobList(HttpServletRequest request) {
         ModelAndView mav = new ModelAndView("management/job-list");
         JobQuery jobQuery = managementService.createJobQuery();
 
-        Page<Job> page = new Page<>(PageUtil.PAGE_SIZE);
+        Page<Job> page = new Page<Job>(PageUtil.PAGE_SIZE);
         int[] pageParams = PageUtil.init(page, request);
         List<Job> jobList = jobQuery.listPage(pageParams[0], pageParams[1]);
 

diff --git a/src/main/java/me/kafeitu/demo/activiti/web/workflow/ModelController.java b/src/main/java/me/kafeitu/demo/activiti/web/workflow/ModelController.java
@@ -112,8 +112,9 @@ public String deploy(@PathVariable("modelId") String modelId, RedirectAttributes
 
     /**
      * 导出model对象为指定类型
+     *
      * @param modelId 模型ID
-     * @param type 导出文件类型(bpmn\json)
+     * @param type    导出文件类型(bpmn\json)
      */
     @RequestMapping(value = "export/{modelId}/{type}")
     public void export(@PathVariable("modelId") String modelId,
@@ -140,22 +141,17 @@ public void export(@PathVariable("modelId") String modelId,
 
             String mainProcessId = bpmnModel.getMainProcess().getId();
 
-            switch (type) {
-                case "bpmn": {
+            if (type.equals("bpmn")) {
 
-                    BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
-                    exportBytes = xmlConverter.convertToXML(bpmnModel);
+                BpmnXMLConverter xmlConverter = new BpmnXMLConverter();
+                exportBytes = xmlConverter.convertToXML(bpmnModel);
 
-                    filename = mainProcessId + ".bpmn20.xml";
-                    break;
-                }
+                filename = mainProcessId + ".bpmn20.xml";
+            } else if (type.equals("json")) {
 
-                case "json": {
+                exportBytes = modelEditorSource;
+                filename = mainProcessId + ".json";
 
-                    exportBytes = modelEditorSource;
-                    filename = mainProcessId + ".json";
-
-                }
             }
 
             ByteArrayInputStream in = new ByteArrayInputStream(exportBytes);

diff --git a/src/main/java/org/activiti/conf/RestConfiguration.java b/src/main/java/org/activiti/conf/RestConfiguration.java
diff --git a/src/main/java/org/activiti/conf/SecurityConfiguration.java b/src/main/java/org/activiti/conf/SecurityConfiguration.java
@@ -14,21 +14,20 @@
 @EnableWebSecurity
 @EnableWebMvcSecurity
 public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
-
-  @Bean
-  public AuthenticationProvider authenticationProvider() {
-    return new BasicAuthenticationProvider();
-  }
 
-  @Override
-  protected void configure(HttpSecurity http) throws Exception {
-  	 http
-     .authenticationProvider(authenticationProvider())
-     .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-     .csrf().disable()
-     .authorizeRequests()
-       .anyRequest().authenticated()
-       .and()
-     .httpBasic();
-  }
+    @Bean
+    public AuthenticationProvider authenticationProvider() {
+        return new BasicAuthenticationProvider();
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.authenticationProvider(authenticationProvider())
+            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
+            .csrf().disable()
+            .authorizeRequests()
+            .anyRequest().authenticated()
+            .and()
+            .httpBasic();
+    }
 }
diff --git a/src/main/java/org/activiti/explorer/DispatcherServletConfiguration.java b/src/main/java/org/activiti/explorer/DispatcherServletConfiguration.java
@@ -24,52 +24,52 @@
 @EnableAsync
 public class DispatcherServletConfiguration extends WebMvcConfigurationSupport {
 
-  private final Logger log = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
+    private final Logger log = LoggerFactory.getLogger(DispatcherServletConfiguration.class);
 
-  @Autowired
-  private ObjectMapper objectMapper;
-
-  @Autowired
-  private Environment environment;
+    @Autowired
+    private ObjectMapper objectMapper;
 
-  @Bean
-  public SessionLocaleResolver localeResolver() {
-    return new SessionLocaleResolver();
-  }
+    @Autowired
+    private Environment environment;
 
-  @Bean
-  public LocaleChangeInterceptor localeChangeInterceptor() {
-    log.debug("Configuring localeChangeInterceptor");
-    LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor();
-    localeChangeInterceptor.setParamName("language");
-    return localeChangeInterceptor;
-  }
+    @Bean
+    public SessionLocaleResolver localeResolver() {
+        return new SessionLocaleResolver();
+    }
+
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        log.debug("Configuring localeChangeInterceptor");
+        LocaleChangeInterceptor localeChangeInterceptor = new LocaleChangeInterceptor();
+        localeChangeInterceptor.setParamName("language");
+        return localeChangeInterceptor;
+    }
+
+    @Bean
+    public RequestMappingHandlerMapping requestMappingHandlerMapping() {
+        log.debug("Creating requestMappingHandlerMapping");
+        RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
+        requestMappingHandlerMapping.setUseSuffixPatternMatch(false);
+        Object[] interceptors = {localeChangeInterceptor()};
+        requestMappingHandlerMapping.setInterceptors(interceptors);
+        return requestMappingHandlerMapping;
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        addDefaultHttpMessageConverters(converters);
+        for (HttpMessageConverter<?> converter : converters) {
+            if (converter instanceof MappingJackson2HttpMessageConverter) {
+                MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = (MappingJackson2HttpMessageConverter) converter;
+                jackson2HttpMessageConverter.setObjectMapper(objectMapper);
+                break;
+            }
+        }
+    }
 
-  @Bean
-  public RequestMappingHandlerMapping requestMappingHandlerMapping() {
-    log.debug("Creating requestMappingHandlerMapping");
-    RequestMappingHandlerMapping requestMappingHandlerMapping = new RequestMappingHandlerMapping();
-    requestMappingHandlerMapping.setUseSuffixPatternMatch(false);
-    Object[] interceptors = {localeChangeInterceptor()};
-    requestMappingHandlerMapping.setInterceptors(interceptors);
-    return requestMappingHandlerMapping;
-  }
-
-  @Override
-  public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-    addDefaultHttpMessageConverters(converters);
-    for (HttpMessageConverter<?> converter: converters) {
-      if (converter instanceof MappingJackson2HttpMessageConverter) {
-        MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = (MappingJackson2HttpMessageConverter) converter;
-        jackson2HttpMessageConverter.setObjectMapper(objectMapper);
-        break;
-      }
+    @Override
+    protected void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
+        configurer.favorPathExtension(false);
     }
-  }
 
-  @Override
-  protected void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-    configurer.favorPathExtension(false);
-  }
-
 }
diff --git a/src/main/java/org/activiti/explorer/FilterServletOutputStream.java b/src/main/java/org/activiti/explorer/FilterServletOutputStream.java
@@ -3,38 +3,37 @@
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.WriteListener;
 
 public class FilterServletOutputStream extends ServletOutputStream {
 
-  private DataOutputStream stream;
-  private WriteListener writeListener;
-
-  public FilterServletOutputStream(OutputStream output) {
-    stream = new DataOutputStream(output);
-  }
-
-  public void write(int b) throws IOException {
-    stream.write(b);
-  }
-
-  public void write(byte[] b) throws IOException {
-    stream.write(b);
-  }
-
-  public void write(byte[] b, int off, int len) throws IOException {
-    stream.write(b, off, len);
-  }
-  
-  @Override
-  public void setWriteListener(WriteListener writeListener) {
-    this.writeListener =  writeListener;
-  }
-
-  @Override
-  public boolean isReady() {
-    return true;
-  }
+    private DataOutputStream stream;
+    private WriteListener writeListener;
+
+    public FilterServletOutputStream(OutputStream output) {
+        stream = new DataOutputStream(output);
+    }
+
+    public void write(int b) throws IOException {
+        stream.write(b);
+    }
+
+    public void write(byte[] b) throws IOException {
+        stream.write(b);
+    }
+
+    public void write(byte[] b, int off, int len) throws IOException {
+        stream.write(b, off, len);
+    }
+
+    @Override
+    public void setWriteListener(WriteListener writeListener) {
+        this.writeListener = writeListener;
+    }
+
+    @Override
+    public boolean isReady() {
+        return true;
+    }
 }