Skip to content
This repository was archived by the owner on Aug 1, 2025. It is now read-only.

Commit 7309c14

Browse files
nickpalladinonickpalladino
authored
Merge pull request #7 from Breeding-Insight/release/0.7
Release/0.7
2 parents 7a9381f + e6226c3 commit 7309c14

File tree

468 files changed

+22529
-16223
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

468 files changed

+22529
-16223
lines changed

‎.github/workflows/docker-build.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Docker Build
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
- release/**
8+
- brapi-server-v2
9+
10+
workflow_dispatch:
11+
12+
jobs:
13+
docker:
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- name: Extract branch name
20+
shell: bash
21+
run: echo ::set-output name=branch::$(echo ${GITHUB_REF#refs/heads/})
22+
id: extract_branch
23+
24+
- run: git pull origin ${{steps.extract_branch.outputs.branch}}
25+
26+
- name: Set up JDK 8
27+
uses: actions/setup-java@v1.4.3
28+
with:
29+
java-version: 8
30+
31+
- name: Build with Maven
32+
run: mvn clean install
33+
34+
- name: Set up Docker Buildx
35+
uses: docker/setup-buildx-action@v2
36+
- name: Set up QEMU
37+
uses: docker/setup-qemu-action@v2
38+
with:
39+
platforms: 'arm64,arm,amd64,amd'
40+
41+
- name: Login to Docker Hub
42+
uses: docker/login-action@v1
43+
with:
44+
username: ${{ secrets.DOCKERHUB_USERNAME }}
45+
password: ${{ secrets.DOCKERHUB_PASSWORD }}
46+
- name: Set tag
47+
id: vars
48+
run: echo ::set-output name=imageName::$(echo breedinginsight/brapi-java-server:${{ github.run_number }})
49+
50+
- name: Tag develop
51+
if: steps.extract_branch.outputs.branch == 'develop'
52+
run: echo "streamName=breedinginsight/brapi-java-server:develop" >> $GITHUB_ENV
53+
- name: Tag release candidate
54+
if: contains(github.ref, '/release/')
55+
run: echo "streamName=breedinginsight/brapi-java-server:rc" >> $GITHUB_ENV
56+
- name: Tag latest
57+
if: steps.extract_branch.outputs.branch == 'brapi-server-v2'
58+
run: echo "streamName=breedinginsight/brapi-java-server:latest" >> $GITHUB_ENV
59+
60+
- name: Build Docker and push image
61+
run: |
62+
docker buildx build . --file Dockerfile --tag ${{steps.vars.outputs.imageName}} --tag ${{env.streamName}} --push --platform=linux/arm64,linux/amd64

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# run container (dev): `docker run --name=brapi-test-server --network=bridge -p 8081:8081 -d brapicoordinatorselby/brapi-java-server`
33
# run container (prod): `docker run --name=brapi-test-server --restart always --network=brapi_net -d brapicoordinatorselby/brapi-java-server`
44

5-
FROM nimmis/java-centos:oracle-8-jre
5+
FROM adoptopenjdk/openjdk8
66

77
EXPOSE 8080
88

‎pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<properties>
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<java.version>1.8</java.version>
18-
<spring.version>2.0.0.M5</spring.version>
18+
<spring.version>2.5.12</spring.version>
1919
<maven.compiler.source>1.8</maven.compiler.source>
2020
<maven.compiler.target>1.8</maven.compiler.target>
2121
<springfox-version>2.8.0</springfox-version>
@@ -25,7 +25,12 @@
2525
<dependency>
2626
<groupId>org.postgresql</groupId>
2727
<artifactId>postgresql</artifactId>
28-
<version>42.1.4</version>
28+
<version>42.3.3</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>jakarta.validation</groupId>
32+
<artifactId>jakarta.validation-api</artifactId>
33+
<version>3.0.2</version>
2934
</dependency>
3035
<dependency>
3136
<groupId>org.springframework.boot</groupId>
@@ -106,7 +111,7 @@
106111
<version>3.14.0</version>
107112
</dependency>
108113
</dependencies>
109-
114+
110115
<build>
111116
<plugins>
112117
<plugin>

‎src/main/java/io/swagger/api/core/CommonCropNamesApi.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.swagger.api.core;
77

88
import io.swagger.model.core.CommonCropNamesResponse;
9+
import jakarta.validation.Valid;
910
import io.swagger.annotations.*;
1011

1112
import org.brapi.test.BrAPITestServer.exceptions.BrAPIServerException;
@@ -15,7 +16,6 @@
1516
import org.springframework.web.bind.annotation.RequestMethod;
1617
import org.springframework.web.bind.annotation.RequestParam;
1718

18-
import javax.validation.Valid;
1919

2020
@javax.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2020-03-20T16:31:52.030Z[GMT]")
2121
@Api(value = "commoncropnames", description = "the commoncropnames API")

‎src/main/java/io/swagger/api/core/ListsApi.java‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import io.swagger.model.core.ListNewRequest;
1111
import io.swagger.model.core.ListResponse;
1212
import io.swagger.model.core.ListSearchRequest;
13-
import io.swagger.model.core.ListTypes;
1413
import io.swagger.model.core.ListsListResponse;
1514
import io.swagger.model.core.ListsSingleResponse;
1615
import io.swagger.annotations.*;
@@ -24,7 +23,7 @@
2423
import org.springframework.web.bind.annotation.RequestMethod;
2524
import org.springframework.web.bind.annotation.RequestParam;
2625

27-
import javax.validation.Valid;
26+
import jakarta.validation.Valid;
2827

2928
import java.util.ArrayList;
3029
import java.util.List;
@@ -41,14 +40,17 @@ public interface ListsApi {
4140
@ApiResponse(code = 403, message = "Forbidden", response = String.class) })
4241
@RequestMapping(value = "/lists", produces = { "application/json" }, method = RequestMethod.GET)
4342
ResponseEntity<ListsListResponse> listsGet(
44-
@ApiParam(value = "The type of objects contained by this generic list") @Valid @RequestParam(value = "listType", required = false) String listType,
45-
@ApiParam(value = "The human readable name of this generic list") @Valid @RequestParam(value = "listName", required = false) String listName,
46-
@ApiParam(value = "The unique ID of this generic list") @Valid @RequestParam(value = "listDbId", required = false) String listDbId,
47-
@ApiParam(value = "The source tag of this generic list") @Valid @RequestParam(value = "listSource", required = false) String listSource,
48-
@ApiParam(value = "Search for Germplasm by an external reference") @Valid @RequestParam(value = "externalReferenceID", required = false) String externalReferenceID,
49-
@ApiParam(value = "Search for Germplasm by an external reference") @Valid @RequestParam(value = "externalReferenceSource", required = false) String externalReferenceSource,
50-
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
51-
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
43+
@ApiParam(value = "listType") @Valid @RequestParam(value = "listType", required = false) String listType,
44+
@ApiParam(value = "listName") @Valid @RequestParam(value = "listName", required = false) String listName,
45+
@ApiParam(value = "listDbId") @Valid @RequestParam(value = "listDbId", required = false) String listDbId,
46+
@ApiParam(value = "listSource") @Valid @RequestParam(value = "listSource", required = false) String listSource,
47+
@ApiParam(value = "programDbId") @Valid @RequestParam(value = "programDbId", required = false) String programDbId,
48+
@ApiParam(value = "commonCropName") @Valid @RequestParam(value = "commonCropName", required = false) String commonCropName,
49+
@ApiParam(value = "externalReferenceId") @Valid @RequestParam(value = "externalReferenceId", required = false) String externalReferenceId,
50+
@ApiParam(value = "externalReferenceID") @Valid @RequestParam(value = "externalReferenceID", required = false) String externalReferenceID,
51+
@ApiParam(value = "externalReferenceSource") @Valid @RequestParam(value = "externalReferenceSource", required = false) String externalReferenceSource,
52+
@ApiParam(value = "page") @Valid @RequestParam(value = "page", required = false) Integer page,
53+
@ApiParam(value = "pageSize") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
5254
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
5355
throws BrAPIServerException;
5456

@@ -80,6 +82,21 @@ ResponseEntity<ListResponse> listsListDbIdItemsPost(
8082
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
8183
throws BrAPIServerException;
8284

85+
@ApiOperation(value = "Add Items to a specific List", nickname = "listsListDbIdItemsPost", notes = "Add new data to a specific generic lists", response = ListResponse.class, authorizations = {
86+
@Authorization(value = "AuthorizationToken") }, tags = { "Lists", })
87+
@ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = ListResponse.class),
88+
@ApiResponse(code = 400, message = "Bad Request", response = String.class),
89+
@ApiResponse(code = 401, message = "Unauthorized", response = String.class),
90+
@ApiResponse(code = 403, message = "Forbidden", response = String.class),
91+
@ApiResponse(code = 404, message = "Not Found", response = String.class) })
92+
@RequestMapping(value = "/lists/{listDbId}/data", produces = { "application/json" }, consumes = {
93+
"application/json" }, method = RequestMethod.POST)
94+
ResponseEntity<ListResponse> listsListDbIdDataPost(
95+
@ApiParam(value = "The unique ID of this generic list", required = true) @PathVariable("listDbId") String listDbId,
96+
@ApiParam(value = "") @Valid @RequestBody ArrayList<String> body,
97+
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization)
98+
throws BrAPIServerException;
99+
83100
@ApiOperation(value = "Update an existing generic list", nickname = "listsListDbIdPut", notes = "Update an existing generic list", response = ListsSingleResponse.class, authorizations = {
84101
@Authorization(value = "AuthorizationToken") }, tags = { "Lists", })
85102
@ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = ListsSingleResponse.class),
@@ -130,8 +147,8 @@ ResponseEntity<? extends BrAPIResponse> searchListsPost(@ApiParam(value = "") @V
130147
"application/json" }, method = RequestMethod.GET)
131148
ResponseEntity<? extends BrAPIResponse> searchListsSearchResultsDbIdGet(
132149
@ApiParam(value = "Permanent unique identifier which references the search results", required = true) @PathVariable("searchResultsDbId") String searchResultsDbId,
133-
@ApiParam(value = "Used to request a specific page of data to be returned. The page indexing starts at 0 (the first page is 'page'= 0). Default is `0`.") @Valid @RequestParam(value = "page", required = false) Integer page,
134-
@ApiParam(value = "The size of the pages to be returned. Default is `1000`.") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
150+
@ApiParam(value = "page") @Valid @RequestParam(value = "page", required = false) Integer page,
151+
@ApiParam(value = "pageSize") @Valid @RequestParam(value = "pageSize", required = false) Integer pageSize,
135152
@ApiParam(value = "HTTP HEADER - Token used for Authorization <strong> Bearer {token_string} </strong>") @RequestHeader(value = "Authorization", required = false) String authorization) throws BrAPIServerException;
136153

137154
}

0 commit comments

Comments
 (0)