Unverified Commit da7b5315 authored by samz406's avatar samz406 Committed by GitHub
Browse files

Merge pull request #8 from apache/dev 

update
parents d1e7a796 c2f4b65a

README.md

+2 −1
Original line number Diff line number Diff line 
Dolphin Scheduler

Dolphin Scheduler Official Website

[dolphinscheduler.apache.org](https://dolphinscheduler.apache.org)

============

[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)

[![Total Lines](https://tokei.rs/b1/github/apache/Incubator-DolphinScheduler?category=lines)](https://github.com/apache/Incubator-DolphinScheduler)

README_zh_CN.md

+3 −2
Original line number Diff line number Diff line 
Dolphin Scheduler

Dolphin Scheduler Official Website

[dolphinscheduler.apache.org](https://dolphinscheduler.apache.org)

============

[![License](https://img.shields.io/badge/license-Apache%202-4EB1BA.svg)](https://www.apache.org/licenses/LICENSE-2.0.html)

[![Total Lines](https://tokei.rs/b1/github/apache/Incubator-DolphinScheduler?category=lines)](https://github.com/apache/Incubator-DolphinScheduler)
@@ -88,7 +89,7 @@ Dolphin Scheduler使用了很多优秀的开源项目，比如google的guava、g 


### 获得帮助

1. Submit an issue

1. Mail list: dev@dolphinscheduler.apache.org. Mail to dev-subscribe@dolphinscheduler.apache.org, follow the reply to subscribe the mail list.

1. Mail to dev-subscribe@dolphinscheduler.apache.org, follow the reply to subscribe the mail list. then you can send mail to dev@dolphinscheduler.apache.org.

1. Contact WeChat group manager, ID 510570367. This is for Mandarin(CN) discussion.



### 版权

dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/ExcelUtils.java

+3 −6
Original line number Diff line number Diff line
@@ -41,12 +41,9 @@ public class ExcelUtils { 
     */

    public static void genExcelFile(String content,String title,String xlsFilePath){

        List<LinkedHashMap> itemsList;

        try {



        //The JSONUtils.toList has been try catch ex

        itemsList = JSONUtils.toList(content, LinkedHashMap.class);

        }catch (Exception e){

            logger.error(String.format("json format incorrect : %s",content),e);

            throw new RuntimeException("json format incorrect",e);

        }



        if (itemsList == null || itemsList.size() == 0){

            logger.error("itemsList is null");

dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/ExcelUtilsTest.java

0 → 100644
+92 −0
Original line number Diff line number Diff line 
/*

 * Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *    http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package org.apache.dolphinscheduler.alert.utils;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.rules.ExpectedException;

import org.junit.rules.TemporaryFolder;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import java.io.File;

import static org.junit.Assert.assertTrue;



public class ExcelUtilsTest {



    private static final Logger logger = LoggerFactory.getLogger(ExcelUtilsTest.class);



    @Rule

    public ExpectedException expectedException = ExpectedException.none();



    @Rule

    public TemporaryFolder folder = new TemporaryFolder();



    private String rootPath = null;



    @Before

    public void setUp() throws Exception {



        folder.create();

        rootPath = folder.getRoot().getAbsolutePath();

    }



    @After

    public void tearDown() throws Exception {



        folder.delete();

    }



    /**

     * Test GenExcelFile

     */

    @Test

    public void testGenExcelFile() {



        //Define dest file path

        String xlsFilePath = rootPath + System.getProperty("file.separator");

        logger.info("xlsFilePath: "+xlsFilePath);



        //Define correctContent

        String correctContent = "[{\"name\":\"ds name\",\"value\":\"ds value\"}]";



        //Define incorrectContent

        String incorrectContent1 = "{\"name\":\"ds name\",\"value\":\"ds value\"}";



        //Define title

        String title = "test report";



        //Invoke genExcelFile with correctContent

        ExcelUtils.genExcelFile(correctContent, title, xlsFilePath);



        //Test file exists

        File xlsFile = new File(xlsFilePath + Constants.SINGLE_SLASH + title + Constants.EXCEL_SUFFIX_XLS);

        assertTrue(xlsFile.exists());



        //Expected RuntimeException

        expectedException.expect(RuntimeException.class);



        //Expected error message

        expectedException.expectMessage("itemsList is null");



        //Invoke genExcelFile with incorrectContent, will cause RuntimeException

        ExcelUtils.genExcelFile(incorrectContent1, title, xlsFilePath);



    }

}
 
 No newline at end of file

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ public final class Constants { 
    /**

     * default master commit retry interval

     */

    public static final int defaultMasterCommitRetryInterval = 100;

    public static final int defaultMasterCommitRetryInterval = 3000;



    /**

     * time unit secong to minutes