diff --git a/.idea/dcaa-mcs.iml b/.idea/dcaa-mcs.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/dcaa-mcs.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..2944b11 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..a084827 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..6174578 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {} + { + "isMigrated": true +} + { + "associatedIndex": 1 +} + + + + + + + { + "keyToString": { + "ASKED_ADD_EXTERNAL_FILES": "true", + "Docker.docker-compose.yml: Compose Deployment.executor": "Run", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "main", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "D:/java/dcaa-mcs/minio", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" + } +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1727644373447 + + + + + + + + + + + \ No newline at end of file diff --git a/dcaa/src/main/java/com/spring/dcaa/controller/VisitorController.java b/dcaa/src/main/java/com/spring/dcaa/controller/VisitorController.java index 4dd2d68..88e7ff8 100644 --- a/dcaa/src/main/java/com/spring/dcaa/controller/VisitorController.java +++ b/dcaa/src/main/java/com/spring/dcaa/controller/VisitorController.java @@ -7,7 +7,10 @@ import jakarta.persistence.EntityNotFoundException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -15,12 +18,11 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.client.RestTemplate; -import java.util.List; - @RestController @RequiredArgsConstructor @RequestMapping("/visitors") @@ -28,50 +30,63 @@ import java.util.List; public class VisitorController { private final VisitorRepository visitorRepository; private final RestTemplate restTemplate; + public static final String CORRELATION_ID = "correlation-id"; @GetMapping("/report") - public Object externalReport() { - log.info("Fetching report from external service"); + public ResponseEntity externalReport(@RequestHeader(value = CORRELATION_ID) String correlationId) { + String info = String.format("Fetching report from external service | correlation-id: %s | endpoint: /visitors/report | method: GET", correlationId); + log.info(info); + HttpHeaders headers = setHeaders(correlationId); String externalServiceUrl = "http://report:8082/visitors"; ResponseEntity response = restTemplate.exchange( externalServiceUrl, HttpMethod.GET, - null, - new ParameterizedTypeReference<>() { - } + new HttpEntity<>(headers), + new ParameterizedTypeReference<>() {} ); - return response.getBody(); + return new ResponseEntity<>(response.getBody(), headers, HttpStatus.OK); } @GetMapping - public ReportDto report() { - log.info("report"); - return visitorRepository.generateReport(); + public ResponseEntity report(@RequestHeader(CORRELATION_ID) String correlationId) { + String info = String.format("Report generated | correlation-id: %s | endpoint: /visitors | method: GET", correlationId); + log.info(info); + return new ResponseEntity<>(visitorRepository.generateReport(), setHeaders(correlationId), HttpStatus.OK); } @PostMapping - public Long add(@RequestBody Visitor visitor) { - log.info("add"); - return visitorRepository.save(visitor).getId(); + public ResponseEntity add(@RequestBody Visitor visitor, @RequestHeader(CORRELATION_ID) String correlationId) { + String info = String.format("Adding visitor | correlation-id: %s | endpoint: /visitors | method: POST", correlationId); + log.info(info); + return new ResponseEntity<>(visitorRepository.save(visitor).getId(), setHeaders(correlationId), HttpStatus.OK); } @PutMapping("/{id}") - public Long edit(@RequestBody Visitor visitor, @PathVariable Long id) { - log.info("edit"); + public ResponseEntity edit(@RequestBody Visitor visitor, @PathVariable Long id, @RequestHeader(CORRELATION_ID) String correlationId) { + String info = String.format("Editing visitor | correlation-id: %s | endpoint: /visitors/%s | method: PUT", correlationId, id); + log.info(info); Visitor visitorDb = visitorRepository.findById(id) .orElseThrow(() -> new EntityNotFoundException("Visitor with id " + id + " not found")); visitorDb.setName(visitor.getName()); visitorDb.setSurname(visitor.getSurname()); visitorDb.setPatronymic(visitor.getPatronymic()); visitorDb.setHasDisk(visitor.getHasDisk()); - return visitorRepository.save(visitorDb).getId(); + return new ResponseEntity<>(visitorRepository.save(visitorDb).getId(), setHeaders(correlationId), HttpStatus.OK); } @DeleteMapping("/{id}") - public void delete(@PathVariable Long id) { - log.info("delete"); + public ResponseEntity delete(@PathVariable Long id, @RequestHeader(CORRELATION_ID) String correlationId) { + String info = String.format("Deleting visitor | correlation-id: %s | endpoint: /visitors/%s | method: DELETE", correlationId, id); + log.info(info); Visitor visitorDb = visitorRepository.findById(id) .orElseThrow(() -> new EntityNotFoundException("Visitor with id " + id + " not found")); visitorRepository.delete(visitorDb); + return new ResponseEntity<>(setHeaders(correlationId), HttpStatus.OK); + } + + private HttpHeaders setHeaders(String info) { + HttpHeaders headers = new HttpHeaders(); + headers.set(CORRELATION_ID, info); + return headers; } } diff --git a/docker-compose.yml b/docker-compose.yml index de101ab..9b6b0e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,41 @@ services: backend: aliases: - "rental" + minio: + container_name: minio + image: minio/minio:latest + command: server --console-address ":9001" /data + depends_on: + - report + ports: + - "9000:9000" + - "9001:9001" + environment: + MINIO_ROOT_USER: role_for_spring + MINIO_ROOT_PASSWORD: ${DB_MINIO_PASSWORD} + volumes: + - /mnt/data:/data + - /mnt/config:/root/.minio + networks: + backend: + aliases: + - "minio" + myminio: + container_name: myminio + build: ./minio + image: myminio + depends_on: + - minio + ports: + - "8081:8081" + networks: + backend: + aliases: + - "myminio" networks: backend: driver: bridge + +volumes: + minio-storage: diff --git a/gateway/pom.xml b/gateway/pom.xml index 0872b4f..647b587 100644 --- a/gateway/pom.xml +++ b/gateway/pom.xml @@ -35,6 +35,11 @@ org.springframework.cloud spring-cloud-starter-gateway + + org.projectlombok + lombok + true + org.springframework.boot @@ -59,6 +64,14 @@ org.springframework.boot spring-boot-maven-plugin + + + + org.projectlombok + lombok + + + diff --git a/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPostFilter.java b/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPostFilter.java new file mode 100644 index 0000000..65d0f1f --- /dev/null +++ b/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPostFilter.java @@ -0,0 +1,48 @@ +package com.spring.gateway.filter; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.http.HttpHeaders; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.Objects; + +import static com.spring.gateway.filter.FilterOrderType.POST; + +@Component +@Slf4j +public class CorrelationTrackingPostFilter implements GlobalFilter, Ordered { + public static final String CORRELATION_ID = "correlation-id"; + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + HttpHeaders headers = exchange.getRequest().getHeaders(); + String correlationId = getCorrelationId(headers); + log.info("Injecting correlation id: {}", correlationId); + + ServerHttpRequest request = exchange.getRequest() + .mutate() + .header(CORRELATION_ID, correlationId) + .build(); + + ServerWebExchange newExchange = exchange.mutate().request(request).build(); + + return chain.filter(newExchange) + .doFinally(signalType -> log.info("Response status code: {}", + newExchange.getResponse().getStatusCode())); + } + + @Override + public int getOrder() { + return POST.getValue(); + } + + private String getCorrelationId(HttpHeaders headers) { + return Objects.requireNonNull(headers.getFirst(CORRELATION_ID)); + } +} diff --git a/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPreFilter.java b/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPreFilter.java new file mode 100644 index 0000000..aca84f8 --- /dev/null +++ b/gateway/src/main/java/com/spring/gateway/filter/CorrelationTrackingPreFilter.java @@ -0,0 +1,46 @@ +package com.spring.gateway.filter; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.http.HttpHeaders; +import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; +import reactor.core.publisher.Mono; + +import java.util.UUID; + +import static com.spring.gateway.filter.CorrelationTrackingPostFilter.CORRELATION_ID; +import static com.spring.gateway.filter.FilterOrderType.PRE; + +@Component +@Slf4j +public class CorrelationTrackingPreFilter implements GlobalFilter, Ordered { + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + log.info("Tracking filter invoked..."); + ServerHttpRequest request = exchange.getRequest(); + HttpHeaders headers = request.getHeaders(); + + if (headers.containsKey(CORRELATION_ID)) { + log.info("Tracked request with correlation id: {}", headers.get(CORRELATION_ID)); + } else { + String newCorrelationId = UUID.randomUUID().toString(); + request = exchange.getRequest() + .mutate() + .header(CORRELATION_ID, newCorrelationId) + .build(); + log.info("Generated new correlation id: {}", newCorrelationId); + } + + ServerWebExchange newExchange = exchange.mutate().request(request).build(); + return chain.filter(newExchange); + } + + @Override + public int getOrder() { + return PRE.getValue(); + } +} diff --git a/gateway/src/main/java/com/spring/gateway/filter/FilterOrderType.java b/gateway/src/main/java/com/spring/gateway/filter/FilterOrderType.java new file mode 100644 index 0000000..2f068ce --- /dev/null +++ b/gateway/src/main/java/com/spring/gateway/filter/FilterOrderType.java @@ -0,0 +1,13 @@ +package com.spring.gateway.filter; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum FilterOrderType { + PRE(-1), + POST(0), + ROUTE(1); + private final int value; +} diff --git a/minio/.gitignore b/minio/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/minio/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/minio/.idea/compiler.xml b/minio/.idea/compiler.xml new file mode 100644 index 0000000..cac1e99 --- /dev/null +++ b/minio/.idea/compiler.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/minio/.idea/encodings.xml b/minio/.idea/encodings.xml new file mode 100644 index 0000000..fb2603c --- /dev/null +++ b/minio/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/minio/.idea/jarRepositories.xml b/minio/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/minio/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/minio/.idea/minio.iml b/minio/.idea/minio.iml new file mode 100644 index 0000000..b69fb81 --- /dev/null +++ b/minio/.idea/minio.iml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/minio/.idea/misc.xml b/minio/.idea/misc.xml new file mode 100644 index 0000000..305ed65 --- /dev/null +++ b/minio/.idea/misc.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/minio/.idea/modules.xml b/minio/.idea/modules.xml new file mode 100644 index 0000000..dd60e95 --- /dev/null +++ b/minio/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/minio/.idea/vcs.xml b/minio/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/minio/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/minio/.idea/workspace.xml b/minio/.idea/workspace.xml new file mode 100644 index 0000000..28a861e --- /dev/null +++ b/minio/.idea/workspace.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { + "associatedIndex": 2 +} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1729199501784 + + + + + + \ No newline at end of file diff --git a/minio/.mvn/wrapper/maven-wrapper.properties b/minio/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..fe9deed --- /dev/null +++ b/minio/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,20 @@ +# 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. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +distributionSha256Sum=4ec3f26fb1a692473aea0235c300bd20f0f9fe741947c82c1234cefd76ac3a3c diff --git a/minio/Dockerfile b/minio/Dockerfile new file mode 100644 index 0000000..c569341 --- /dev/null +++ b/minio/Dockerfile @@ -0,0 +1,4 @@ +FROM bellsoft/liberica-openjdk-alpine:17.0.8 +ADD target/minio-0.0.1-SNAPSHOT.jar /app/ +CMD ["java", "-Xmx200m", "-jar", "/app/minio-0.0.1-SNAPSHOT.jar"] +EXPOSE 8081 \ No newline at end of file diff --git a/minio/mvnw b/minio/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/minio/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/minio/mvnw.cmd b/minio/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/minio/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/minio/pom.xml b/minio/pom.xml new file mode 100644 index 0000000..2436ce0 --- /dev/null +++ b/minio/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + + com.spring + minio + 0.0.1-SNAPSHOT + minio + Minio project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + + io.minio + minio + 8.5.4 + + + + commons-io + commons-io + 2.13.0 + + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/minio/src/main/java/com/spring/minio/MinioApplication.java b/minio/src/main/java/com/spring/minio/MinioApplication.java new file mode 100644 index 0000000..6f81d1c --- /dev/null +++ b/minio/src/main/java/com/spring/minio/MinioApplication.java @@ -0,0 +1,13 @@ +package com.spring.minio; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MinioApplication { + + public static void main(String[] args) { + SpringApplication.run(MinioApplication.class, args); + } + +} diff --git a/minio/src/main/java/com/spring/minio/config/MinioAdapter.java b/minio/src/main/java/com/spring/minio/config/MinioAdapter.java new file mode 100644 index 0000000..5f1a9f2 --- /dev/null +++ b/minio/src/main/java/com/spring/minio/config/MinioAdapter.java @@ -0,0 +1,74 @@ +package com.spring.minio.config; + +import io.minio.BucketExistsArgs; +import io.minio.GetObjectArgs; +import io.minio.MakeBucketArgs; +import io.minio.MinioClient; +import io.minio.PutObjectArgs; +import io.minio.errors.ErrorResponseException; +import io.minio.errors.InsufficientDataException; +import io.minio.errors.InternalException; +import io.minio.errors.InvalidResponseException; +import io.minio.errors.ServerException; +import io.minio.errors.XmlParserException; +import io.minio.messages.Bucket; +import org.apache.commons.io.IOUtils; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; + +@Service +public class MinioAdapter { + private final MinioClient minioClient; + + public MinioAdapter(MinioClient minioClient) { + this.minioClient = minioClient; + } + + public List getBuckets() { + try { + return minioClient.listBuckets(); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + public void createBucket(String bucketName) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + boolean isExists = minioClient.bucketExists(BucketExistsArgs.builder().bucket(bucketName).build()); + if (!isExists) { + minioClient.makeBucket(MakeBucketArgs.builder().bucket(bucketName).build()); + } + } + + public Boolean uploadFile(String bucket, String fileName, byte[] content) { + File file = new File(fileName); + try (FileOutputStream fos = new FileOutputStream(file)) { + fos.write(content); + minioClient.putObject(PutObjectArgs.builder() + .bucket(bucket) + .object(fileName).stream(new FileInputStream(fileName), file.length(), -1) + .build()); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + return true; + } + + public byte[] getFile(String bucket, String fileName) { + try (InputStream in = minioClient.getObject(GetObjectArgs.builder() + .bucket(bucket) + .object(fileName) + .build())) { + return IOUtils.toByteArray(in); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } +} diff --git a/minio/src/main/java/com/spring/minio/config/MinioConfig.java b/minio/src/main/java/com/spring/minio/config/MinioConfig.java new file mode 100644 index 0000000..5da0e36 --- /dev/null +++ b/minio/src/main/java/com/spring/minio/config/MinioConfig.java @@ -0,0 +1,28 @@ +package com.spring.minio.config; + +import io.minio.MinioClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MinioConfig { + @Value("${minio.access.name}") + private String accessName; + @Value("${minio.access.secret}") + private String accessSecret; + @Value("${minio.url}") + private String minioUrl; + + @Bean + public MinioClient minioClient() { + try { + return MinioClient.builder() + .credentials(accessName, accessSecret) + .endpoint(minioUrl) + .build(); + } catch (Exception e) { + throw new RuntimeException(e.getMessage(), e); + } + } +} diff --git a/minio/src/main/java/com/spring/minio/controller/MinioController.java b/minio/src/main/java/com/spring/minio/controller/MinioController.java new file mode 100644 index 0000000..068e9b1 --- /dev/null +++ b/minio/src/main/java/com/spring/minio/controller/MinioController.java @@ -0,0 +1,81 @@ +package com.spring.minio.controller; + +import com.spring.minio.config.MinioAdapter; +import io.minio.errors.ErrorResponseException; +import io.minio.errors.InsufficientDataException; +import io.minio.errors.InternalException; +import io.minio.errors.InvalidResponseException; +import io.minio.errors.ServerException; +import io.minio.errors.XmlParserException; +import io.minio.messages.Bucket; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.ByteArrayResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.IOException; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.util.List; + +@RestController +@Slf4j +public class MinioController { + private final MinioAdapter minioAdapter; + public static final String CORRELATION_ID = "correlation-id"; + + public MinioController(MinioAdapter minioAdapter) throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException { + this.minioAdapter = minioAdapter; + if (minioAdapter.getBuckets().stream().map(Bucket::name).findAny().isEmpty()) { + minioAdapter.createBucket("user1"); + } + } + + @GetMapping("/buckets") + public ResponseEntity> get(@RequestHeader(CORRELATION_ID) String correlationId) { + log.info(String.format("Get buckets | correlation-id: %s | endpoint: /buckets | method: GET", correlationId)); + return new ResponseEntity<>(minioAdapter.getBuckets().stream().map(Bucket::name).toList(), setHeaders(correlationId), HttpStatus.OK); + } + + @PostMapping(path = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ResponseEntity post(@RequestPart(value = "file", required = false) MultipartFile file, @RequestHeader(CORRELATION_ID) String correlationId) throws IOException { + log.info(String.format("Trying generate file | correlation-id: %s | endpoint: /upload | method: POST", correlationId)); + if (minioAdapter.uploadFile("user1", file.getOriginalFilename(), file.getBytes())) { + log.info(String.format("File generated | correlation-id: %s | endpoint: /upload | method: POST", correlationId)); + return new ResponseEntity<>(file.getOriginalFilename(), setHeaders(correlationId), HttpStatus.OK); + } else return new ResponseEntity<>("File is already exists", setHeaders(correlationId), HttpStatus.OK); + } + + @GetMapping("/download") + public ResponseEntity get(@RequestPart("file") String file, @RequestHeader(CORRELATION_ID) String correlationId) { + log.info(String.format("Trying get file | correlation-id: %s | endpoint: /download | method: GET", correlationId)); + try { + byte[] data = minioAdapter.getFile("user1", file); + ByteArrayResource resource = new ByteArrayResource(data); + + return ResponseEntity + .ok() + .contentLength(data.length) + .header("Content-Type", "application/octet-stream") + .header("Content-Disposition", "attachment; filename=\"" + file + "\"") + .header(correlationId) + .body(resource); + } catch (Exception e) { + return new ResponseEntity<>("No file", setHeaders(correlationId), HttpStatus.NOT_FOUND); + } + } + + private HttpHeaders setHeaders(String info) { + HttpHeaders headers = new HttpHeaders(); + headers.set(CORRELATION_ID, info); + return headers; + } +} diff --git a/minio/src/main/resources/application.yml b/minio/src/main/resources/application.yml new file mode 100644 index 0000000..f227b5c --- /dev/null +++ b/minio/src/main/resources/application.yml @@ -0,0 +1,7 @@ +server: + port: 8081 +minio: + access: + name: role_for_spring + secret: 123456789 + url: "http://minio:9000" \ No newline at end of file diff --git a/report/pom.xml b/report/pom.xml index 4530df9..b0f56c3 100644 --- a/report/pom.xml +++ b/report/pom.xml @@ -1,73 +1,77 @@ - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.3.4 - - - com.spring - report - 0.0.1-SNAPSHOT - report - report project for Spring Boot - - - - - - - - - - - - - - - 17 - - - - org.springdoc - springdoc-openapi-starter-webmvc-ui - 2.2.0 - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-web - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.4 + + + com.spring + report + 0.0.1-SNAPSHOT + report + report project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-web + + + org.postgresql + postgresql + runtime + + + org.projectlombok + lombok + true + + + com.opencsv + opencsv + 5.3 + + + org.springframework.boot + spring-boot-starter-test + test + + - - org.postgresql - postgresql - runtime - - - org.projectlombok - lombok - true - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/report/src/main/java/com/spring/report/config/AppConfig.java b/report/src/main/java/com/spring/report/config/AppConfig.java new file mode 100644 index 0000000..5ede43b --- /dev/null +++ b/report/src/main/java/com/spring/report/config/AppConfig.java @@ -0,0 +1,14 @@ +package com.spring.report.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestTemplate; + +@Configuration +public class AppConfig { + + @Bean + public RestTemplate restTemplate() { + return new RestTemplate(); + } +} diff --git a/report/src/main/java/com/spring/report/controller/VisitorController.java b/report/src/main/java/com/spring/report/controller/VisitorController.java index f9c082c..fdd928a 100644 --- a/report/src/main/java/com/spring/report/controller/VisitorController.java +++ b/report/src/main/java/com/spring/report/controller/VisitorController.java @@ -1,13 +1,27 @@ package com.spring.report.controller; +import com.opencsv.CSVWriter; import com.spring.report.entity.Visitor; import com.spring.report.repository.VisitorRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.core.io.FileSystemResource; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.client.RestTemplate; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; import java.util.List; @RestController @@ -16,9 +30,77 @@ import java.util.List; @Slf4j public class VisitorController { private final VisitorRepository visitorRepository; + public static final String CORRELATION_ID = "correlation-id"; + private final RestTemplate restTemplate; @GetMapping - public List report() { - return visitorRepository.findAll(); + public ResponseEntity> report(@RequestHeader(CORRELATION_ID) String correlationId) { + log.info(String.format("Report generated | correlation-id: %s | endpoint: /visitors/report | method: GET", correlationId)); + + List visitors = visitorRepository.findAll(); + + String csvFileName = "visitors_report.csv"; + File csvFile = generateCsv(visitors, csvFileName); + + uploadFileToMinio(csvFile, correlationId); + + if (csvFile.exists()) { + csvFile.delete(); + } + + return new ResponseEntity<>(visitorRepository.findAll(), setHeaders(correlationId), HttpStatus.OK); + } + + private HttpHeaders setHeaders(String info) { + HttpHeaders headers = new HttpHeaders(); + headers.set(CORRELATION_ID, info); + return headers; + } + + private File generateCsv(List visitors, String fileName) { + File csvFile = new File(fileName); + try (CSVWriter writer = new CSVWriter(new FileWriter(csvFile), + ';', + CSVWriter.NO_QUOTE_CHARACTER, + CSVWriter.DEFAULT_ESCAPE_CHARACTER, + CSVWriter.DEFAULT_LINE_END)) { + String[] header = {"id", "name", "surname", "patronymic", "hasDisk"}; + writer.writeNext(header); + + for (Visitor visitor : visitors) { + String[] data = { + String.valueOf(visitor.getId()), + visitor.getName(), + visitor.getSurname(), + visitor.getPatronymic(), + String.valueOf(visitor.getHasDisk()) + }; + writer.writeNext(data); + } + } catch (IOException e) { + log.error("Error generating CSV", e); + } + return csvFile; + } + + private void uploadFileToMinio(File file, String corId) { + String url = "http://myminio:8081/upload"; + + try { + HttpHeaders headers = setHeaders(corId); + headers.setContentType(MediaType.MULTIPART_FORM_DATA); + + MultiValueMap body = new LinkedMultiValueMap<>(); + body.add("file", new FileSystemResource(file)); + + HttpEntity> requestEntity = new HttpEntity<>(body, headers); + ResponseEntity response = restTemplate.postForEntity(url, requestEntity, String.class); + + if (response.getStatusCode() != HttpStatus.OK) { + log.error("Failed to upload file: {}", response.getStatusCode()); + } + } catch (Exception e) { + log.error("Error uploading file to MinIO", e); + } } }