Merge pull request #299 from FlowCI/develop

Develop

Author: yunheli

docker/app-api.properties

@@ -16,6 +16,8 @@ hibernate.hbm2ddl.auto = validate
 api.workspace = ${HOME}/flow-ci/workspace
 api.git.cache = ${HOME}/flow-ci/git-cache
 api.git.workspace = ${HOME}/flow-ci/git-repos
+api.local_file_resource.workspace = ${HOME}/flow-ci/local_file_resources
+
 api.zone.default = default
 
 ### expiration duration of token, it's in millisecond ###

platform-api/src/main/java/com/flow/platform/api/config/WebConfig.java

@@ -16,6 +16,8 @@
 
 package com.flow.platform.api.config;
 
+import com.flow.platform.api.multipart.FlowMultipartMatcher;
+import com.flow.platform.api.multipart.FlowMultipartResolver;
 import com.flow.platform.api.resource.PropertyResourceLoader;
 import com.flow.platform.api.security.AuthenticationInterceptor;
 import com.flow.platform.api.security.OptionsInterceptor;
@@ -47,7 +49,6 @@
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.web.multipart.MultipartResolver;
-import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -76,6 +77,8 @@ public class WebConfig extends WebMvcConfigurerAdapter {
 
     private final static int MAX_UPLOAD_SIZE = 2 * 1024 * 1024;
 
+    private final static int LOCAL_FILE_RESOURCE_MAX_UPLOAD_SIZE = 500 * 1024 * 1024;
+
     private final RawGsonMessageConverter jsonConverter =
         new RawGsonMessageConverter(true, GSON_CONFIG_FOR_RESPONSE, Jsonable.GSON_CONFIG);
 
@@ -100,8 +103,12 @@ public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer
 
     @Bean(name = "multipartResolver")
     public MultipartResolver multipartResolver() throws IOException {
-        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
-        resolver.setMaxUploadSize(MAX_UPLOAD_SIZE);
+        List<FlowMultipartMatcher> matchers = ImmutableList.of(
+            new FlowMultipartMatcher("/credentials", MAX_UPLOAD_SIZE),
+            new FlowMultipartMatcher("/local_file_resources", LOCAL_FILE_RESOURCE_MAX_UPLOAD_SIZE)
+        );
+
+        FlowMultipartResolver resolver = new FlowMultipartResolver(matchers);
         return resolver;
     }
 

platform-api/src/main/java/com/flow/platform/api/controller/ArtifactController.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed 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 com.flow.platform.api.controller;
+
+import com.flow.platform.api.domain.Artifact;
+import com.flow.platform.api.service.ArtifactService;
+import java.math.BigInteger;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author yh@firim
+ */
+@RestController
+@RequestMapping(path = "/artifacts")
+public class ArtifactController {
+
+    @Autowired
+    private ArtifactService artifactService;
+
+    @PostMapping
+    public Artifact create(@RequestBody Artifact artifact){
+        return artifactService.create(artifact);
+    }
+
+    @GetMapping
+    public List<Artifact> index(@RequestParam BigInteger jobId) {
+        return artifactService.list(jobId);
+    }
+
+}

platform-api/src/main/java/com/flow/platform/api/controller/JobController.java

@@ -16,18 +16,22 @@
 
 package com.flow.platform.api.controller;
 
+import com.flow.platform.api.domain.Artifact;
 import com.flow.platform.api.domain.SearchCondition;
 import com.flow.platform.api.domain.job.Job;
 import com.flow.platform.api.domain.job.JobCategory;
 import com.flow.platform.api.domain.job.NodeResult;
 import com.flow.platform.api.domain.permission.Actions;
 import com.flow.platform.api.domain.user.User;
 import com.flow.platform.api.security.WebSecurity;
+import com.flow.platform.api.service.ArtifactService;
 import com.flow.platform.api.service.LogService;
 import com.flow.platform.api.service.job.JobSearchService;
 import com.flow.platform.api.service.job.JobService;
 import com.flow.platform.api.service.job.NodeResultService;
 import com.flow.platform.api.util.I18nUtil;
+import com.flow.platform.core.domain.Page;
+import com.flow.platform.core.domain.Pageable;
 import com.flow.platform.core.exception.NotFoundException;
 import com.flow.platform.util.Logger;
 import com.flow.platform.util.StringUtil;
@@ -69,6 +73,9 @@ public class JobController extends NodeController {
     @Autowired
     private LogService logService;
 
+    @Autowired
+    private ArtifactService artifactService;
+
     @Autowired
     private ThreadLocal<User> currentUser;
 
@@ -143,6 +150,52 @@ public List<Job> index(@RequestParam Map<String, String> allParams, SearchCondit
         return searchService.search(condition, paths);
     }
 
+    /**
+     * @api {get} /jobs/limit/:root List
+     * @apiParam {String} [root] flow node path, return all jobs if not presented
+     * @apiParam {String} [keyword] search keyword
+     * @apiParam {String} [branch] search branch
+     * @apiParam {String} [category] git event type
+     * @apiParam {String} [creator] creator
+     * @apiParam {int} [number] number
+     * @apiParam {int} [size] size
+     * @apiGroup Jobs
+     * @apiDescription Get jobs by node path or list all jobs use page
+     *
+     * @apiSuccessExample {json} Success-Response
+     *  {
+     *      content:[
+     *                  {
+     *                      Job response json see Create response
+     *                  },
+     *                  {
+     *                      ...
+     *                  }
+     *              ],
+     *
+     *      totalSize:11,
+     *      pageNumber:1,
+     *      pageSize:5,
+     *      pageCount:3
+     *  }
+     *
+     */
+    @GetMapping(path = "/limit/{root}")
+    @WebSecurity(action = Actions.JOB_SHOW)
+    public Page<Job> limitIndex(SearchCondition searchCondition, Pageable pageable) {
+        String path = currentNodePath.get();
+
+        List<String> paths = null;
+        if (path != null) {
+            paths = Lists.newArrayList(path);
+        }
+
+        if (Pageable.isEmpty(pageable)) {
+            pageable = Pageable.DEFAULT;
+        }
+        return searchService.search(searchCondition, paths, pageable);
+    }
+
     /**
      * @api {get} /jobs/:root/:buildNumber Show
      * @apiParam {String} root flow node path
@@ -347,4 +400,9 @@ public Resource jobLog(@PathVariable Long buildNumber,
         return logService.findJobLog(path, buildNumber);
     }
 
+    @GetMapping(path = "/{root}/{buildNumber}/artifacts")
+    public List<Artifact> artifacts(@PathVariable Long buildNumber) {
+        return artifactService.list(currentNodePath.get(), buildNumber);
+    }
+
 }

platform-api/src/main/java/com/flow/platform/api/controller/LocalFileResourceController.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed 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 com.flow.platform.api.controller;
+
+import com.flow.platform.api.domain.LocalFileResource;
+import com.flow.platform.api.service.LocalFileResourceService;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author yh@firim
+ */
+@RestController
+@RequestMapping(path = "/local_file_resources")
+public class LocalFileResourceController {
+
+    @Autowired
+    private LocalFileResourceService localFileResourceService;
+
+    @PostMapping
+    public LocalFileResource post(@RequestPart(name = "file") MultipartFile file) {
+        return localFileResourceService.create(file);
+    }
+
+    @GetMapping(path = "/{id}")
+    public Resource get(@PathVariable String id, HttpServletResponse httpResponse) {
+
+        LocalFileResource storage = localFileResourceService.get(id);
+        httpResponse.setHeader(
+            "Content-Disposition",
+            String.format("attachment; filename=%s", storage.getName()));
+        return localFileResourceService.getResource(id);
+    }
+}

platform-api/src/main/java/com/flow/platform/api/dao/ArtifactDao.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed 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 com.flow.platform.api.dao;
+
+import com.flow.platform.api.domain.Artifact;
+import com.flow.platform.core.dao.BaseDao;
+import java.math.BigInteger;
+import java.util.List;
+
+/**
+ * @author yh@firim
+ */
+public interface ArtifactDao extends BaseDao<Integer, Artifact> {
+
+    List<Artifact> list(BigInteger jobId);
+
+}

platform-api/src/main/java/com/flow/platform/api/dao/ArtifactDaoImpl.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed 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 com.flow.platform.api.dao;
+
+import com.flow.platform.api.domain.Artifact;
+import com.flow.platform.core.dao.AbstractBaseDao;
+import java.math.BigInteger;
+import java.util.List;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author yh@firim
+ */
+@Repository
+public class ArtifactDaoImpl extends AbstractBaseDao<Integer, Artifact> implements ArtifactDao {
+
+    @Override
+    protected Class<Artifact> getEntityClass() {
+        return Artifact.class;
+    }
+
+    @Override
+    protected String getKeyName() {
+        return "id";
+    }
+
+    @Override
+    public List<Artifact> list(BigInteger jobId) {
+        return execute(session -> session
+            .createQuery("from Artifact where jobId = :id", getEntityClass())
+            .setParameter("id", jobId)
+            .list());
+    }
+
+}

platform-api/src/main/java/com/flow/platform/api/dao/CredentialDao.java

@@ -35,4 +35,5 @@ public interface CredentialDao extends BaseDao<String, Credential> {
      * List credential by types
      */
     List<Credential> listByType(Collection<CredentialType> types);
+
 }

platform-api/src/main/java/com/flow/platform/api/dao/CredentialDaoImpl.java

@@ -58,5 +58,6 @@ public List<Credential> listByType(Collection<CredentialType> types) {
             .setParameterList("types", types)
             .list());
     }
+
 }
 

platform-api/src/main/java/com/flow/platform/api/dao/FlowDao.java

@@ -32,4 +32,5 @@ public interface FlowDao extends BaseDao<String, Node> {
      * List flow path by created by email
      */
     List<String> pathList(Collection<String> createdBy);
+
 }