From 82699c188e6d7559d7bdc2ec7329291b3178e762 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Lehtokallio Date: Tue, 31 Dec 2024 16:08:55 +0200 Subject: [PATCH] EP-4379 --- .github/workflows/build.yml | 3 +- Justfile | 4 +- eperusteet-ylops-service/pom.xml | 957 +----------------- .../ylops/config/DefaultConfigs.java | 26 +- .../ylops/config/MetricsConfig.java | 27 - .../ylops/config/MvcConfiguration.java | 3 +- .../ylops/config/SwaggerConfig.java | 96 +- .../config/WebSecurityConfiguration.java | 48 +- .../config/WebSecurityConfigurationDev.java | 33 +- .../ylops/domain/AbstractAuditedEntity.java | 12 +- .../AbstractAuditedReferenceableEntity.java | 8 +- .../domain/AbstractReferenceableEntity.java | 8 +- .../domain/LaajaalainenosaaminenViite.java | 4 +- .../sade/eperusteet/ylops/domain/Lukko.java | 12 +- .../sade/eperusteet/ylops/domain/Termi.java | 2 +- .../domain/Vuosiluokkakokonaisuusviite.java | 20 +- .../ylops/domain/cache/PerusteCache.java | 30 +- .../ylops/domain/dokumentti/Dokumentti.java | 16 +- .../domain/dokumentti/DokumenttiKuva.java | 25 +- .../ylops/domain/koodisto/KoodistoKoodi.java | 14 +- .../eperusteet/ylops/domain/liite/Liite.java | 26 +- .../Lops2019LaajaAlainenOsaaminen.java | 11 +- .../domain/lops2019/Lops2019Opintojakso.java | 20 +- .../Lops2019OpintojaksoPoistettu.java | 2 +- .../Lops2019OpintojaksonKeskeinenSisalto.java | 8 +- .../lops2019/Lops2019OpintojaksonModuuli.java | 8 +- .../Lops2019OpintojaksonOppiaine.java | 6 +- .../lops2019/Lops2019OpintojaksonTavoite.java | 8 +- .../Lops2019OpiskeluymparistoTyotavat.java | 8 +- .../domain/lops2019/Lops2019Oppiaine.java | 26 +- .../lops2019/Lops2019OppiaineJarjestys.java | 9 +- .../Lops2019OppiaineenTavoitealue.java | 14 +- .../Lops2019PaikallinenArviointi.java | 8 +- .../domain/lops2019/Lops2019Sisalto.java | 2 +- .../domain/lops2019/Lops2019Tavoite.java | 2 +- .../domain/lops2019/Lops2019Tavoitteet.java | 14 +- .../domain/lops2019/Lops2019Tehtava.java | 8 +- .../PaikallinenLaajaAlainenOsaaminen.java | 2 +- .../ylops/domain/lops2019/Poistettu.java | 18 +- .../ylops/domain/lukio/Aihekokonaisuudet.java | 2 +- .../ylops/domain/lukio/Aihekokonaisuus.java | 2 +- .../eperusteet/ylops/domain/lukio/Kurssi.java | 12 +- .../ylops/domain/lukio/LukioOppiaineId.java | 4 +- .../domain/lukio/LukioOppiaineJarjestys.java | 2 +- .../ylops/domain/lukio/Lukiokurssi.java | 34 +- .../lukio/OpetuksenYleisetTavoitteet.java | 2 +- .../domain/lukio/OppiaineLukiokurssi.java | 2 +- .../ylops/domain/lukio/OpsOppiaineId.java | 4 +- .../domain/lukio/OpsOppiaineParentView.java | 2 +- .../domain/oppiaine/Keskeinensisaltoalue.java | 8 +- .../OpetuksenKeskeinensisaltoalue.java | 12 +- .../domain/oppiaine/Opetuksenkohdealue.java | 8 +- .../domain/oppiaine/Opetuksentavoite.java | 20 +- .../ylops/domain/oppiaine/Oppiaine.java | 32 +- .../oppiaine/Oppiaineenvuosiluokka.java | 24 +- .../Oppiaineenvuosiluokkakokonaisuus.java | 24 +- .../domain/oppiaine/PoistettuOppiaine.java | 2 +- .../domain/oppiaine/Tavoitteenarviointi.java | 8 +- .../VapaatekstiPaikallinentarkennus.java | 16 +- .../ops/JulkaistuOpetussuunnitelmaData.java | 21 +- .../ops/JulkaistuOpetussuunnitelmaTila.java | 22 +- .../ylops/domain/ops/Kommentti2019.java | 8 +- .../ylops/domain/ops/KommenttiKahva.java | 12 +- .../ylops/domain/ops/Opetussuunnitelma.java | 44 +- .../ops/OpetussuunnitelmaAikataulu.java | 29 +- .../ops/OpetussuunnitelmanJulkaisu.java | 24 +- .../ops/OpetussuunnitelmanMuokkaustieto.java | 39 +- ...unnitelmanMuokkaustietoLisaparametrit.java | 13 +- .../ylops/domain/ops/OpsOppiaine.java | 10 +- .../domain/ops/OpsVuosiluokkakokonaisuus.java | 12 +- .../OpsVuosiluokkakokonaisuusLisatieto.java | 16 +- .../ylops/domain/revision/RevisionInfo.java | 10 +- .../ylops/domain/teksti/Kommentti.java | 10 +- .../domain/teksti/LokalisoituTeksti.java | 24 +- .../domain/teksti/PoistettuTekstiKappale.java | 18 +- .../ylops/domain/teksti/Teksti.java | 11 +- .../ylops/domain/teksti/TekstiKappale.java | 24 +- .../domain/teksti/TekstiKappaleViite.java | 30 +- .../ylops/domain/teksti/Tekstiosa.java | 16 +- .../eperusteet/ylops/domain/ukk/Kysymys.java | 10 +- .../ylops/domain/validation/ValidHtml.java | 4 +- .../ValidHtmlCollectionValidator.java | 4 +- .../domain/validation/ValidHtmlValidator.java | 5 +- .../Laajaalainenosaaminen.java | 17 +- .../Vuosiluokkakokonaisuus.java | 24 +- .../lukio/AihekokonaisuudetJarjestaDto.java | 4 +- .../lukio/AihekokonaisuusJarjestysDto.java | 3 +- .../dto/lukio/AihekokonaisuusSaveDto.java | 2 +- .../LukioAbstraktiOppiaineTuontiDto.java | 2 +- .../dto/lukio/LukioKopioiOppimaaraDto.java | 2 +- .../lukio/LukiokurssiOppaineMuokkausDto.java | 2 +- .../ylops/dto/lukio/LukiokurssiSaveDto.java | 2 +- .../ylops/dto/lukio/LukiokurssiUpdateDto.java | 2 +- .../repository/OphSessionMappingStorage.java | 3 +- .../custom/OphSessionMappingStorageImpl.java | 44 +- .../ylops/repository/dialect/JsonBType.java | 24 +- .../impl/JulkaisuRepositoryImpl.java | 6 +- .../liite/impl/LiiteRepositoryImpl.java | 18 +- .../lops2019/PoistetutRepository.java | 2 +- .../ops/OpetussuunnitelmaRepository.java | 35 +- .../TekstikappaleviiteRepositoryImpl.java | 4 +- ...paWithVersioningRepositoryFactoryBean.java | 2 +- .../JpaWithVersioningRepositoryImpl.java | 15 +- .../config/ExceptionHandlingConfig.java | 17 +- .../ylops/resource/config/InternalApi.java | 12 - .../dokumentti/DokumenttiController.java | 4 +- .../external/UlkopuolisetController.java | 62 +- .../hallinta/MaintenanceController.java | 6 +- .../resource/julkinen/ExternalController.java | 48 +- .../kommentointi/KommentointiController.java | 14 +- .../resource/lops2019/Lops2019Controller.java | 6 +- .../Lops2019OpintojaksoController.java | 7 +- .../lops2019/Lops2019OppiaineController.java | 7 +- .../lops2019/Lops2019PerusteController.java | 4 +- .../resource/ops/JulkaisuController.java | 4 +- .../resource/ops/KommenttiController.java | 21 +- .../resource/ops/LiitetiedostoController.java | 8 +- .../ops/OpetussuunnitelmaController.java | 36 +- .../OpetussuunnitelmaJulkisetController.java | 42 +- ...OpetussuunnitelmanAikatauluController.java | 4 +- ...tussuunnitelmanMuokkausietoController.java | 4 +- .../OpetussuunnitelmanSisaltoController.java | 6 +- .../resource/ops/OppiaineController.java | 4 +- .../resource/ops/OppiaineLockController.java | 8 +- .../ops/OppiaineenVuosiluokkaController.java | 6 +- ...ineenVuosiluokkakokonaisuusController.java | 6 +- .../ops/OpsSisaltoLockController.java | 8 +- .../ops/OpsTekstikappaleLockController.java | 8 +- .../resource/ops/TermistoController.java | 9 +- .../ops/VuosiluokkakokonaisuusController.java | 4 +- .../ops/lukio/LukioLockController.java | 4 +- .../LukioOpetussuunnitelmatController.java | 4 +- .../ylops/resource/ukk/KysymysController.java | 9 +- .../resource/util/AbstractLockController.java | 2 - .../resource/util/CacheHeaderInterceptor.java | 8 +- .../resource/util/KayttajaController.java | 6 +- .../resource/util/LoggingInterceptor.java | 5 +- .../ylops/resource/util/VirheServlet.java | 10 +- .../impl/ExternalPdfServiceImpl.java | 16 +- .../external/impl/EperusteetLocalService.java | 2 +- .../external/impl/EperusteetServiceImpl.java | 4 +- .../external/impl/KayttajaClientImpl.java | 13 +- .../impl/OrganisaatioServiceImpl.java | 4 +- .../service/locking/LockManagerImpl.java | 6 +- .../impl/Lops2019OpintojaksoServiceImpl.java | 2 +- .../impl/Lops2019OppiaineServiceImpl.java | 2 +- .../mapping/LokalisoituTekstiConverter.java | 2 +- .../mapping/ReferenceableEntityConverter.java | 8 +- .../ylops/service/ops/OpsDispatcher.java | 2 +- .../ops/impl/Kommentti2019ServiceImpl.java | 2 +- .../impl/OpetussuunnitelmaServiceImpl.java | 28 +- .../ylops/service/util/LogoutService.java | 3 +- .../service/util/impl/LogoutServiceImpl.java | 4 +- .../src/main/resources/application.properties | 7 +- .../V1_20250102133900__sequence_restart.sql | 24 + .../main/resources/hibernate-typedefs.hbm.xml | 9 - .../main/resources/static/swagger/index.html | 26 - .../static/swagger/swagger-ui-bundle.js | 3 - .../swagger/swagger-ui-standalone-preset.js | 3 - .../resources/static/swagger/swagger-ui.css | 4 - .../{substitutes.map => substitutes.map.old} | 0 .../src/test/config/hibernate.properties | 1 - .../ops/JulkaistuOpetussuunnitelmaData.java | 10 +- .../service/mocks/EperusteetServiceMock.java | 8 +- .../ylops/service/ops/AikatauluServiceIT.java | 10 +- .../ylops/service/ops/KommentointiIT.java | 2 +- .../ops/OpetussuunnitelmaServiceIT.java | 1 + .../ylops/service/ops/OppiaineServiceIT.java | 2 +- .../teksti/TekstiKappaleViiteServiceIT.java | 2 +- .../test/AbstractWebIntegrationTest.java | 2 +- .../src/test/resources/it-test-context.xml | 27 +- .../test/resources/it-test-web-context.xml | 2 +- .../src/test/resources/security-test.xml | 2 + .../src/test/resources/typedefs-h2.xml | 9 - .../src/test/resources/typedefs-pg.xml | 9 - pom.xml | 125 --- 176 files changed, 1017 insertions(+), 2179 deletions(-) delete mode 100644 eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MetricsConfig.java delete mode 100644 eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/InternalApi.java create mode 100644 eperusteet-ylops-service/src/main/resources/db/migration/V1_20250102133900__sequence_restart.sql delete mode 100644 eperusteet-ylops-service/src/main/resources/hibernate-typedefs.hbm.xml delete mode 100644 eperusteet-ylops-service/src/main/resources/static/swagger/index.html delete mode 100644 eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui-bundle.js delete mode 100644 eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui-standalone-preset.js delete mode 100644 eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui.css rename eperusteet-ylops-service/src/main/resources/{substitutes.map => substitutes.map.old} (100%) delete mode 100644 eperusteet-ylops-service/src/test/resources/typedefs-h2.xml delete mode 100644 eperusteet-ylops-service/src/test/resources/typedefs-pg.xml delete mode 100644 pom.xml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fa8e7c3f9..fc0679156 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,8 @@ jobs: - name: Build with Maven env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | cd eperusteet-ylops-service mvn clean verify --batch-mode -Pit diff --git a/Justfile b/Justfile index 7dd68be83..1cd556afb 100644 --- a/Justfile +++ b/Justfile @@ -1,11 +1,11 @@ # Generoi openapi-kuvaukset gen_openapi: @cd eperusteet-ylops-service/ \ - && mvn clean compile -P generate-openapi \ + && mvn clean verify -Pspringdoc \ && cp target/openapi/ylops.spec.json ../generated # Generoi julkiset openapi-kuvaukset gen_openapi_ext: @cd eperusteet-ylops-service/ \ - && mvn clean compile -P generate-openapi-ext \ + && mvn clean verify -Pspringdoc-ext \ && cp target/openapi/ylops-ext.spec.json ../generated diff --git a/eperusteet-ylops-service/pom.xml b/eperusteet-ylops-service/pom.xml index 1da7282e2..99fb3544b 100644 --- a/eperusteet-ylops-service/pom.xml +++ b/eperusteet-ylops-service/pom.xml @@ -1,963 +1,42 @@ 4.0.0 + - org.springframework.boot - spring-boot-starter-parent - 2.7.18 + fi.vm.sade.eperusteet + eperusteet-parent-pom + 1.0.0 - eperusteet-ylops-service + eperusteet-ylops-service + eperusteet-service + 3.0.0 + - 4.5.13 - 1.13 - true - jdbc:postgresql://localhost:5432/${eperusteet-ylops.devdb.user} - jdbc:postgresql://localhost:5432/${eperusteet-ylops.ittestdb.user} - 2.5 - fi.vm.sade.eperusteet.ylops.resource - 3.2.2 - 9.22.3 - 2.9 - CREATE - 5.3.6.Final - 2.15.4 - 11 - 1.15.3 - 1.18.34 - 3.10.1 - 17 - 17 - 4.2.18 - 9.0.90 - 2.0.29 - 42.5.5 - UTF-8 - 0.6.1-SNAPSHOT - ${project.basedir}/target/schema.ddl - 5.7.11 - 2.4.3 - 2.7.0 - 3.2.2 - 3.1.7 - 0.8.12 + http://localhost:8081/eperusteet-ylops-service/api-docs + ylops.spec.json + http://localhost:8081/eperusteet-ylops-service/api-docs/external + ylops-ext.spec.json - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-security - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-cache - - - org.springframework.boot - spring-boot-starter-validation - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-starter-logging - - - - - org.apache.tomcat.embed - tomcat-embed-core - ${org.apache.tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-el - ${org.apache.tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-websocket - ${org.apache.tomcat.version} - - - one.util - streamex - 0.6.5 - - - junit - junit - 4.12 - test - - - org.flywaydb - flyway-core - ${flyway.version} - - - org.apache.httpcomponents - httpclient - ${apache.httpclient.version} - - - commons-httpclient - commons-httpclient - 3.1 - - - org.apache.httpcomponents - httpclient-cache - ${apache.httpclient.version} - - - com.google.code.gson - gson - 2.8.9 - - - org.assertj - assertj-core - 3.24.2 - test - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-toml - ${jackson.version} - - - javax.servlet - javax.servlet-api - 3.1.0 - provided - - - org.springframework.security - spring-security-test - ${spring.security.test.version} - test - - - org.springframework.session - spring-session-jdbc - ${spring.session.jdbc.version} - - - com.google.guava - guava - 31.1-jre - - - org.hibernate - hibernate-jcache - - - org.ehcache - ehcache - - - org.hibernate - hibernate-envers - 5.6.14.Final - - - javax.transaction - jta - 1.1 - - - jakarta.activation - jakarta.activation-api - 1.2.2 - - - com.sun.activation - jakarta.activation - 2.0.1 - - - javax.el - javax.el-api - 3.0.0 - test - - - org.glassfish - javax.el - 3.0.0 - test - - - com.zaxxer - HikariCP - 5.0.1 - - - org.postgresql - postgresql - ${postgresql.version} - - - commons-dbcp - commons-dbcp - 1.4 - test - - - org.springframework - spring-test - test - - - com.h2database - h2 - 1.4.192 - test - - - org.mockito - mockito-core - 2.28.2 - - - org.jeasy - easy-random - 4.1.0 - pom - - - ma.glasnost.orika - orika-core - 1.5.4 - - - org.projectlombok - lombok - ${lombok.version} - provided - - - fi.vm.sade.java-utils - opintopolku-user-details-service - 0.4.0-SNAPSHOT - - - fi.vm.sade.java-utils - java-properties - 0.1.0-SNAPSHOT - - - fi.vm.sade.java-utils - java-http - 0.6.1-SNAPSHOT - - - fi.vm.sade.java-utils - opintopolku-cas-servlet-filter - 0.2.0-SNAPSHOT - - - fi.vm.sade - auditlogger - 8.3.1-SNAPSHOT - - - org.jsoup - jsoup - ${jsoup.version} - - - io.springfox - springfox-swagger2 - ${springfox.version} - - - org.aspectj - aspectjtools - 1.9.22.1 - - - org.jasig.cas.client - cas-client-support-distributed-ehcache - 3.6.4 - - - net.sf.ehcache - ehcache-core - - - - - xml-apis - xml-apis - 1.4.01 - - - org.apache.xmlgraphics - fop - ${fop.version} - - - servlet-api - javax.servlet - - - - - org.apache.pdfbox - pdfbox - ${pdfbox.version} - - - org.apache.pdfbox - fontbox - ${pdfbox.version} - - - org.apache.pdfbox - preflight - ${pdfbox.version} - - - org.apache.xmlgraphics - batik-i18n - ${batik.version} - - - org.apache.xmlgraphics - batik-constants - ${batik.version} - - - org.apache.tika - tika-core - 2.7.0 - - - fi.ratamaa - dtoconverter - 2.0.3-RELEASE - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - - - javax.validation - validation-api - - - javassist - javassist - - - - - fi.vm.sade.eperusteet - eperusteet-backend-utils - ${eperusteet.backend-utils.version} - - - commons-collections - commons-collections - 3.2.2 - - - org.apache.commons - commons-lang3 - 3.9 - - - commons-validator - commons-validator - 1.7 - - - commons-io - commons-io - 2.7 - - - org.skyscreamer - jsonassert - 1.5.1 - - - org.apache.commons - commons-text - 1.10.0 - - - javax.xml.bind - jaxb-api - 2.3.1 - - - javax.annotation - javax.annotation-api - 1.3.2 - - - org.junit.vintage - junit-vintage-engine - test - - - org.yaml - snakeyaml - 2.2 - - - ch.qos.logback - logback-access - 1.2.13 - - - ch.qos.logback - logback-classic - 1.2.13 - - - ch.qos.logback - logback-core - 1.2.13 - - - com.codepoetics - protonpack - 1.10 - - - com.ryantenney.metrics - metrics-spring - 3.1.3 - - - io.dropwizard.metrics - metrics-core - ${metrics.version} - - - io.dropwizard.metrics - metrics-servlets - ${metrics.version} - - - io.dropwizard.metrics - metrics-jmx - ${metrics.version} - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - - org.springframework.boot - spring-boot-maven-plugin - - - -Dfile.encoding=UTF8 - --add-opens=java.base/java.lang=ALL-UNNAMED - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - ttf - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source} - ${maven.compiler.target} - true - - - org.hibernate - hibernate-jpamodelgen - ${hibernate.jpamodel.version} - - - javax.xml.bind - jaxb-api - 2.3.0 - - - javax.annotation - javax.annotation-api - 1.3.1 - - - org.projectlombok - lombok - ${lombok.version} - - - - --add-modules - java.datatransfer,java.desktop,java.xml - - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${failsafe.version} - - - - integration-test - verify - - - - - - --add-opens=java.base/java.lang=ALL-UNNAMED - - - **/ylops/test/**.java - - - **/*IT.java - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - --add-opens=java.base/java.lang=ALL-UNNAMED - - - **/ylops/test/**.java - **/*IT.java - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - true - -Xdoclint:none - ${project.basedir}/src/main/java;${project.basedir}/target/generated-sources/annotations - - db/migration/** - **/domain/**/*_.java - com/google/code/** - - - - - io.snyk - snyk-maven-plugin - 2.0.0 - false - - - snyk-test - - test - - - - snyk-monitor - - monitor - - - - - 568d706d-f3f8-4657-a2b1-4449167c05c0 - - --all-projects - - - - - io.snyk - snyk-maven-plugin - 2.0.0 - false - - - --all-projects - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - pre-unit-test - - prepare-agent - - - ${project.build.directory}/jacoco-ut.exec - surefireArgLine - - - - pre-integration-test - pre-integration-test - - prepare-agent - - - ${project.build.directory}/jacoco-it.exec - failsafeArgLine - - - - report - test - - report - - - ${project.build.directory}/jacoco.exec - ${project.build.directory}/jacoco - - XML - HTML - - - - - merge-files - post-integration-test - - merge - - - - - ${project.build.directory} - - *.exec - - - - ${project.build.directory}/jacoco.exec - - - - post-integration-test - post-integration-test - - report - - - ${project.build.directory}/jacoco.exec - ${project.build.directory}/jacoco - - XML - HTML - - - - - - - - - - de.juplo - hibernate4-maven-plugin - 1.1.1 - - - - export - - - - - true - ${hibernate.export.type} - SCRIPT - org.postgresql.Driver - fi.vm.sade.eperusteet.utils.repository.dialect.CustomPostgreSqlDialect - - - - ${project.basedir}/src/test/config/hibernate.properties - ${project.basedir}/src/main/resources/hibernate-typedefs.hbm.xml - ${schema.file} - NONE - - - - org.postgresql - postgresql - ${postgresql.version} - - - fi.vm.sade.eperusteet - eperusteet-backend-utils - 2.4-SNAPSHOT - - - javax.xml.bind - jaxb-api - 2.3.1 - - - - - eperusteet-ylops-service - - - generate-openapi - - - - com.github.kongchen - swagger-maven-plugin - ${swagger-maven-plugin-version} - - - - true - - http - https - - - ${eperusteet.resources}.dokumentti.* - ${eperusteet.resources}.external.* - ${eperusteet.resources}.julkinen.* - ${eperusteet.resources}.kommentointi.KommentointiController - ${eperusteet.resources}.lops2019.Lops2019Controller - ${eperusteet.resources}.lops2019.Lops2019Controller - ${eperusteet.resources}.lops2019.Lops2019Controller - ${eperusteet.resources}.lops2019.Lops2019OpintojaksoController - ${eperusteet.resources}.lops2019.Lops2019OpintojaksoController - ${eperusteet.resources}.lops2019.Lops2019OppiaineController - ${eperusteet.resources}.lops2019.Lops2019OppiaineController - ${eperusteet.resources}.lops2019.Lops2019PerusteController - ${eperusteet.resources}.lops2019.Lops2019PerusteController - ${eperusteet.resources}.ohje.* - ${eperusteet.resources}.ops.JulkaisuController - ${eperusteet.resources}.ops.KommenttiController - ${eperusteet.resources}.ops.LiitetiedostoController - ${eperusteet.resources}.ops.OpetussuunnitelmaController - ${eperusteet.resources}.ops.OpetussuunnitelmaJulkisetController - ${eperusteet.resources}.ops.OpetussuunnitelmanAikatauluController - ${eperusteet.resources}.ops.OpetussuunnitelmanMuokkausietoController - ${eperusteet.resources}.ops.OpetussuunnitelmanSisaltoController - ${eperusteet.resources}.ops.OppiaineController - ${eperusteet.resources}.ops.OppiaineenVuosiluokkaController - ${eperusteet.resources}.ops.OppiaineenVuosiluokkakokonaisuusController - ${eperusteet.resources}.ops.TermistoController - ${eperusteet.resources}.ops.VuosiluokkakokonaisuusController - ${eperusteet.resources}.ops.lukio.LukioOpetussuunnitelmatController - ${eperusteet.resources}.ukk.* - ${eperusteet.resources}.util.KayttajaController - - /substitutes.map - - ePerusteet lukio api - v1 - - ylops.spec - target/openapi - - - - - - compile - - generate - - - - - - - - - generate-openapi-ext - - - - com.github.kongchen - swagger-maven-plugin - ${swagger-maven-plugin-version} - - - - true - - https - - - virkailija.opintopolku.fi - /eperusteet-ylops-service - - - ${eperusteet.resources}.julkinen.ExternalController - - /substitutes.map - - OPS-työkalu API - 1 - Yleissivistävien opetussuunnitelmien rajapintakuvaukset - - ylops-ext.spec - target/openapi - - - - - - compile - - generate - - - - - - - - - generate-db-diagram - - - - de.juplo - hibernate4-maven-plugin - - - - export - - process-classes - - - - ${project.basedir}/src/test/config/hibernate-typedefs.xml - - - - - - - it - - - - org.apache.maven.plugins - maven-failsafe-plugin - ${failsafe.version} - - - -Dlog4j2.level=OFF - -Xmx2048m - -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-it.exec - --add-opens=java.base/java.lang=ALL-UNNAMED - - - **/ylops/test/**.java - - - **/*IT.java - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - -Dlog4j2.level=OFF - -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco-ut.exec - --add-opens=java.base/java.lang=ALL-UNNAMED - - - **/ylops/test/**.java - **/*IT.java - - - - - - - - oph-sade-artifactory - oph-sade-artifactory-releases - https://artifactory.opintopolku.fi/artifactory/oph-sade-release-local + github + GitHub Packages + https://maven.pkg.github.com/Opetushallitus/eperusteet-ylops - - oph-sade-artifactory - oph-sade-artifactory-snapshots - https://artifactory.opintopolku.fi/artifactory/oph-sade-snapshot-local - - oph-sade-artifactory-snapshots - https://artifactory.opintopolku.fi/artifactory/oph-sade-snapshot-local - - true - - - false - - - - oph-sade-artifactory-releases - https://artifactory.opintopolku.fi/artifactory/oph-sade-release-local + github + GitHub Packages + https://maven.pkg.github.com/Opetushallitus/eperusteet-backend-utils diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/DefaultConfigs.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/DefaultConfigs.java index b1a4b395e..239815bd8 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/DefaultConfigs.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/DefaultConfigs.java @@ -2,8 +2,10 @@ import fi.vm.sade.eperusteet.ylops.repository.version.JpaWithVersioningRepositoryFactoryBean; import fi.vm.sade.eperusteet.ylops.service.security.PermissionEvaluator; +import jakarta.persistence.EntityManager; import org.flywaydb.core.Flyway; -import org.hibernate.jpa.HibernateEntityManager; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.id.enhanced.SingleNamingStrategy; import org.hibernate.jpa.HibernatePersistenceProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.EnableCaching; @@ -21,10 +23,9 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import javax.sql.DataSource; import java.util.HashMap; @@ -36,8 +37,8 @@ @EnableAsync @EnableCaching @EnableTransactionManagement -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) -@EnableAspectJAutoProxy // (proxyTargetClass = true) +@EnableMethodSecurity(securedEnabled = true) +@EnableAspectJAutoProxy @EnableJpaRepositories(basePackages = "fi.vm.sade.eperusteet.ylops.repository", repositoryFactoryBeanClass = JpaWithVersioningRepositoryFactoryBean.class) @PropertySource( ignoreResourceNotFound = true, value={ @@ -72,11 +73,6 @@ public DefaultMethodSecurityExpressionHandler expressionHandler() { return expressionHandler; } - @Bean - public LocalValidatorFactoryBean validator() { - return new LocalValidatorFactoryBean(); - } - @Bean(initMethod = "migrate") public Flyway flyway() { return Flyway.configure() @@ -101,20 +97,18 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() { entityManagerFactory.setDataSource(dataSource); entityManagerFactory.setPackagesToScan("fi.vm.sade.eperusteet.ylops.domain"); entityManagerFactory.setPersistenceProviderClass(HibernatePersistenceProvider.class); - entityManagerFactory.setEntityManagerInterface(HibernateEntityManager.class); + entityManagerFactory.setEntityManagerInterface(EntityManager.class); Map props = new HashMap<>(); props.put("hibernate.hbm2ddl.auto", "validate"); props.put("hibernate.show_sql", false); - props.put("hibernate.dialect", "fi.vm.sade.eperusteet.utils.repository.dialect.CustomPostgreSqlDialect"); - props.put("javax.persistence.sharedCache.mode", "ENABLE_SELECTIVE"); + props.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect"); + props.put("jakarta.persistence.sharedCache.mode", "ENABLE_SELECTIVE"); props.put("org.hibernate.envers.audit_strategy", "org.hibernate.envers.strategy.internal.DefaultAuditStrategy"); - props.put("javax.persistence.validation.factory", validator()); props.put("org.hibernate.envers.revision_listener", "fi.vm.sade.eperusteet.ylops.service.internal.AuditRevisionListener"); props.put("hibernate.jdbc.batch_size", 20); props.put("hibernate.jdbc.fetch_size", 20); - props.put("hibernate.id.new_generator_mappings", false); + props.put(AvailableSettings.ID_DB_STRUCTURE_NAMING_STRATEGY, SingleNamingStrategy.STRATEGY_NAME); entityManagerFactory.setJpaPropertyMap(props); - entityManagerFactory.setMappingResources("hibernate-typedefs.hbm.xml"); return entityManagerFactory; } diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MetricsConfig.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MetricsConfig.java deleted file mode 100644 index c2e6b861b..000000000 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MetricsConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package fi.vm.sade.eperusteet.ylops.config; - -import com.codahale.metrics.ConsoleReporter; -import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.jmx.JmxReporter; -import com.ryantenney.metrics.spring.config.annotation.EnableMetrics; -import com.ryantenney.metrics.spring.config.annotation.MetricsConfigurerAdapter; -import org.springframework.context.annotation.Configuration; - -import java.util.concurrent.TimeUnit; - -@Configuration -@EnableMetrics -public class MetricsConfig extends MetricsConfigurerAdapter { - - @Override - public void configureReporters(MetricRegistry metricRegistry) { - registerReporter(JmxReporter - .forRegistry(metricRegistry) - .build()).start(); - - registerReporter(ConsoleReporter - .forRegistry(metricRegistry) - .build()).start(1, TimeUnit.DAYS); - } - -} diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MvcConfiguration.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MvcConfiguration.java index c771a9c33..419c96f7f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MvcConfiguration.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/MvcConfiguration.java @@ -8,6 +8,7 @@ import fi.vm.sade.eperusteet.ylops.resource.config.ReferenceNamingStrategy; import fi.vm.sade.eperusteet.ylops.resource.util.CacheHeaderInterceptor; import fi.vm.sade.eperusteet.ylops.resource.util.LoggingInterceptor; +import jakarta.persistence.EntityManagerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,7 +25,6 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import javax.persistence.EntityManagerFactory; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; @@ -44,7 +44,6 @@ public void configurePathMatch(PathMatchConfigurer matcher) { public void addViewControllers(ViewControllerRegistry registry) { registry.addViewController("/ui/").setViewName("forward:/ui/index.html"); registry.addRedirectViewController("/ui", "/ui/"); - registry.addRedirectViewController("/swagger", "/swagger/index.html"); } @Override diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/SwaggerConfig.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/SwaggerConfig.java index 43d2186a9..748f72c55 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/SwaggerConfig.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/SwaggerConfig.java @@ -1,70 +1,56 @@ package fi.vm.sade.eperusteet.ylops.config; -import com.fasterxml.classmate.GenericType; -import com.fasterxml.classmate.TypeResolver; -import com.fasterxml.jackson.databind.JsonNode; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import com.fasterxml.jackson.databind.type.SimpleType; +import io.swagger.v3.core.converter.AnnotatedType; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.License; +import io.swagger.v3.oas.models.media.Schema; +import org.springdoc.core.customizers.PropertyCustomizer; +import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.http.ResponseEntity; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; -import javax.servlet.ServletContext; -import java.util.ArrayList; -import java.util.Optional; -import java.util.concurrent.Callable; - -import static com.google.common.base.Predicates.not; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.stream.Collectors; @Configuration -@EnableSwagger2 -@Profile("!test") public class SwaggerConfig { - private static final Logger LOG = LoggerFactory.getLogger(SwaggerConfig.class); - - @Autowired - private TypeResolver typeResolver; @Bean - public Docket swagger2Api(ServletContext ctx) { - LOG.debug("Starting Swagger v2"); - - return new Docket(DocumentationType.SWAGGER_2) - .apiInfo(apiInfo()) - .directModelSubstitute(JsonNode.class, Object.class) - .genericModelSubstitutes(ResponseEntity.class, Optional.class) - .forCodeGeneration(true) - .select() - .apis(not(RequestHandlerSelectors.withClassAnnotation(InternalApi.class))) - .build() - .alternateTypeRules( - springfox.documentation.schema.AlternateTypeRules.newRule( - typeResolver.resolve(new GenericType>>() { - }), - typeResolver.resolve(Object.class))); + public OpenAPI springShopOpenAPI() { + return new OpenAPI() + .info(new Info() + .title("ePerusteet ylops rajapinta") + .description("Spring MVC API based on the swagger 3.0 specification") + .version("v3.0.0") + .license(new License().name("EUPL 1.1").url("https://interoperable-europe.ec.europa.eu/licence/european-union-public-licence-version-11-or-later-eupl"))); } - /** - * API Info as it appears on the swagger-ui page - */ - private ApiInfo apiInfo() { - return new ApiInfo( - "Oppijan verkkopalvelukokonaisuus / ePerusteet-ylops rajapinta", - "", - "Spring MVC API based on the swagger 2.0 and 1.2 specification", - null, - null, - "EUPL 1.1", - "http://ec.europa.eu/idabc/eupl", - new ArrayList<>()); + @Bean + public PropertyCustomizer enumPropertyCustomizer() { + return new PropertyCustomizer() { + @Override + public Schema customize(Schema schema, AnnotatedType type) { + Type javaType = type.getType(); + if (javaType instanceof SimpleType && ((SimpleType) javaType).isEnumType()) { + Class enumClass = ((SimpleType) javaType).getRawClass(); + schema.setEnum(Arrays.stream(enumClass.getEnumConstants()) + .map(enumConstant -> ((Enum) enumConstant).name()) + .collect(Collectors.toList())); + } + return schema; + } + }; } + @Bean + public GroupedOpenApi externalOpenApi() { + return GroupedOpenApi.builder() + .group("external") + .packagesToScan("fi.vm.sade.eperusteet.ylops.resource.julkinen") + .pathsToMatch("/api/external/**") + .build(); + } } diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfiguration.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfiguration.java index 3a7c110f8..a1bdac7e1 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfiguration.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfiguration.java @@ -1,14 +1,14 @@ package fi.vm.sade.eperusteet.ylops.config; import fi.vm.sade.eperusteet.ylops.repository.OphSessionMappingStorage; -import fi.vm.sade.eperusteet.ylops.service.util.RestClientFactoryImpl; import fi.vm.sade.java_utils.security.OpintopolkuCasAuthenticationFilter; import fi.vm.sade.javautils.http.auth.CasAuthenticator; import fi.vm.sade.javautils.kayttooikeusclient.OphUserDetailsServiceImpl; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; -import org.jasig.cas.client.session.SingleSignOutFilter; -import org.jasig.cas.client.validation.Cas20ProxyTicketValidator; -import org.jasig.cas.client.validation.TicketValidator; +import org.apereo.cas.client.session.SingleSignOutFilter; +import org.apereo.cas.client.validation.Cas20ProxyTicketValidator; +import org.apereo.cas.client.validation.TicketValidator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; @@ -21,21 +21,20 @@ import org.springframework.security.cas.web.CasAuthenticationEntryPoint; import org.springframework.security.cas.web.CasAuthenticationFilter; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler; import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter; - -import javax.annotation.PostConstruct; +import org.springframework.security.web.savedrequest.HttpSessionRequestCache; @Slf4j @Profile({"!dev & !test"}) @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableMethodSecurity(securedEnabled = true) @EnableWebSecurity public class WebSecurityConfiguration { @@ -84,11 +83,6 @@ public CasAuthenticator casAuthenticator() { return new CasAuthenticator(this.webUrlCas, eperusteet_username, eperusteet_password, hostAlb, null, false, null); } - @Bean - public UserDetailsService userDetailsService() { - return new OphUserDetailsServiceImpl(this.hostAlb, RestClientFactoryImpl.CALLER_ID, casAuthenticator()); - } - @Bean public ServiceProperties serviceProperties() { ServiceProperties serviceProperties = new ServiceProperties(); @@ -101,7 +95,7 @@ public ServiceProperties serviceProperties() { @Bean public CasAuthenticationProvider casAuthenticationProvider() { CasAuthenticationProvider casAuthenticationProvider = new CasAuthenticationProvider(); - casAuthenticationProvider.setUserDetailsService(userDetailsService()); + casAuthenticationProvider.setAuthenticationUserDetailsService(new OphUserDetailsServiceImpl()); casAuthenticationProvider.setServiceProperties(serviceProperties()); casAuthenticationProvider.setTicketValidator(ticketValidator()); casAuthenticationProvider.setKey(this.casKey); @@ -147,18 +141,20 @@ public CasAuthenticationEntryPoint casAuthenticationEntryPoint() { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + + HttpSessionRequestCache requestCache = new HttpSessionRequestCache(); + requestCache.setMatchingRequestParameterName(null); + http - .csrf().disable() - .authorizeRequests() - .antMatchers("/buildversion.txt").permitAll() - .antMatchers(HttpMethod.GET, "/api/**").permitAll() - .antMatchers(HttpMethod.GET, "/").permitAll() - .anyRequest().authenticated() - .and() + .headers(AbstractHttpConfigurer::disable) + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests((authorize) -> authorize + .requestMatchers("/buildversion.txt").permitAll() + .requestMatchers(HttpMethod.GET, "/api/**").permitAll() + .requestMatchers(HttpMethod.GET, "/").permitAll() + .anyRequest().authenticated()) .addFilter(casAuthenticationFilter(http)) - .exceptionHandling() - .authenticationEntryPoint(casAuthenticationEntryPoint()) - .and() + .exceptionHandling(handling -> handling.authenticationEntryPoint(casAuthenticationEntryPoint())) .addFilterBefore(singleSignOutFilter(), CasAuthenticationFilter.class) .logout((logout) -> { logout.logoutUrl("/api/logout"); @@ -166,7 +162,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti logout.addLogoutHandler(new HeaderWriterLogoutHandler(new ClearSiteDataHeaderWriter(ClearSiteDataHeaderWriter.Directive.ALL))); logout.invalidateHttpSession(true); }) - .headers().defaultsDisabled().cacheControl(); + .requestCache(cache -> cache.requestCache(requestCache)); return http.build(); } diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfigurationDev.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfigurationDev.java index 77c467e82..801ed1c0d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfigurationDev.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/config/WebSecurityConfigurationDev.java @@ -7,9 +7,11 @@ import org.springframework.http.HttpMethod; import org.springframework.security.access.vote.AffirmativeBased; import org.springframework.security.access.vote.RoleVoter; -import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; +import org.springframework.security.config.Customizer; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -18,34 +20,39 @@ import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler; import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter; +import org.springframework.security.web.savedrequest.HttpSessionRequestCache; import java.util.List; @Profile({"dev"}) @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableMethodSecurity(securedEnabled = true) @EnableWebSecurity public class WebSecurityConfigurationDev { @Bean public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + HttpSessionRequestCache requestCache = new HttpSessionRequestCache(); + requestCache.setMatchingRequestParameterName(null); + http - .httpBasic() - .and() - .csrf().disable() - .authorizeRequests() - .antMatchers("/buildversion.txt").permitAll() - .antMatchers(HttpMethod.GET, "/api/**").permitAll() - .antMatchers(HttpMethod.POST, "/api/**").permitAll() - .antMatchers(HttpMethod.GET, "/").permitAll() - .anyRequest().authenticated() - .and().logout(logout -> { + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests((authorize) -> authorize + .requestMatchers("/buildversion.txt").permitAll() + .requestMatchers(HttpMethod.GET, "/api/**").permitAll() + .requestMatchers(HttpMethod.GET, "/api-docs/**").permitAll() + .requestMatchers(HttpMethod.GET, "/").permitAll() + .requestMatchers(HttpMethod.POST, "/api/dokumentit/pdf/**").permitAll() + .anyRequest().authenticated()) + .httpBasic(Customizer.withDefaults()) + .logout(logout -> { logout.logoutUrl("/api/logout"); logout.logoutSuccessUrl("http://localhost:9040"); logout.addLogoutHandler(new HeaderWriterLogoutHandler(new ClearSiteDataHeaderWriter(ClearSiteDataHeaderWriter.Directive.ALL))); logout.invalidateHttpSession(true); }) - .headers().defaultsDisabled().cacheControl(); + .requestCache(cache -> cache.requestCache(requestCache)); + return http.build(); } diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedEntity.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedEntity.java index ca1deb0b3..0c01fb7bf 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedEntity.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedEntity.java @@ -4,12 +4,12 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import lombok.Getter; import org.hibernate.envers.Audited; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedReferenceableEntity.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedReferenceableEntity.java index e909deea8..71fcf3e17 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedReferenceableEntity.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractAuditedReferenceableEntity.java @@ -1,9 +1,9 @@ package fi.vm.sade.eperusteet.ylops.domain; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractReferenceableEntity.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractReferenceableEntity.java index a3cccb2ed..8aa7bb72f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractReferenceableEntity.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/AbstractReferenceableEntity.java @@ -1,10 +1,10 @@ package fi.vm.sade.eperusteet.ylops.domain; import java.io.Serializable; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; @MappedSuperclass public abstract class AbstractReferenceableEntity implements ReferenceableEntity, Serializable { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/LaajaalainenosaaminenViite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/LaajaalainenosaaminenViite.java index f172d116b..446ec0e0f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/LaajaalainenosaaminenViite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/LaajaalainenosaaminenViite.java @@ -1,7 +1,7 @@ package fi.vm.sade.eperusteet.ylops.domain; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Lukko.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Lukko.java index f56122325..932e6cf49 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Lukko.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Lukko.java @@ -4,12 +4,12 @@ import java.time.Instant; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import lombok.Getter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Termi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Termi.java index f13e58dbd..ca7f03d43 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Termi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Termi.java @@ -6,7 +6,7 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Vuosiluokkakokonaisuusviite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Vuosiluokkakokonaisuusviite.java index e8f5f1126..49278ec68 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Vuosiluokkakokonaisuusviite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/Vuosiluokkakokonaisuusviite.java @@ -5,16 +5,16 @@ import java.util.EnumSet; import java.util.Set; import java.util.UUID; -import javax.persistence.Cacheable; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; import lombok.Getter; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/cache/PerusteCache.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/cache/PerusteCache.java index 254a4ee64..72c5f2887 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/cache/PerusteCache.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/cache/PerusteCache.java @@ -12,21 +12,21 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Immutable; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.SequenceGenerator; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.UniqueConstraint; import java.io.IOException; import java.util.Date; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/Dokumentti.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/Dokumentti.java index d47e0f2d2..e50214952 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/Dokumentti.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/Dokumentti.java @@ -1,11 +1,23 @@ package fi.vm.sade.eperusteet.ylops.domain.dokumentti; import fi.vm.sade.eperusteet.ylops.domain.teksti.Kieli; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import java.util.Date; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/DokumenttiKuva.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/DokumenttiKuva.java index 7b5c54d82..a2f0cf832 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/DokumenttiKuva.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/dokumentti/DokumenttiKuva.java @@ -1,22 +1,21 @@ package fi.vm.sade.eperusteet.ylops.domain.dokumentti; import fi.vm.sade.eperusteet.ylops.domain.teksti.Kieli; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - @Entity @Table(name = "dokumentti_kuva") @Getter diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/koodisto/KoodistoKoodi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/koodisto/KoodistoKoodi.java index 1377fbcb4..d39da6433 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/koodisto/KoodistoKoodi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/koodisto/KoodistoKoodi.java @@ -1,13 +1,13 @@ package fi.vm.sade.eperusteet.ylops.domain.koodisto; import java.io.Serializable; -import javax.persistence.Cacheable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; +import jakarta.persistence.Cacheable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/liite/Liite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/liite/Liite.java index 8804df6a6..fd8207967 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/liite/Liite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/liite/Liite.java @@ -1,22 +1,22 @@ package fi.vm.sade.eperusteet.ylops.domain.liite; +import jakarta.persistence.Basic; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; + import java.io.Serializable; import java.sql.Blob; import java.util.Date; import java.util.UUID; -import javax.persistence.Basic; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.Id; -import javax.persistence.Lob; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import lombok.Getter; @Entity @Table(name = "liite") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019LaajaAlainenOsaaminen.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019LaajaAlainenOsaaminen.java index 4282df8bf..69c6cce1d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019LaajaAlainenOsaaminen.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019LaajaAlainenOsaaminen.java @@ -3,17 +3,16 @@ import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - @Entity @Audited @Table(name = "lops2019_oppiaine_laajaalainenosaaminen") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Opintojakso.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Opintojakso.java index 2535d580e..5090cc2ff 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Opintojakso.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Opintojakso.java @@ -14,16 +14,16 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.validator.constraints.NotEmpty; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksoPoistettu.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksoPoistettu.java index 4ba39dc72..275c4adac 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksoPoistettu.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksoPoistettu.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonKeskeinenSisalto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonKeskeinenSisalto.java index 01d2d0ce0..6df6fd15e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonKeskeinenSisalto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonKeskeinenSisalto.java @@ -8,10 +8,10 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonModuuli.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonModuuli.java index 59b1c3fd2..9ac1baacd 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonModuuli.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonModuuli.java @@ -3,14 +3,16 @@ import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; - @Entity @Audited @Table(name = "lops2019_opintojakson_moduuli") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonOppiaine.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonOppiaine.java index 66f19a3e9..4aeeeb10f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonOppiaine.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonOppiaine.java @@ -5,9 +5,9 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonTavoite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonTavoite.java index c906f7543..6873dca67 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonTavoite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpintojaksonTavoite.java @@ -8,10 +8,10 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpiskeluymparistoTyotavat.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpiskeluymparistoTyotavat.java index 03f077080..a205cc5cc 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpiskeluymparistoTyotavat.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OpiskeluymparistoTyotavat.java @@ -3,10 +3,10 @@ import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Oppiaine.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Oppiaine.java index 1f2c856aa..79d5c259e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Oppiaine.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Oppiaine.java @@ -6,25 +6,25 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.validator.constraints.NotEmpty; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineJarjestys.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineJarjestys.java index ae6209b0f..9f611dc8b 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineJarjestys.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineJarjestys.java @@ -1,15 +1,14 @@ package fi.vm.sade.eperusteet.ylops.domain.lops2019; import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - @Entity @Audited @Table(name = "lops2019_oppiaine_jarjestys") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineenTavoitealue.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineenTavoitealue.java index e37e4efc1..6772794f3 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineenTavoitealue.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019OppiaineenTavoitealue.java @@ -9,13 +9,13 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; import java.util.Set; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019PaikallinenArviointi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019PaikallinenArviointi.java index 578e446ba..c93106ac1 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019PaikallinenArviointi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019PaikallinenArviointi.java @@ -8,10 +8,10 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Sisalto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Sisalto.java index c7f7461d4..f92e730c1 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Sisalto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Sisalto.java @@ -7,7 +7,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoite.java index 1ab9fd3a5..cd0f79394 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoite.java @@ -8,7 +8,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoitteet.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoitteet.java index bbdb7529a..1528cf12d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoitteet.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tavoitteet.java @@ -8,13 +8,13 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tehtava.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tehtava.java index e8f5384fa..7601c8412 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tehtava.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Lops2019Tehtava.java @@ -8,10 +8,10 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/PaikallinenLaajaAlainenOsaaminen.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/PaikallinenLaajaAlainenOsaaminen.java index 2051c0597..e82c980c0 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/PaikallinenLaajaAlainenOsaaminen.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/PaikallinenLaajaAlainenOsaaminen.java @@ -9,7 +9,7 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.hibernate.validator.constraints.NotEmpty; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Poistettu.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Poistettu.java index 413149caa..3279d7c2d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Poistettu.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lops2019/Poistettu.java @@ -4,13 +4,24 @@ import fi.vm.sade.eperusteet.ylops.domain.ops.Opetussuunnitelma; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Entity @@ -24,7 +35,8 @@ public class Poistettu extends AbstractAuditedEntity implements Serializable { @GeneratedValue(strategy = GenerationType.SEQUENCE) private Long id; - @OneToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "opetussuunnitelma_id") @NotNull private Opetussuunnitelma opetussuunnitelma; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuudet.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuudet.java index 1691e6eee..a51dd2312 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuudet.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuudet.java @@ -12,7 +12,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuus.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuus.java index ceb5dbc6b..ea43326fa 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuus.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Aihekokonaisuus.java @@ -10,7 +10,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Kurssi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Kurssi.java index 401b52179..2545a4d7d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Kurssi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Kurssi.java @@ -4,13 +4,21 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml.WhitelistType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import java.util.UUID; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineId.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineId.java index 221ea19f2..7a7ea2caa 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineId.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineId.java @@ -3,8 +3,8 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import java.io.Serializable; @Getter diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineJarjestys.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineJarjestys.java index 79cd662d3..860a97b4f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineJarjestys.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/LukioOppiaineJarjestys.java @@ -7,7 +7,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; @Getter @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Lukiokurssi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Lukiokurssi.java index 757a592b2..680f036be 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Lukiokurssi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/Lukiokurssi.java @@ -8,28 +8,28 @@ import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml.WhitelistType; import fi.vm.sade.eperusteet.ylops.dto.lukio.LukioKurssiParentDto; import fi.vm.sade.eperusteet.ylops.service.util.LambdaUtil.Copyable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ColumnResult; +import jakarta.persistence.ConstructorResult; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedNativeQueries; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.SqlResultSetMapping; +import jakarta.persistence.SqlResultSetMappings; +import jakarta.persistence.Table; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ColumnResult; -import javax.persistence.ConstructorResult; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.JoinColumn; -import javax.persistence.NamedNativeQueries; -import javax.persistence.NamedNativeQuery; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.SqlResultSetMapping; -import javax.persistence.SqlResultSetMappings; -import javax.persistence.Table; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.HashMap; import java.util.HashSet; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpetuksenYleisetTavoitteet.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpetuksenYleisetTavoitteet.java index a143590f8..dcf854249 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpetuksenYleisetTavoitteet.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpetuksenYleisetTavoitteet.java @@ -10,7 +10,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.UUID; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OppiaineLukiokurssi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OppiaineLukiokurssi.java index 9f52c681f..903d99843 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OppiaineLukiokurssi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OppiaineLukiokurssi.java @@ -7,7 +7,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; @Entity @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineId.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineId.java index 9448fd71b..49532f443 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineId.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineId.java @@ -1,8 +1,8 @@ package fi.vm.sade.eperusteet.ylops.domain.lukio; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineParentView.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineParentView.java index 5914b250a..122e54244 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineParentView.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/lukio/OpsOppiaineParentView.java @@ -5,7 +5,7 @@ import java.io.Serializable; import java.util.UUID; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Keskeinensisaltoalue.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Keskeinensisaltoalue.java index 72fbb54f6..4d2b3abac 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Keskeinensisaltoalue.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Keskeinensisaltoalue.java @@ -5,10 +5,10 @@ import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import java.util.UUID; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/OpetuksenKeskeinensisaltoalue.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/OpetuksenKeskeinensisaltoalue.java index 9977a7a0f..966805dcb 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/OpetuksenKeskeinensisaltoalue.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/OpetuksenKeskeinensisaltoalue.java @@ -2,14 +2,22 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import java.io.Serializable; /** diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksenkohdealue.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksenkohdealue.java index 866bc567d..2e5f00d54 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksenkohdealue.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksenkohdealue.java @@ -4,10 +4,10 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksentavoite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksentavoite.java index 3acdac809..b78523625 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksentavoite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Opetuksentavoite.java @@ -10,16 +10,16 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.HashSet; import java.util.Map; import java.util.Optional; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaine.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaine.java index d3a949f37..b2fb257b9 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaine.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaine.java @@ -14,28 +14,28 @@ import fi.vm.sade.eperusteet.ylops.service.util.LambdaUtil.ConstructedCopier; import fi.vm.sade.eperusteet.ylops.service.util.LambdaUtil.Copier; import fi.vm.sade.eperusteet.ylops.service.util.LambdaUtil.Copyable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.BatchSize; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokka.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokka.java index 487cf0895..ed3341563 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokka.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokka.java @@ -7,6 +7,18 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -14,18 +26,6 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokkakokonaisuus.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokkakokonaisuus.java index 217595651..b264ea4ee 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokkakokonaisuus.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Oppiaineenvuosiluokkakokonaisuus.java @@ -4,6 +4,18 @@ import fi.vm.sade.eperusteet.ylops.domain.Vuosiluokka; import fi.vm.sade.eperusteet.ylops.domain.Vuosiluokkakokonaisuusviite; import fi.vm.sade.eperusteet.ylops.domain.teksti.Tekstiosa; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.validation.constraints.NotNull; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; @@ -11,18 +23,6 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.validation.constraints.NotNull; import java.util.HashSet; import java.util.Map; import java.util.Objects; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/PoistettuOppiaine.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/PoistettuOppiaine.java index 4803e2cb0..5f86eec78 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/PoistettuOppiaine.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/PoistettuOppiaine.java @@ -6,7 +6,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Tavoitteenarviointi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Tavoitteenarviointi.java index f20df1873..c7c9e7cd0 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Tavoitteenarviointi.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/Tavoitteenarviointi.java @@ -4,10 +4,10 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/VapaatekstiPaikallinentarkennus.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/VapaatekstiPaikallinentarkennus.java index 190d61997..d0922546f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/VapaatekstiPaikallinentarkennus.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/oppiaine/VapaatekstiPaikallinentarkennus.java @@ -2,19 +2,19 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaData.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaData.java index 2c8f5eb5b..99f28563a 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaData.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaData.java @@ -1,22 +1,25 @@ package fi.vm.sade.eperusteet.ylops.domain.ops; import com.fasterxml.jackson.databind.node.ObjectNode; -import fi.vm.sade.eperusteet.ylops.repository.dialect.JsonBType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import org.hibernate.annotations.*; - -import javax.persistence.*; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import org.hibernate.annotations.Immutable; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import org.springframework.context.annotation.Profile; @Profile("!test") @Entity @Immutable @Table(name = "opetussuunnitelman_julkaisu_data") -@TypeDef(name = "jsonb", defaultForType = JsonBType.class, typeClass = JsonBType.class) public class JulkaistuOpetussuunnitelmaData { @Id @@ -32,7 +35,7 @@ public class JulkaistuOpetussuunnitelmaData { @NotNull @Getter @Setter - @Type(type = "jsonb") + @JdbcTypeCode(SqlTypes.JSON) @Column(name = "opsdata") private ObjectNode opsData; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaTila.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaTila.java index 43e6b47f0..067b66a13 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaTila.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/JulkaistuOpetussuunnitelmaTila.java @@ -1,19 +1,19 @@ package fi.vm.sade.eperusteet.ylops.domain.ops; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.PrePersist; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Kommentti2019.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Kommentti2019.java index 0f33a399e..8c3684685 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Kommentti2019.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Kommentti2019.java @@ -1,13 +1,15 @@ package fi.vm.sade.eperusteet.ylops.domain.ops; import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.UUID; /** diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/KommenttiKahva.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/KommenttiKahva.java index 295a6eb9c..a5c325dce 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/KommenttiKahva.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/KommenttiKahva.java @@ -2,12 +2,20 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.Kieli; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.Immutable; -import javax.persistence.*; -import javax.validation.constraints.NotNull; import java.util.UUID; /** diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Opetussuunnitelma.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Opetussuunnitelma.java index d42ea7647..25d1a7abc 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Opetussuunnitelma.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/Opetussuunnitelma.java @@ -25,6 +25,28 @@ import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; import fi.vm.sade.eperusteet.ylops.service.ops.Identifiable; import fi.vm.sade.eperusteet.ylops.service.ops.OpsIdentifiable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.apache.commons.collections.CollectionUtils; @@ -32,28 +54,6 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.Comparator; import java.util.Date; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmaAikataulu.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmaAikataulu.java index 8daa82065..c7bebd3c6 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmaAikataulu.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmaAikataulu.java @@ -4,20 +4,19 @@ import fi.vm.sade.eperusteet.ylops.domain.AikatauluTapahtuma; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; -import java.util.Date; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -25,6 +24,8 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; +import java.util.Date; + @Getter @Setter @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanJulkaisu.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanJulkaisu.java index 87bcb1643..996729081 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanJulkaisu.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanJulkaisu.java @@ -4,24 +4,24 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.service.util.SecurityUtil; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Immutable; -import javax.persistence.CascadeType; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.PrePersist; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; import java.util.Date; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustieto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustieto.java index cba67e949..94c3652e5 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustieto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustieto.java @@ -4,25 +4,22 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; -import java.io.Serializable; -import java.util.Date; -import java.util.Set; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -30,6 +27,10 @@ import lombok.Setter; import org.hibernate.annotations.Immutable; +import java.io.Serializable; +import java.util.Date; +import java.util.Set; + @Getter @Setter @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustietoLisaparametrit.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustietoLisaparametrit.java index e38866728..e35d3f0ef 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustietoLisaparametrit.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpetussuunnitelmanMuokkaustietoLisaparametrit.java @@ -1,16 +1,17 @@ package fi.vm.sade.eperusteet.ylops.domain.ops; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; -import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Getter @Embeddable @AllArgsConstructor diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsOppiaine.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsOppiaine.java index 9e38823d7..8ef59a07c 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsOppiaine.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsOppiaine.java @@ -2,15 +2,15 @@ import fi.vm.sade.eperusteet.ylops.domain.oppiaine.Oppiaine; import fi.vm.sade.eperusteet.ylops.service.util.LambdaUtil.ConstructedCopier; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Embeddable diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuus.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuus.java index 7cbcd3d0a..835fe6266 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuus.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuus.java @@ -1,18 +1,18 @@ package fi.vm.sade.eperusteet.ylops.domain.ops; import fi.vm.sade.eperusteet.ylops.domain.vuosiluokkakokonaisuus.Vuosiluokkakokonaisuus; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.validation.constraints.NotNull; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Embeddable diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuusLisatieto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuusLisatieto.java index c82c4084c..5103c8014 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuusLisatieto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ops/OpsVuosiluokkakokonaisuusLisatieto.java @@ -6,14 +6,14 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/revision/RevisionInfo.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/revision/RevisionInfo.java index 204467f9f..56a4fcdc2 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/revision/RevisionInfo.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/revision/RevisionInfo.java @@ -2,11 +2,11 @@ import fi.vm.sade.eperusteet.ylops.service.internal.AuditRevisionListener; -import javax.persistence.AttributeOverride; -import javax.persistence.AttributeOverrides; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Kommentti.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Kommentti.java index 881b931af..2c0704a86 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Kommentti.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Kommentti.java @@ -1,12 +1,10 @@ package fi.vm.sade.eperusteet.ylops.domain.teksti; import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedReferenceableEntity; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.validation.constraints.Size; - +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/LokalisoituTeksti.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/LokalisoituTeksti.java index a0c26b32a..e4dbfa79e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/LokalisoituTeksti.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/LokalisoituTeksti.java @@ -6,18 +6,18 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.Immutable; -import javax.persistence.Cacheable; -import javax.persistence.CascadeType; -import javax.persistence.CollectionTable; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Cacheable; +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.io.Serializable; import java.text.Normalizer; import java.util.Collections; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/PoistettuTekstiKappale.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/PoistettuTekstiKappale.java index 09d5456b4..34672bd95 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/PoistettuTekstiKappale.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/PoistettuTekstiKappale.java @@ -6,15 +6,15 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; @Entity diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Teksti.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Teksti.java index 21b08d817..48171b45e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Teksti.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Teksti.java @@ -1,12 +1,13 @@ package fi.vm.sade.eperusteet.ylops.domain.teksti; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; + import java.io.Serializable; import java.util.Objects; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.validation.constraints.NotNull; @Embeddable class Teksti implements Serializable { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappale.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappale.java index 8a9a30c33..db8d1600d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappale.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappale.java @@ -6,23 +6,23 @@ import fi.vm.sade.eperusteet.ylops.domain.Tila; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.UUID; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappaleViite.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappaleViite.java index 1c23418d3..8dacd2187 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappaleViite.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/TekstiKappaleViite.java @@ -3,26 +3,26 @@ import fi.vm.sade.eperusteet.ylops.domain.HistoriaTapahtuma; import fi.vm.sade.eperusteet.ylops.domain.ReferenceableEntity; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.NamedNativeQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.BatchSize; import org.hibernate.envers.Audited; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.NamedNativeQuery; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Tekstiosa.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Tekstiosa.java index a7d238385..fd570323f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Tekstiosa.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/teksti/Tekstiosa.java @@ -6,14 +6,14 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.io.Serializable; @Audited diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ukk/Kysymys.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ukk/Kysymys.java index c6db060e0..b2be4c509 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ukk/Kysymys.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/ukk/Kysymys.java @@ -3,13 +3,19 @@ import fi.vm.sade.eperusteet.ylops.domain.AbstractAuditedEntity; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.Size; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtml.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtml.java index e157230d8..2734f0ee3 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtml.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtml.java @@ -1,9 +1,9 @@ package fi.vm.sade.eperusteet.ylops.domain.validation; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import org.jsoup.safety.Safelist; -import javax.validation.Constraint; -import javax.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlCollectionValidator.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlCollectionValidator.java index a8473e0f0..c99a454b8 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlCollectionValidator.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlCollectionValidator.java @@ -1,9 +1,9 @@ package fi.vm.sade.eperusteet.ylops.domain.validation; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; import java.util.Collection; public class ValidHtmlCollectionValidator extends ValidHtmlValidatorBase implements diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlValidator.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlValidator.java index 082efb580..1941fe093 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlValidator.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/validation/ValidHtmlValidator.java @@ -1,9 +1,8 @@ package fi.vm.sade.eperusteet.ylops.domain.validation; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; - -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidHtmlValidator extends ValidHtmlValidatorBase implements ConstraintValidator { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Laajaalainenosaaminen.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Laajaalainenosaaminen.java index 380fa3b0f..1b210e35d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Laajaalainenosaaminen.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Laajaalainenosaaminen.java @@ -4,20 +4,19 @@ import fi.vm.sade.eperusteet.ylops.domain.LaajaalainenosaaminenViite; import fi.vm.sade.eperusteet.ylops.domain.teksti.LokalisoituTeksti; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Embedded; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; - @Entity @Audited @Table(name = "vlkok_laaja_osaaminen") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Vuosiluokkakokonaisuus.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Vuosiluokkakokonaisuus.java index f286cf110..ad777118f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Vuosiluokkakokonaisuus.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/domain/vuosiluokkakokonaisuus/Vuosiluokkakokonaisuus.java @@ -9,23 +9,23 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.Tekstiosa; import fi.vm.sade.eperusteet.ylops.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.ylops.dto.navigation.NavigationType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuudetJarjestaDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuudetJarjestaDto.java index 345e4cb4a..6bae9cd00 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuudetJarjestaDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuudetJarjestaDto.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusJarjestysDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusJarjestysDto.java index 6ae6b8888..34f35c01f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusJarjestysDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusJarjestysDto.java @@ -1,11 +1,10 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; - @Data @AllArgsConstructor @NoArgsConstructor diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusSaveDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusSaveDto.java index 81fe622e7..f02c496ac 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusSaveDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/AihekokonaisuusSaveDto.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; import fi.vm.sade.eperusteet.ylops.dto.teksti.LokalisoituTekstiDto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Data diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioAbstraktiOppiaineTuontiDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioAbstraktiOppiaineTuontiDto.java index e1ac27ef8..db9d59319 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioAbstraktiOppiaineTuontiDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioAbstraktiOppiaineTuontiDto.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; import fi.vm.sade.eperusteet.ylops.dto.teksti.LokalisoituTekstiDto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.UUID; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioKopioiOppimaaraDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioKopioiOppimaaraDto.java index da71073ca..04f0fe5c7 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioKopioiOppimaaraDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukioKopioiOppimaaraDto.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; import fi.vm.sade.eperusteet.ylops.dto.teksti.LokalisoituTekstiDto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.util.UUID; @Data diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiOppaineMuokkausDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiOppaineMuokkausDto.java index ec296ecad..8ac7cee24 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiOppaineMuokkausDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiOppaineMuokkausDto.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.ylops.dto.lukio; import fi.vm.sade.eperusteet.ylops.dto.IdHolder; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiSaveDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiSaveDto.java index 0a8dd4eae..a1520a7c8 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiSaveDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiSaveDto.java @@ -3,11 +3,11 @@ import fi.vm.sade.eperusteet.ylops.domain.lukio.LukiokurssiTyyppi; import fi.vm.sade.eperusteet.ylops.dto.teksti.LokalisoituTekstiDto; import fi.vm.sade.eperusteet.ylops.service.external.impl.perustedto.TekstiOsaDto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiUpdateDto.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiUpdateDto.java index eed5a5e2a..b644d7a9e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiUpdateDto.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/dto/lukio/LukiokurssiUpdateDto.java @@ -3,11 +3,11 @@ import fi.vm.sade.eperusteet.ylops.domain.lukio.LukiokurssiTyyppi; import fi.vm.sade.eperusteet.ylops.dto.teksti.LokalisoituTekstiDto; import fi.vm.sade.eperusteet.ylops.service.external.impl.perustedto.TekstiOsaDto; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/OphSessionMappingStorage.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/OphSessionMappingStorage.java index dd31b6cee..69f7e477b 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/OphSessionMappingStorage.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/OphSessionMappingStorage.java @@ -1,6 +1,7 @@ package fi.vm.sade.eperusteet.ylops.repository; -import org.jasig.cas.client.session.SessionMappingStorage; + +import org.apereo.cas.client.session.SessionMappingStorage; public interface OphSessionMappingStorage extends SessionMappingStorage { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/custom/OphSessionMappingStorageImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/custom/OphSessionMappingStorageImpl.java index 7100c0939..8f08762a5 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/custom/OphSessionMappingStorageImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/custom/OphSessionMappingStorageImpl.java @@ -1,21 +1,20 @@ package fi.vm.sade.eperusteet.ylops.repository.custom; import fi.vm.sade.eperusteet.ylops.repository.OphSessionMappingStorage; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SingleColumnRowMapper; import org.springframework.session.Session; import org.springframework.session.SessionRepository; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; import java.time.Duration; import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.Objects; import java.util.Optional; -import java.util.Set; public class OphSessionMappingStorageImpl implements OphSessionMappingStorage { @@ -112,52 +111,26 @@ public int getMaxInactiveInterval() { return (int) session.getMaxInactiveInterval().getSeconds(); } - @Override - public javax.servlet.http.HttpSessionContext getSessionContext() { - return new EmptyHttpSessionContext(); - } - @Override public Object getAttribute(String name) { return session.getAttribute(name); } - @Override - public Object getValue(String name) { - return getAttribute(name); - } - @Override public Enumeration getAttributeNames() { return Collections.enumeration(session.getAttributeNames()); } - @Override - public String[] getValueNames() { - Set attributeNames = session.getAttributeNames(); - return attributeNames.toArray(new String[attributeNames.size()]); - } - @Override public void setAttribute(String name, Object value) { session.setAttribute(name, value); } - @Override - public void putValue(String name, Object value) { - setAttribute(name, value); - } - @Override public void removeAttribute(String name) { session.removeAttribute(name); } - @Override - public void removeValue(String name) { - removeAttribute(name); - } - @Override public void invalidate() { sessionRepository.deleteById(session.getId()); @@ -169,17 +142,4 @@ public boolean isNew() { } } - @SuppressWarnings("deprecation") - private static class EmptyHttpSessionContext implements javax.servlet.http.HttpSessionContext { - - @Override - public HttpSession getSession(String sessionId) { - return null; - } - - @Override - public Enumeration getIds() { - return Collections.emptyEnumeration(); - } - } } \ No newline at end of file diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/dialect/JsonBType.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/dialect/JsonBType.java index a4edffc92..7bbdd8ff1 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/dialect/JsonBType.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/dialect/JsonBType.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import fi.vm.sade.eperusteet.ylops.resource.config.InitJacksonConverter; import fi.vm.sade.eperusteet.ylops.service.exception.BusinessRuleViolationException; @@ -23,8 +22,8 @@ public class JsonBType implements UserType, Serializable { private final ObjectMapper mapper = InitJacksonConverter.createMapper(); @Override - public int[] sqlTypes() { - return new int[]{Types.JAVA_OBJECT}; + public int getSqlType() { + return Types.JAVA_OBJECT; } @Override @@ -37,20 +36,6 @@ public boolean equals(Object x, Object y) throws HibernateException { return Objects.equals(x, y); } - @Override - public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner) throws HibernateException, SQLException { - String str = rs.getString(names[0]); - if (str != null) { - try { - JsonNode node = mapper.readTree(str); - return node; - } catch (IOException e) { - throw new BusinessRuleViolationException("datan-luku-epaonnistui"); - } - } - return JsonNodeFactory.instance.objectNode(); - } - @Override public void nullSafeSet(PreparedStatement st, Object value, int index, SharedSessionContractImplementor session) throws HibernateException, SQLException { if (value != null) { @@ -84,6 +69,11 @@ public int hashCode(Object x) throws HibernateException { return 0; } + @Override + public Object nullSafeGet(ResultSet rs, int position, SharedSessionContractImplementor session, Object owner) throws SQLException { + return null; + } + @Override public boolean isMutable() { return false; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/impl/JulkaisuRepositoryImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/impl/JulkaisuRepositoryImpl.java index 5811a4140..8a39ba4d3 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/impl/JulkaisuRepositoryImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/impl/JulkaisuRepositoryImpl.java @@ -7,9 +7,9 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Repository; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.PersistenceException; import java.io.IOException; @Profile("!test") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/liite/impl/LiiteRepositoryImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/liite/impl/LiiteRepositoryImpl.java index 0ef3f4772..ff105456d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/liite/impl/LiiteRepositoryImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/liite/impl/LiiteRepositoryImpl.java @@ -2,14 +2,14 @@ import fi.vm.sade.eperusteet.ylops.domain.liite.Liite; import fi.vm.sade.eperusteet.ylops.repository.liite.LiiteRepositoryCustom; +import jakarta.persistence.EntityManager; +import org.apache.commons.io.IOUtils; +import org.hibernate.engine.jdbc.BlobProxy; +import org.springframework.beans.factory.annotation.Autowired; +import java.io.IOException; import java.io.InputStream; import java.sql.Blob; -import javax.persistence.EntityManager; - -import org.hibernate.Hibernate; -import org.hibernate.Session; -import org.springframework.beans.factory.annotation.Autowired; public class LiiteRepositoryImpl implements LiiteRepositoryCustom { @@ -18,8 +18,12 @@ public class LiiteRepositoryImpl implements LiiteRepositoryCustom { @Override public Liite add(String tyyppi, String nimi, long length, InputStream is) { - Session session = em.unwrap(Session.class); - Blob blob = Hibernate.getLobCreator(session).createBlob(is, length); + Blob blob = null; + try { + blob = BlobProxy.generateProxy(IOUtils.toByteArray(is)); + } catch (IOException e) { + throw new RuntimeException(e); + } Liite liite = new Liite(tyyppi, nimi, blob); em.persist(liite); return liite; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/lops2019/PoistetutRepository.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/lops2019/PoistetutRepository.java index 2e52cf65d..239add30d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/lops2019/PoistetutRepository.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/lops2019/PoistetutRepository.java @@ -17,7 +17,7 @@ public interface PoistetutRepository extends JpaWithVersioningRepository findAllByTyyppi(@Param("tyyppi") Tyyppi tyyppi, @Param("organisaatiot") Collection organisaatiot); String limitedPagedOpetussuunnitelmat = - "FROM Opetussuunnitelma o " + - "JOIN o.organisaatiot org " + - "LEFT JOIN o.nimi nimi " + + "FROM Opetussuunnitelma ops " + + "JOIN ops.organisaatiot org " + + "LEFT JOIN ops.nimi nimi " + "LEFT JOIN nimi.teksti teksti " + - "WHERE o.tyyppi = :tyyppi " + + "WHERE ops.tyyppi = :tyyppi " + "AND ( " + - " (:tila = 'JULKAISTU' AND o.tila != 'POISTETTU' AND (o.julkaisut IS NOT EMPTY OR o.tila = 'JULKAISTU')) " + - " OR (:tila = 'POISTETTU' AND o.tila = :tila)" + - " OR (o.tila = :tila AND o.julkaisut IS EMPTY)" + + " (:tila = fi.vm.sade.eperusteet.ylops.domain.Tila.JULKAISTU AND ops.tila != fi.vm.sade.eperusteet.ylops.domain.Tila.POISTETTU AND (ops.julkaisut IS NOT EMPTY OR ops.tila = fi.vm.sade.eperusteet.ylops.domain.Tila.JULKAISTU)) " + + " OR (:tila = fi.vm.sade.eperusteet.ylops.domain.Tila.POISTETTU AND ops.tila = :tila)" + + " OR (ops.tila = :tila AND ops.julkaisut IS EMPTY)" + " ) " + - "AND (coalesce(:nimi, null) IS NULL or LOWER(teksti.teksti) LIKE LOWER(CONCAT('%',:nimi,'%'))) " + + "AND (:nimi IS NULL or LOWER(teksti.teksti) LIKE LOWER(CONCAT('%',:nimi,'%'))) " + "AND teksti.kieli = :kieli " + - "AND (:koulutustyyppi = '' or o.koulutustyyppi = :koulutustyyppi) "; + "AND (:koulutustyyppi IS NULL or ops.koulutustyyppi = :koulutustyyppi) "; String limitedPagedOpetussuunnitelmatOrganisaatiot = "AND org IS NOT NULL AND org IN (:organisaatiot)"; @Query( - value = "SELECT DISTINCT o, teksti.teksti " + limitedPagedOpetussuunnitelmat + limitedPagedOpetussuunnitelmatOrganisaatiot, - countQuery = "SELECT COUNT(distinct o) " + limitedPagedOpetussuunnitelmat + limitedPagedOpetussuunnitelmatOrganisaatiot) + value = "SELECT DISTINCT ops, teksti.teksti " + limitedPagedOpetussuunnitelmat + limitedPagedOpetussuunnitelmatOrganisaatiot, + countQuery = "SELECT COUNT(distinct ops) " + limitedPagedOpetussuunnitelmat + limitedPagedOpetussuunnitelmatOrganisaatiot) Page findSivutettu( @Param("tyyppi") Tyyppi tyyppi, - @Param("tila") String tila, + @Param("tila") Tila tila, @Param("nimi") String nimi, - @Param("koulutustyyppi") String koulutusTyyppi, + @Param("koulutustyyppi") KoulutusTyyppi koulutusTyyppi, @Param("organisaatiot") Collection organisaatiot, @Param("kieli") Kieli kieli, - Pageable pageable ); @Query( - value = "SELECT DISTINCT o, teksti.teksti " + limitedPagedOpetussuunnitelmat, - countQuery = "SELECT COUNT(distinct o) " + limitedPagedOpetussuunnitelmat) + value = "SELECT DISTINCT ops, teksti.teksti " + limitedPagedOpetussuunnitelmat, + countQuery = "SELECT COUNT(distinct ops) " + limitedPagedOpetussuunnitelmat) Page findSivutettuAdmin( @Param("tyyppi") Tyyppi tyyppi, - @Param("tila") String tila, + @Param("tila") Tila tila, @Param("nimi") String nimi, - @Param("koulutustyyppi") String koulutusTyyppi, + @Param("koulutustyyppi") KoulutusTyyppi koulutusTyyppi, @Param("kieli") Kieli kieli, Pageable pageable ); diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/teksti/impl/TekstikappaleviiteRepositoryImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/teksti/impl/TekstikappaleviiteRepositoryImpl.java index 5a1a191b9..5ac4ad296 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/teksti/impl/TekstikappaleviiteRepositoryImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/teksti/impl/TekstikappaleviiteRepositoryImpl.java @@ -4,8 +4,8 @@ import fi.vm.sade.eperusteet.ylops.domain.teksti.TekstiKappaleViite; import fi.vm.sade.eperusteet.ylops.repository.teksti.TekstikappaleviiteRepositoryCustom; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; public class TekstikappaleviiteRepositoryImpl implements TekstikappaleviiteRepositoryCustom { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryFactoryBean.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryFactoryBean.java index 230337c92..32c2925c9 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryFactoryBean.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryFactoryBean.java @@ -10,7 +10,7 @@ import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.RepositoryFactorySupport; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.io.Serializable; public class JpaWithVersioningRepositoryFactoryBean, T, ID extends Serializable> extends JpaRepositoryFactoryBean { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryImpl.java index 3ff17f7c8..9f2daf4cd 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/repository/version/JpaWithVersioningRepositoryImpl.java @@ -3,19 +3,20 @@ import fi.vm.sade.eperusteet.ylops.domain.revision.Revision; import fi.vm.sade.eperusteet.ylops.domain.revision.RevisionInfo; import fi.vm.sade.eperusteet.ylops.domain.revision.RevisionInfo_; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import org.hibernate.envers.AuditReader; +import org.hibernate.envers.AuditReaderFactory; +import org.hibernate.envers.query.AuditEntity; +import org.springframework.data.jpa.repository.support.JpaEntityInformation; +import org.springframework.data.jpa.repository.support.SimpleJpaRepository; + import java.io.Serializable; import java.util.ArrayList; import java.util.Comparator; import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.query.AuditEntity; -import org.springframework.data.jpa.repository.support.JpaEntityInformation; -import org.springframework.data.jpa.repository.support.SimpleJpaRepository; class JpaWithVersioningRepositoryImpl extends SimpleJpaRepository implements JpaWithVersioningRepository { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/ExceptionHandlingConfig.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/ExceptionHandlingConfig.java index 9bae53f55..82a7721e0 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/ExceptionHandlingConfig.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/ExceptionHandlingConfig.java @@ -4,6 +4,12 @@ import fi.vm.sade.eperusteet.ylops.service.exception.NotExistsException; import fi.vm.sade.eperusteet.ylops.service.exception.ServiceException; import fi.vm.sade.eperusteet.ylops.service.exception.ValidointiException; +import jakarta.annotation.Nullable; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; @@ -14,6 +20,7 @@ import org.springframework.core.NestedRuntimeException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; @@ -32,11 +39,6 @@ import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; import java.io.IOException; import java.security.Principal; import java.util.ArrayList; @@ -59,8 +61,7 @@ public ResponseEntity handleTransactionExceptions(TransactionSystemExcep } @Override - protected ResponseEntity handleHttpMessageNotReadable(HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatus status, - WebRequest request) { + protected ResponseEntity handleHttpMessageNotReadable(HttpMessageNotReadableException ex, HttpHeaders headers, HttpStatusCode status, WebRequest request) { if (ex.getRootCause() != null && ex.getRootCause() instanceof UnrecognizedPropertyException) { return handleExceptionInternal((UnrecognizedPropertyException) ex.getRootCause(), null, headers, status, request); } else { @@ -103,7 +104,7 @@ private void describe(Map map, String koodi, String selkokieline } @Override - protected ResponseEntity handleExceptionInternal(Exception ex, Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { + protected ResponseEntity handleExceptionInternal(Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatusCode status, WebRequest request) { Map map = new HashMap<>(); boolean suppresstrace = false; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/InternalApi.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/InternalApi.java deleted file mode 100644 index 67277071c..000000000 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/config/InternalApi.java +++ /dev/null @@ -1,12 +0,0 @@ -package fi.vm.sade.eperusteet.ylops.resource.config; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Retention(RetentionPolicy.RUNTIME) -@Target(value = {ElementType.METHOD, ElementType.TYPE}) -public @interface InternalApi { - -} diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/dokumentti/DokumenttiController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/dokumentti/DokumenttiController.java index 85102cfb2..a43bbff6e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/dokumentti/DokumenttiController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/dokumentti/DokumenttiController.java @@ -12,7 +12,7 @@ import fi.vm.sade.eperusteet.ylops.service.exception.DokumenttiException; import fi.vm.sade.eperusteet.ylops.service.mapping.DtoMapper; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FilenameUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +36,7 @@ import java.util.Objects; @Slf4j -@Api("Dokumentit") +@Tag(name = "Dokumentit") @RestController @RequestMapping("/api/dokumentit") public class DokumenttiController { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/external/UlkopuolisetController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/external/UlkopuolisetController.java index af198c0b8..4be607b83 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/external/UlkopuolisetController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/external/UlkopuolisetController.java @@ -17,10 +17,13 @@ import fi.vm.sade.eperusteet.ylops.service.external.KayttajanTietoService; import fi.vm.sade.eperusteet.ylops.service.external.KoodistoService; import fi.vm.sade.eperusteet.ylops.service.external.OrganisaatioService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -31,7 +34,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.Map; @@ -42,8 +44,7 @@ @RestController @RequestMapping("/api/ulkopuoliset") -@ApiIgnore -@Api("Ulkopuoliset") +@Tag(name = "Ulkopuoliset") public class UlkopuolisetController { @Autowired @@ -128,34 +129,33 @@ public ResponseEntity getTiedotteet(@RequestParam(value = "jalkeen", r @RequestMapping(value = "/tiedotteet/haku", method = GET) @ResponseBody - @ApiOperation(value = "tiedotteiden haku") - @ApiImplicitParams({ - @ApiImplicitParam(name = "sivu", dataType = "long", paramType = "query"), - @ApiImplicitParam(name = "sivukoko", dataType = "long", paramType = "query"), - @ApiImplicitParam(name = "kieli", dataType = "string", paramType = "query", allowMultiple = true, value = "tiedotteen kieli"), - @ApiImplicitParam(name = "nimi", dataType = "string", paramType = "query", value = "hae nimellä"), - @ApiImplicitParam(name = "perusteId", dataType = "long", paramType = "query", value = "hae perusteeseen liitetyt tiedotteet"), - @ApiImplicitParam(name = "perusteeton", dataType = "boolean", paramType = "query", value = "hae perusteettomat tiedotteet"), - @ApiImplicitParam(name = "julkinen", dataType = "boolean", paramType = "query", value = "hae julkiset tiedotteet"), - @ApiImplicitParam(name = "yleinen", dataType = "boolean", paramType = "query", value = "hae yleiset tiedotteet"), - @ApiImplicitParam(name = "tiedoteJulkaisuPaikka", dataType = "string", paramType = "query", allowMultiple = true, value = "tiedotteen julkaisupaikat"), - @ApiImplicitParam(name = "perusteIds", dataType = "long", paramType = "query", allowMultiple = true, value = "tiedotteen perusteiden"), - @ApiImplicitParam(name = "koulutusTyyppi", dataType = "string", paramType = "query", allowMultiple = true, value = "tiedotteen koulutustyypit"), - @ApiImplicitParam(name = "jarjestys", dataType = "string", paramType = "query", allowMultiple = false, value = "tiedotteen jarjestys"), - @ApiImplicitParam(name = "jarjestysNouseva", dataType = "boolean", paramType = "query", allowMultiple = false, value = "tiedotteen jarjestyksen suunta") + @Operation(summary = "tiedotteiden haku") + @Parameters({ + @Parameter(name = "sivu", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), + @Parameter(name = "sivukoko", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), + @Parameter(name = "kieli", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "tiedotteen kieli"), + @Parameter(name = "nimi", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "hae nimellä"), + @Parameter(name = "perusteId", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY, description = "hae perusteeseen liitetyt tiedotteet"), + @Parameter(name = "perusteeton", schema = @Schema(implementation = Boolean.class), in = ParameterIn.QUERY, description = "hae perusteettomat tiedotteet"), + @Parameter(name = "julkinen", schema = @Schema(implementation = Boolean.class), in = ParameterIn.QUERY, description = "hae julkiset tiedotteet"), + @Parameter(name = "yleinen", schema = @Schema(implementation = Boolean.class), in = ParameterIn.QUERY, description = "hae yleiset tiedotteet"), + @Parameter(name = "tiedoteJulkaisuPaikka", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "tiedotteen julkaisupaikat"), + @Parameter(name = "perusteIds", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "long")), description = "tiedotteen perusteiden"), + @Parameter(name = "koulutusTyyppi", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "tiedotteen koulutustyypit"), + @Parameter(name = "jarjestys", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "tiedotteen jarjestys"), + @Parameter(name = "jarjestysNouseva", schema = @Schema(implementation = Boolean.class), in = ParameterIn.QUERY, description = "tiedotteen jarjestyksen suunta") }) - public ResponseEntity getTiedotteetHaku(@ApiIgnore TiedoteQueryDto queryDto) { + public ResponseEntity getTiedotteetHaku(@Parameter(hidden = true) TiedoteQueryDto queryDto) { return ResponseEntity.ok(eperusteetService.getTiedotteetHaku(queryDto)); } @RequestMapping(value = "/organisaatiot/koulutustoimijat", method = GET) @ResponseBody - @ApiImplicitParams({ - @ApiImplicitParam(name = "kunta", dataType = "string", allowMultiple = true, paramType = "query"), - @ApiImplicitParam(name = "oppilaitostyyppi", dataType = "string", allowMultiple = true, paramType = "query") + @Parameters({ + @Parameter(name = "kunta", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string"))), + @Parameter(name = "oppilaitostyyppi", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string"))) }) - public ResponseEntity> getKoulutustoimijat( - OrganisaatioQueryDto query) { + public ResponseEntity> getKoulutustoimijat(@Parameter(hidden = true) OrganisaatioQueryDto query) { List toimijat = organisaatioService.getKoulutustoimijat(query); return new ResponseEntity<>(toimijat, HttpStatus.OK); } @@ -169,9 +169,9 @@ public ResponseEntity getOrganisaatio(@PathVariable(value = "oid") fin @RequestMapping(value = "/organisaatiot/virkailijat", method = GET) @ResponseBody - @ApiOperation(value = "virkailijoiden haku") - @ApiImplicitParams({ - @ApiImplicitParam(name = "oid", dataType = "string", paramType = "query", allowMultiple = true, value = "organisaation oid") + @Operation(summary = "virkailijoiden haku") + @Parameters({ + @Parameter(name = "oid", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "organisaation oid") }) public ResponseEntity getOrganisaatioVirkailijat(VirkailijaQueryDto dto) { JsonNode virkailijat = organisaatioService.getOrganisaatioVirkailijat(dto.getOid()); diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/hallinta/MaintenanceController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/hallinta/MaintenanceController.java index 6f2125268..86772230b 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/hallinta/MaintenanceController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/hallinta/MaintenanceController.java @@ -1,9 +1,8 @@ package fi.vm.sade.eperusteet.ylops.resource.hallinta; import fi.vm.sade.eperusteet.ylops.domain.KoulutusTyyppi; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.util.MaintenanceService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.CacheManager; import org.springframework.context.annotation.Profile; @@ -19,11 +18,10 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET; -@InternalApi @RestController @RequestMapping(value = "/api/maintenance") @Profile("!test") -@Api("Maintenance") +@Tag(name = "Maintenance") public class MaintenanceController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/julkinen/ExternalController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/julkinen/ExternalController.java index 419eaa637..542b6ee41 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/julkinen/ExternalController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/julkinen/ExternalController.java @@ -5,10 +5,17 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaJulkaistuQuery; import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaJulkinenDto; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Description; import org.springframework.data.domain.Page; @@ -21,7 +28,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; @@ -31,7 +37,7 @@ @CrossOrigin @RestController @RequestMapping(value = "/api/external", produces = "application/json;charset=UTF-8") -@Api(value = "Julkinen") +@Tag(name = "Julkinen") @Description("Opetussuunnitelminen julkinen rajapinta") public class ExternalController { @@ -40,21 +46,21 @@ public class ExternalController { private static final int DEFAULT_PATH_SKIP_VALUE = 5; - @ApiOperation(value = "Opetussuunnitelmien haku") + @Operation(summary = "Opetussuunnitelmien haku") @RequestMapping(method = RequestMethod.GET, value = "/opetussuunnitelmat") - @ApiImplicitParams({ - @ApiImplicitParam(name = "nimi", dataType = "string", paramType = "query", value = "nimi"), - @ApiImplicitParam(name = "kieli", dataType = "string", paramType = "query"), - @ApiImplicitParam(name = "perusteenDiaarinumero", dataType = "string", paramType = "query", value = "perusteenDiaarinumero"), - @ApiImplicitParam(name = "koulutustyypit", dataType = "string", paramType = "query", allowMultiple = true, value = "koulutustyypit"), - @ApiImplicitParam(name = "sivu", dataType = "long", paramType = "query"), - @ApiImplicitParam(name = "sivukoko", dataType = "long", paramType = "query"), + @Parameters({ + @Parameter(name = "nimi", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "nimi"), + @Parameter(name = "kieli", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string"))), + @Parameter(name = "perusteenDiaarinumero", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "perusteenDiaarinumero"), + @Parameter(name = "koulutustyypit", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "koulutustyypit"), + @Parameter(name = "sivu", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), + @Parameter(name = "sivukoko", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), }) public Page getOpetussuunnitelmat(OpetussuunnitelmaJulkaistuQuery query) { return opetussuunnitelmaService.getAllJulkaistutOpetussuunnitelmat(query); } - @ApiOperation(value = "Opetussuunnitelman tietojen haku") + @Operation(summary = "Opetussuunnitelman tietojen haku") @RequestMapping(value = "/opetussuunnitelma/{opetussuunnitelmaId}", method = RequestMethod.GET) public ResponseEntity getExternalOpetussuunnitelma(@PathVariable("opetussuunnitelmaId") final Long opetussuunnitelmaId) { return new ResponseEntity<>(opetussuunnitelmaService.getOpetussuunnitelmaJulkaistuSisalto(opetussuunnitelmaId), HttpStatus.OK); @@ -62,16 +68,18 @@ public ResponseEntity getExternalOpetussuunnitelma(@ @RequestMapping(value = "/opetussuunnitelma/{opetussuunnitelmaId:\\d+}/**", method = GET) @ResponseBody - @ApiOperation( - value = "Opetussuunnitelman tietojen haku tarkalla sisältörakenteella", - notes = "Url parametreiksi voi antaa opetussuunnitelman id:n lisäksi erilaisia opetussuunnitelman rakenteen osia ja id-kenttien arvoja. Esim. /opetussuunnitelma/11548134/opintojaksot/15598911/nimi/fi antaa opetussuunnitelman (id: 11548134) opintojaksojen tietueen (id: 15598911) nimen suomenkielisenä.", - response= OpetussuunnitelmaJulkinenDto.class + @Operation( + summary = "Opetussuunnitelman tietojen haku tarkalla sisältörakenteella", + description = "Url parametreiksi voi antaa opetussuunnitelman id:n lisäksi erilaisia opetussuunnitelman rakenteen osia ja id-kenttien arvoja. Esim. /opetussuunnitelma/11548134/opintojaksot/15598911/nimi/fi antaa opetussuunnitelman (id: 11548134) opintojaksojen tietueen (id: 15598911) nimen suomenkielisenä." ) + @ApiResponses(value = { + @ApiResponse(responseCode = "200", content = {@Content(mediaType = "application/json", schema = @Schema(implementation = OpetussuunnitelmaJulkinenDto.class))}), + }) public ResponseEntity getOpetussuunnitelmaDynamicQuery(HttpServletRequest req, @PathVariable("opetussuunnitelmaId") final long id) { return getJulkaistuSisaltoObjectNodeWithQuery(id, requestToQueries(req, DEFAULT_PATH_SKIP_VALUE)); } - @ApiOperation(value = "Opetussuunnitelman perusteen haku. Palauttaa perusteen version, mikä opetussuunnitelmalla oli käytössä opetussuunnitelman julkaisun hetkellä.") + @Operation(summary = "Opetussuunnitelman perusteen haku. Palauttaa perusteen version, mikä opetussuunnitelmalla oli käytössä opetussuunnitelman julkaisun hetkellä.") @RequestMapping(value = "/opetussuunnitelma/{id}/peruste", method = RequestMethod.GET) public ResponseEntity getExternalOpetussuunnitelmanPeruste(@PathVariable("id") final Long id) { return new ResponseEntity<>(opetussuunnitelmaService.getJulkaistuOpetussuunnitelmaPeruste(id), HttpStatus.OK); diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/kommentointi/KommentointiController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/kommentointi/KommentointiController.java index a92b9df99..45e01312a 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/kommentointi/KommentointiController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/kommentointi/KommentointiController.java @@ -3,18 +3,24 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.Kommentti2019Dto; import fi.vm.sade.eperusteet.ylops.dto.ops.KommenttiKahvaDto; import fi.vm.sade.eperusteet.ylops.service.ops.Kommentti2019Service; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; import java.util.UUID; -import static org.springframework.web.bind.annotation.RequestMethod.*; +import static org.springframework.web.bind.annotation.RequestMethod.DELETE; +import static org.springframework.web.bind.annotation.RequestMethod.GET; +import static org.springframework.web.bind.annotation.RequestMethod.POST; +import static org.springframework.web.bind.annotation.RequestMethod.PUT; @RestController @RequestMapping("/api/kommentointi") -@Api("Kommentointi") +@Tag(name = "Kommentointi") public class KommentointiController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019Controller.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019Controller.java index 0097a85ed..ced3fb9b0 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019Controller.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019Controller.java @@ -1,11 +1,10 @@ package fi.vm.sade.eperusteet.ylops.resource.lops2019; import fi.vm.sade.eperusteet.ylops.dto.lops2019.Lops2019PoistettuDto; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.lops2019.Lops2019Service; import fi.vm.sade.eperusteet.ylops.service.ops.PoistoService; import fi.vm.sade.eperusteet.ylops.service.ops.ValidointiService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,8 +15,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/lops2019") -@Api("Lops2019") -@InternalApi +@Tag(name = "Lops2019") public class Lops2019Controller { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OpintojaksoController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OpintojaksoController.java index d850cf057..c0bafe966 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OpintojaksoController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OpintojaksoController.java @@ -6,8 +6,7 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaDto; import fi.vm.sade.eperusteet.ylops.service.lops2019.Lops2019OpintojaksoService; import fi.vm.sade.eperusteet.ylops.service.util.UpdateWrapperDto; -import io.swagger.annotations.Api; -import java.util.List; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -16,9 +15,11 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/lops2019/opintojaksot") -@Api("Lops2019Opintojaksot") +@Tag(name = "Lops2019Opintojaksot") public class Lops2019OpintojaksoController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OppiaineController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OppiaineController.java index 1221e1f2f..0c67655b3 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OppiaineController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019OppiaineController.java @@ -6,8 +6,7 @@ import fi.vm.sade.eperusteet.ylops.dto.lops2019.Lops2019PaikallinenOppiaineDto; import fi.vm.sade.eperusteet.ylops.service.lops2019.Lops2019OppiaineService; import fi.vm.sade.eperusteet.ylops.service.util.UpdateWrapperDto; -import io.swagger.annotations.Api; -import java.util.List; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -15,9 +14,11 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/lops2019/oppiaineet") -@Api("Lops2019Oppiaineet") +@Tag(name = "Lops2019Oppiaineet") public class Lops2019OppiaineController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019PerusteController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019PerusteController.java index 82c8b6194..f6c3edafb 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019PerusteController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/lops2019/Lops2019PerusteController.java @@ -6,7 +6,7 @@ import fi.vm.sade.eperusteet.ylops.service.external.EperusteetService; import fi.vm.sade.eperusteet.ylops.service.external.impl.perustedto.TekstiKappaleViiteDto; import fi.vm.sade.eperusteet.ylops.service.lops2019.Lops2019Service; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,7 +19,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/peruste") -@Api("Lops2019PerusteController") +@Tag(name = "Lops2019PerusteController") public class Lops2019PerusteController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/JulkaisuController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/JulkaisuController.java index ae5df310c..41e4b9349 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/JulkaisuController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/JulkaisuController.java @@ -4,7 +4,7 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmanJulkaisuDto; import fi.vm.sade.eperusteet.ylops.dto.ops.UusiJulkaisuDto; import fi.vm.sade.eperusteet.ylops.service.util.JulkaisuService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Description; import org.springframework.web.bind.annotation.PathVariable; @@ -19,7 +19,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}") -@Api(value = "Julkaisut") +@Tag(name = "Julkaisut") @Description("Opetussuunnitelmien julkaisut") public class JulkaisuController { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/KommenttiController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/KommenttiController.java index 6f9e2c923..4b7ccc7a4 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/KommenttiController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/KommenttiController.java @@ -4,14 +4,7 @@ import fi.vm.sade.eperusteet.ylops.dto.teksti.KommenttiDto; import fi.vm.sade.eperusteet.ylops.service.external.KayttajanTietoService; import fi.vm.sade.eperusteet.ylops.service.teksti.KommenttiService; -import io.swagger.annotations.Api; -import java.util.List; -import java.util.Map; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.stream.Collectors; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -19,7 +12,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.stream.Collectors; import static org.springframework.web.bind.annotation.RequestMethod.DELETE; import static org.springframework.web.bind.annotation.RequestMethod.GET; @@ -28,8 +28,7 @@ @RestController @RequestMapping("/api/kommentit") -@ApiIgnore -@Api("Kommentit") +@Tag(name = "Kommentit") @Deprecated public class KommenttiController { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/LiitetiedostoController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/LiitetiedostoController.java index d0b2437a0..9c9b78ce1 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/LiitetiedostoController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/LiitetiedostoController.java @@ -3,7 +3,9 @@ import fi.vm.sade.eperusteet.ylops.dto.liite.LiiteDto; import fi.vm.sade.eperusteet.ylops.resource.util.CacheControl; import fi.vm.sade.eperusteet.ylops.service.ops.LiiteService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import org.apache.commons.io.FilenameUtils; import org.apache.tika.Tika; import org.apache.tika.mime.MimeTypeException; @@ -26,8 +28,6 @@ import org.springframework.web.util.UriComponentsBuilder; import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; @@ -44,7 +44,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/kuvat") -@Api("Liitetiedostot") +@Tag(name = "Liitetiedostot") public class LiitetiedostoController { private static final int BUFSIZE = 64 * 1024; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaController.java index 89db9e357..72518f89d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaController.java @@ -1,6 +1,5 @@ package fi.vm.sade.eperusteet.ylops.resource.ops; -import com.codahale.metrics.annotation.Timed; import com.fasterxml.jackson.databind.JsonNode; import fi.vm.sade.eperusteet.ylops.domain.KoulutusTyyppi; import fi.vm.sade.eperusteet.ylops.domain.Tila; @@ -21,7 +20,6 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OpsVuosiluokkakokonaisuusKevytDto; import fi.vm.sade.eperusteet.ylops.dto.peruste.PerusteInfoDto; import fi.vm.sade.eperusteet.ylops.dto.peruste.PerusteLaajaalainenosaaminenDto; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.external.KoodistoService; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; import fi.vm.sade.eperusteet.ylops.service.security.Permission; @@ -29,7 +27,7 @@ import fi.vm.sade.eperusteet.ylops.service.security.TargetType; import fi.vm.sade.eperusteet.ylops.service.util.JulkaisuService; import fi.vm.sade.eperusteet.ylops.service.util.Validointi; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; @@ -53,7 +51,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat") -@Api(value = "Opetussuunnitelmat") +@Tag(name = "Opetussuunnitelmat") public class OpetussuunnitelmaController { @Autowired @@ -70,7 +68,6 @@ public class OpetussuunnitelmaController { @RequestMapping(method = RequestMethod.GET) @ResponseBody - @Timed public List getAll( @RequestParam(value = "tyyppi", required = false) Tyyppi tyyppi, @RequestParam(value = "tila", required = false) Tila tila) { @@ -79,7 +76,6 @@ public List getAll( @RequestMapping(value = "/sivutettu", method = RequestMethod.GET) @ResponseBody - @Timed public Page getSivutettu( @RequestParam(value = "tyyppi") String tyyppi, @RequestParam(value = "tila") String tila, @@ -99,13 +95,11 @@ public Page getSivutettu( } @RequestMapping(value = "/pohjat", method = RequestMethod.GET) - @Timed public List getOpetussuunnitelmienOpsPohjat() { return opetussuunnitelmaService.getOpetussuunnitelmaOpsPohjat(); } @RequestMapping(value = "/{id}/organisaatiotarkistus", method = RequestMethod.GET) - @Timed public OpetussuunnitelmaKevytDto getOpetussuunnitelmaOrganisaatiotarkistuksella(@PathVariable("id") final Long id) { return opetussuunnitelmaService.getOpetussuunnitelmaOrganisaatiotarkistuksella(id); } @@ -119,21 +113,18 @@ public PerusteInfoDto getOpetussuunnitelmanPeruste( @RequestMapping(value = "/statistiikka", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity getStatistiikka() { return new ResponseEntity<>(opetussuunnitelmaService.getStatistiikka(), HttpStatus.OK); } @RequestMapping(value = "/tilastot", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity> getOpetussuunnitelmaTilastot() { return new ResponseEntity<>(opetussuunnitelmaService.getOpetussuunnitelmaTilastot(), HttpStatus.OK); } @RequestMapping(value = "/{id}", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity getOpetussuunnitelma(@PathVariable("id") final Long id) { return ResponseEntity.ok(opetussuunnitelmaService.getOpetussuunnitelma(id)); } @@ -146,14 +137,12 @@ public ResponseEntity getOpetussuunnitelmaNimi(@PathVa @RequestMapping(value = "/{id}/pohja/vuosiluokkakokonaisuudet", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity> getOpetussuunnitelmanPohjanVuosiluokkakokonaisuudet(@PathVariable("id") final Long id) { return ResponseEntity.ok(opetussuunnitelmaService.getOpetussuunnitelmanPohjanVuosiluokkakokonaisuudet(id)); } @RequestMapping(value = "/{id}/sisalto", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity getOpetussuunnitelmaSisalto( @PathVariable("id") final Long id, @RequestParam String query) { @@ -163,34 +152,29 @@ public ResponseEntity getOpetussuunnitelmaSisalto( @RequestMapping(value = "/{id}/kaikki", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity getKaikki(@PathVariable("id") final Long id) { return new ResponseEntity<>(opetussuunnitelmaService.getExportedOpetussuunnitelma(id), HttpStatus.OK); } @RequestMapping(value = "/{id}/opetussuunnitelmat", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity> getLapsiOpetussuunnitelmat(@PathVariable("id") final Long id) { return new ResponseEntity<>(opetussuunnitelmaService.getLapsiOpetussuunnitelmat(id), HttpStatus.OK); } @RequestMapping(value = "/{id}/laajaalaisetosaamiset", method = RequestMethod.GET) @ResponseBody - @Timed public Collection getLaajalaisetosamiset(@PathVariable("id") final Long id) { return opetussuunnitelmaService.getLaajaalaisetosaamiset(id); } @RequestMapping(value = "/{id}/sync", method = RequestMethod.POST) - @Timed public ResponseEntity sync(@PathVariable("id") final Long id) { opetussuunnitelmaService.syncPohja(id); return new ResponseEntity<>(HttpStatus.OK); } @RequestMapping(value = "/{id}/vaihda/{pohjaId}", method = RequestMethod.POST) - @Timed public ResponseEntity vaihdaPohja( @PathVariable("id") final Long id, @PathVariable("pohjaId") final Long pohjaId) { @@ -199,7 +183,6 @@ public ResponseEntity vaihdaPohja( } @RequestMapping(value = "/{id}/syncTekstitPohjasta", method = RequestMethod.POST) - @Timed public ResponseEntity syncTekstitPohjasta( @PathVariable("id") final Long id) { opetussuunnitelmaService.syncTekstitPohjasta(id); @@ -207,21 +190,18 @@ public ResponseEntity syncTekstitPohjasta( } @RequestMapping(value = "/{id}/opetussuunnitelmanPohjallaUusiaTeksteja", method = RequestMethod.GET) - @Timed public ResponseEntity opetussuunnitelmanPohjallaUusiaTeksteja( @PathVariable("id") final Long id) { return ResponseEntity.ok(opetussuunnitelmaService.opetussuunnitelmanPohjallaUusiaTeksteja(id)); } @RequestMapping(value = "/{id}/pohjanperustepaivittynyt", method = RequestMethod.GET) - @Timed public ResponseEntity pohjanperustepaivittynyt( @PathVariable("id") final Long id) { return ResponseEntity.ok(opetussuunnitelmaService.pohjanPerustePaivittynyt(id)); } @RequestMapping(value = "/{id}/pohjavaihtoehdot", method = RequestMethod.GET) - @Timed public ResponseEntity> haePohjavaihtoehdot( @PathVariable("id") final Long id) { Set opetussuunnitelmat = opetussuunnitelmaService.vaihdettavatPohjat(id); @@ -230,7 +210,6 @@ public ResponseEntity> haePohjavaihtoehdot( @RequestMapping(method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity addOpetussuunnitelma( @RequestBody OpetussuunnitelmaLuontiDto opetussuunnitelmaDto) { if (opetussuunnitelmaDto.getTyyppi() == null) { @@ -248,7 +227,6 @@ public ResponseEntity addOpetussuunnitelma( @RequestMapping(value = "/{opsId}/koodisto/{koodisto}", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity> getKoodistonKoodit( @PathVariable("opsId") final Long opsId, @PathVariable final String koodisto) { @@ -258,7 +236,6 @@ public ResponseEntity> getKoodistonKoodit( @RequestMapping(value = "/{id}/oppiainejarjestys", method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity updateOppiainejarjestys( @PathVariable("id") final Long id, @RequestBody List oppiainejarjestys) { @@ -268,7 +245,6 @@ public ResponseEntity updateOppiainejarjestys( @RequestMapping(value = "/{id}/oppiaineopintojaksojarjestys", method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity updateOppiaineJaOpintojaksojarjestys( @PathVariable("id") final Long id, @RequestBody List oppiaineopintojaksojarjestys) { @@ -278,7 +254,6 @@ public ResponseEntity updateOppiaineJaOpintojaksojarjestys( @RequestMapping(value = "/{id}", method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity updateOpetussuunnitelma( @PathVariable("id") final Long id, @RequestBody OpetussuunnitelmaDto opetussuunnitelmaDto) { @@ -289,7 +264,6 @@ public ResponseEntity updateOpetussuunnitelma( @RequestMapping(value = "/{id}/importperustetekstit", method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity importPerusteTekstit( @PathVariable("id") final Long id, @RequestParam(value = "skip", required = false) boolean skip) { @@ -298,7 +272,6 @@ public ResponseEntity importPerusteTekstit( } @RequestMapping(value = "/{id}/opetussuunnitelmat", method = RequestMethod.POST) - @Timed public ResponseEntity updateLapsiOpetussuunnitelmat( @PathVariable("id") final Long id) { opetussuunnitelmaService.updateLapsiOpetussuunnitelmat(id); @@ -307,7 +280,6 @@ public ResponseEntity updateLapsiOpetussuunnitelmat( @RequestMapping(value = "/{id}/tila/{tila}", method = RequestMethod.POST) @ResponseBody - @Timed public ResponseEntity updateTila( @PathVariable final Long id, @PathVariable Tila tila) { @@ -316,7 +288,6 @@ public ResponseEntity updateTila( @RequestMapping(value = "/{id}/validoi", method = RequestMethod.GET) @ResponseBody - @Timed public ResponseEntity> validoiOpetussuunnitelma( @PathVariable("id") final Long id) { return new ResponseEntity<>(opetussuunnitelmaService.validoiOpetussuunnitelma(id), HttpStatus.OK); @@ -333,7 +304,6 @@ public ResponseEntity>> getOikeudetById( return new ResponseEntity<>(permissionManager.getOpsPermissions(id), HttpStatus.OK); } - @InternalApi @RequestMapping(value = "/{id}/navigaatio", method = GET) public NavigationNodeDto getNavigation( @PathVariable final Long id, @@ -342,7 +312,6 @@ public NavigationNodeDto getNavigation( return opetussuunnitelmaService.buildNavigation(id, kieli); } - @InternalApi @RequestMapping(value = "/{id}/navigaatio/public", method = GET) public NavigationNodeDto getNavigationPublic( @PathVariable final Long id, @@ -352,7 +321,6 @@ public NavigationNodeDto getNavigationPublic( return opetussuunnitelmaService.buildNavigationPublic(id, kieli, revision); } - @InternalApi @RequestMapping(value = "/{id}/palauteTekstirakenne", method = GET) @ResponseStatus(HttpStatus.OK) public void palautaTekstirakenne(@PathVariable final Long id) { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaJulkisetController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaJulkisetController.java index 6c7750e2e..95dd8288f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaJulkisetController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmaJulkisetController.java @@ -1,14 +1,16 @@ package fi.vm.sade.eperusteet.ylops.resource.ops; -import com.codahale.metrics.annotation.Timed; import fi.vm.sade.eperusteet.ylops.dto.OpetussuunnitelmaExportDto; import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaJulkaistuQuery; import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaJulkinenDto; import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmaQuery; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.http.HttpStatus; @@ -23,46 +25,42 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/julkiset") -@Api(value = "Opetussuunnitelmat julkiset") +@Tag(name = "Opetussuunnitelmat julkiset") public class OpetussuunnitelmaJulkisetController { @Autowired private OpetussuunnitelmaService opetussuunnitelmaService; @RequestMapping(method = RequestMethod.GET) - @Timed - @ApiImplicitParams({ - @ApiImplicitParam(name = "koulutustyyppi", dataType = "string", paramType = "query", allowMultiple = false, value = "koulutustyyppi (koodistokoodi)"), - @ApiImplicitParam(name = "organisaatio", dataType = "string", paramType = "query", allowMultiple = false, value = "organisaatio oid (organisaatiopalvelusta)"), - @ApiImplicitParam(name = "tyyppi", dataType = "string", paramType = "query", allowMultiple = false, value = "ops | pohja"), - @ApiImplicitParam(name = "perusteenId", dataType = "string", paramType = "query", allowMultiple = false, value = "perusterajaus"), - @ApiImplicitParam(name = "perusteenDiaarinumero", dataType = "string", paramType = "query", allowMultiple = false, value = "perusterajaus") + @Parameters({ + @Parameter(name = "koulutustyyppi", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "koulutustyyppi (koodistokoodi)"), + @Parameter(name = "organisaatio", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "organisaatio oid (organisaatiopalvelusta)"), + @Parameter(name = "tyyppi", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "ops | pohja"), + @Parameter(name = "perusteenId", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "perusterajaus"), + @Parameter(name = "perusteenDiaarinumero", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "perusterajaus") }) public List getAllJulkiset(OpetussuunnitelmaQuery query) { return opetussuunnitelmaService.getAllJulkiset(query); } @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @Timed public ResponseEntity getOpetussuunnitelmanJulkisetTiedot(@PathVariable("id") final Long id) { return new ResponseEntity<>(opetussuunnitelmaService.getOpetussuunnitelmaJulkinen(id), HttpStatus.OK); } @RequestMapping(method = RequestMethod.GET, value = "/julkaisut") - @Timed - @ApiImplicitParams({ - @ApiImplicitParam(name = "koulutustyypit", dataType = "string", paramType = "query", allowMultiple = true, value = "koulutustyypit"), - @ApiImplicitParam(name = "nimi", dataType = "string", paramType = "query", value = "nimi"), - @ApiImplicitParam(name = "kieli", dataType = "string", paramType = "query"), - @ApiImplicitParam(name = "perusteenDiaarinumero", dataType = "string", paramType = "query", value = "perusteenDiaarinumero"), - @ApiImplicitParam(name = "sivu", dataType = "long", paramType = "query"), - @ApiImplicitParam(name = "sivukoko", dataType = "long", paramType = "query"), + @Parameters({ + @Parameter(name = "koulutustyypit", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string")), description = "koulutustyypit"), + @Parameter(name = "nimi", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "nimi"), + @Parameter(name = "kieli", in = ParameterIn.QUERY, array = @ArraySchema(schema = @Schema(type = "string"))), + @Parameter(name = "perusteenDiaarinumero", schema = @Schema(implementation = String.class), in = ParameterIn.QUERY, description = "perusteenDiaarinumero"), + @Parameter(name = "sivu", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), + @Parameter(name = "sivukoko", schema = @Schema(implementation = Long.class), in = ParameterIn.QUERY), }) public Page getAllJulkaistutOpetussuunnitelmat(OpetussuunnitelmaJulkaistuQuery query) { return opetussuunnitelmaService.getAllJulkaistutOpetussuunnitelmat(query); } @RequestMapping(value = "/{id}/julkaisu", method = RequestMethod.GET) - @Timed public ResponseEntity getOpetussuunnitelmaJulkaistu( @PathVariable("id") final Long id, @RequestParam(required = false) Integer revision) { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanAikatauluController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanAikatauluController.java index 1384935ba..c25461069 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanAikatauluController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanAikatauluController.java @@ -2,7 +2,7 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmanAikatauluDto; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmanAikatauluService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PathVariable; @@ -17,7 +17,7 @@ @RestController @RequestMapping("/api/aikataulu") -@Api("Aikataulu") +@Tag(name = "Aikataulu") public class OpetussuunnitelmanAikatauluController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanMuokkausietoController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanMuokkausietoController.java index d99270816..f8029139a 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanMuokkausietoController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanMuokkausietoController.java @@ -3,7 +3,7 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.MuokkaustietoKayttajallaDto; import fi.vm.sade.eperusteet.ylops.dto.ops.OpetussuunnitelmanMuokkaustietoDto; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmanMuokkaustietoService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -18,7 +18,7 @@ @RestController @RequestMapping("/api/muokkaustieto") -@Api("Muokkaustieto") +@Tag(name = "Muokkaustieto") public class OpetussuunnitelmanMuokkausietoController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanSisaltoController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanSisaltoController.java index bea20084b..8f70476c0 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanSisaltoController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpetussuunnitelmanSisaltoController.java @@ -8,7 +8,7 @@ import fi.vm.sade.eperusteet.ylops.dto.teksti.TekstiKappaleViitePerusteTekstillaDto; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; import fi.vm.sade.eperusteet.ylops.service.ops.TekstiKappaleViiteService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; import java.util.UUID; @@ -30,8 +29,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}") -@Api(value = "OpetussuunnitelmanSisalto") -@ApiIgnore +@Tag(name = "OpetussuunnitelmanSisalto") public class OpetussuunnitelmanSisaltoController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineController.java index 88b969cd1..ff4904942 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineController.java @@ -14,7 +14,7 @@ import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; import fi.vm.sade.eperusteet.ylops.service.ops.OppiaineService; import fi.vm.sade.eperusteet.ylops.service.ops.PoistoService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -31,7 +31,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/oppiaineet") -@Api(value = "Oppiaineet") +@Tag(name = "Oppiaineet") public class OppiaineController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineLockController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineLockController.java index fe42eebda..827f31f58 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineLockController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineLockController.java @@ -4,11 +4,11 @@ import fi.vm.sade.eperusteet.ylops.service.locking.LockService; import fi.vm.sade.eperusteet.ylops.service.ops.OppiaineService; import fi.vm.sade.eperusteet.ylops.service.ops.OpsOppiaineCtx; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; @RestController @RequestMapping(value = { @@ -16,8 +16,8 @@ "/api/opetussuunnitelmat/{opsId}/oppiaineet/{oppiaineId}/vuosiluokkakokonaisuudet/{kokonaisuusId}/lukko", "/api/opetussuunnitelmat/{opsId}/oppiaineet/{oppiaineId}/vuosiluokkakokonaisuudet/{kokonaisuusId}/vuosiluokat/{vuosiluokkaId}/lukko" }) -@ApiIgnore -@Api(value = "OppiaieenLukot") +@Hidden +@Tag(name = "OppiaieenLukot") public class OppiaineLockController extends AbstractLockController { @Autowired private OppiaineService service; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkaController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkaController.java index 5f06303c3..914fbd6d5 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkaController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkaController.java @@ -4,7 +4,7 @@ import fi.vm.sade.eperusteet.ylops.dto.ops.OppiaineenVuosiluokkaDto; import fi.vm.sade.eperusteet.ylops.resource.util.Responses; import fi.vm.sade.eperusteet.ylops.service.ops.OppiaineService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; @@ -12,14 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/oppiaineet/{oppiaineId}/vuosiluokkakokonaisuudet/{kokonaisuusId}/vuosiluokat") -@ApiIgnore -@Api(value = "OppiaineenVuosiluokat") +@Tag(name = "OppiaineenVuosiluokat") public class OppiaineenVuosiluokkaController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkakokonaisuusController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkakokonaisuusController.java index 1c9f2502f..41e876b74 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkakokonaisuusController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OppiaineenVuosiluokkakokonaisuusController.java @@ -11,7 +11,7 @@ import fi.vm.sade.eperusteet.ylops.resource.util.Responses; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; import fi.vm.sade.eperusteet.ylops.service.ops.OppiaineService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.Map; import java.util.Optional; @@ -31,8 +30,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/oppiaineet/{oppiaineId}/vuosiluokkakokonaisuudet") -@ApiIgnore -@Api(value = "OppiaineenVuosiluokkakokonaisuudet") +@Tag(name = "OppiaineenVuosiluokkakokonaisuudet") public class OppiaineenVuosiluokkakokonaisuusController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsSisaltoLockController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsSisaltoLockController.java index 7a8d29530..1a7eb943d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsSisaltoLockController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsSisaltoLockController.java @@ -4,16 +4,16 @@ import fi.vm.sade.eperusteet.ylops.service.locking.LockService; import fi.vm.sade.eperusteet.ylops.service.locking.OpsCtx; import fi.vm.sade.eperusteet.ylops.service.ops.OpsSisaltoLockService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; @RestController @RequestMapping(value = "/api/opetussuunnitelmat/{opsId}/tekstit/lukko") -@ApiIgnore -@Api(value = "OpsSisaltoLukot") +@Hidden +@Tag(name = "OpsSisaltoLukot") public class OpsSisaltoLockController extends AbstractLockController { @Autowired private OpsSisaltoLockService service; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsTekstikappaleLockController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsTekstikappaleLockController.java index dc3e49c5c..15c79ae61 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsTekstikappaleLockController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/OpsTekstikappaleLockController.java @@ -4,16 +4,16 @@ import fi.vm.sade.eperusteet.ylops.service.locking.LockService; import fi.vm.sade.eperusteet.ylops.service.ops.OpsTekstikappaleCtx; import fi.vm.sade.eperusteet.ylops.service.ops.OpsTekstikappaleLockService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; @RestController @RequestMapping(value = "/api/opetussuunnitelmat/{opsId}/tekstit/{viiteId}/lukko") -@ApiIgnore -@Api(value = "OpsTekstikappaleLukot") +@Hidden +@Tag(name = "OpsTekstikappaleLukot") public class OpsTekstikappaleLockController extends AbstractLockController { @Autowired private OpsTekstikappaleLockService service; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/TermistoController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/TermistoController.java index a5ca4b473..9b2c2e830 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/TermistoController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/TermistoController.java @@ -1,10 +1,8 @@ package fi.vm.sade.eperusteet.ylops.resource.ops; import fi.vm.sade.eperusteet.ylops.dto.ops.TermiDto; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.ops.TermistoService; -import io.swagger.annotations.Api; -import java.util.List; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PathVariable; @@ -13,14 +11,15 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + import static org.springframework.web.bind.annotation.RequestMethod.DELETE; import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.POST; @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}") -@InternalApi -@Api(value = "Termisto") +@Tag(name = "Termisto") public class TermistoController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/VuosiluokkakokonaisuusController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/VuosiluokkakokonaisuusController.java index 226b9a82a..4a60ff788 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/VuosiluokkakokonaisuusController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/VuosiluokkakokonaisuusController.java @@ -9,7 +9,7 @@ import fi.vm.sade.eperusteet.ylops.resource.util.Responses; import fi.vm.sade.eperusteet.ylops.service.ops.OpetussuunnitelmaService; import fi.vm.sade.eperusteet.ylops.service.ops.VuosiluokkakokonaisuusService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -26,7 +26,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/{opsId}/vuosiluokkakokonaisuudet") -@Api(value = "Vuosiluokkakokonaisuudet") +@Tag(name = "Vuosiluokkakokonaisuudet") public class VuosiluokkakokonaisuusController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioLockController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioLockController.java index 9bdbfc912..4d3ddda96 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioLockController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioLockController.java @@ -4,14 +4,14 @@ import fi.vm.sade.eperusteet.ylops.service.locking.LockService; import fi.vm.sade.eperusteet.ylops.service.ops.lukio.LukioLockCtx; import fi.vm.sade.eperusteet.ylops.service.ops.lukio.LukioLockService; +import io.swagger.v3.oas.annotations.Hidden; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; @RestController @RequestMapping(value = "/api/opetussuunnitelmat/lukio/{opsId}/lukko") -@ApiIgnore +@Hidden public class LukioLockController extends AbstractLockController { @Autowired private LukioLockService lockService; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioOpetussuunnitelmatController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioOpetussuunnitelmatController.java index 8321df8dd..b82a68a76 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioOpetussuunnitelmatController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ops/lukio/LukioOpetussuunnitelmatController.java @@ -15,7 +15,7 @@ import fi.vm.sade.eperusteet.ylops.dto.lukio.OpetuksenYleisetTavoitteetUpdateDto; import fi.vm.sade.eperusteet.ylops.dto.lukio.OppaineKurssiTreeStructureDto; import fi.vm.sade.eperusteet.ylops.service.ops.lukio.LukioOpetussuunnitelmaService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.PathVariable; @@ -30,7 +30,7 @@ @RestController @RequestMapping("/api/opetussuunnitelmat/lukio/{opsId}") -@Api(value = "LukioOpetussuunnitelmat") +@Tag(name = "LukioOpetussuunnitelmat") public class LukioOpetussuunnitelmatController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ukk/KysymysController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ukk/KysymysController.java index e78c954e2..c213b07e4 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ukk/KysymysController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/ukk/KysymysController.java @@ -1,10 +1,8 @@ package fi.vm.sade.eperusteet.ylops.resource.ukk; import fi.vm.sade.eperusteet.ylops.dto.ukk.KysymysDto; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.ukk.KysymysService; -import io.swagger.annotations.Api; -import java.util.List; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -14,14 +12,15 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + import static org.springframework.web.bind.annotation.RequestMethod.DELETE; import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.POST; import static org.springframework.web.bind.annotation.RequestMethod.PUT; -@InternalApi @RestController -@Api("Kysymykset") +@Tag(name = "Kysymykset") @RequestMapping("/api/kysymykset") public class KysymysController { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/AbstractLockController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/AbstractLockController.java index 850774c57..187e0c5c2 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/AbstractLockController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/AbstractLockController.java @@ -1,7 +1,6 @@ package fi.vm.sade.eperusteet.ylops.resource.util; import fi.vm.sade.eperusteet.ylops.dto.LukkoDto; -import fi.vm.sade.eperusteet.ylops.resource.config.InternalApi; import fi.vm.sade.eperusteet.ylops.service.locking.LockService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -13,7 +12,6 @@ import static org.springframework.web.bind.annotation.RequestMethod.GET; import static org.springframework.web.bind.annotation.RequestMethod.POST; -@InternalApi public abstract class AbstractLockController { @RequestMapping(method = GET) diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/CacheHeaderInterceptor.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/CacheHeaderInterceptor.java index 35fd3947c..ec6f3781f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/CacheHeaderInterceptor.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/CacheHeaderInterceptor.java @@ -1,9 +1,7 @@ package fi.vm.sade.eperusteet.ylops.resource.util; -import java.util.Date; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; @@ -12,6 +10,8 @@ import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import java.util.Date; + public class CacheHeaderInterceptor implements HandlerInterceptor { private static final Logger LOG = LoggerFactory.getLogger(CacheHeaderInterceptor.class); diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/KayttajaController.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/KayttajaController.java index 21c0857d7..f618cfe2d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/KayttajaController.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/KayttajaController.java @@ -3,19 +3,17 @@ import fi.vm.sade.eperusteet.ylops.dto.kayttaja.EtusivuDto; import fi.vm.sade.eperusteet.ylops.dto.kayttaja.KayttajanTietoDto; import fi.vm.sade.eperusteet.ylops.service.external.KayttajanTietoService; -import io.swagger.annotations.Api; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import springfox.documentation.annotations.ApiIgnore; import java.util.Set; @RestController @RequestMapping("/api/kayttaja") -@Api("Kayttajat") -@ApiIgnore +@Tag(name = "Kayttajat") public class KayttajaController { @Autowired diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/LoggingInterceptor.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/LoggingInterceptor.java index 7c0a93888..f5c39bb81 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/LoggingInterceptor.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/LoggingInterceptor.java @@ -1,8 +1,7 @@ package fi.vm.sade.eperusteet.ylops.resource.util; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.servlet.HandlerInterceptor; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/VirheServlet.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/VirheServlet.java index 9208b18f2..0500648cc 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/VirheServlet.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/resource/util/VirheServlet.java @@ -3,14 +3,14 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.google.common.base.Throwables; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/dokumentti/impl/ExternalPdfServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/dokumentti/impl/ExternalPdfServiceImpl.java index 0d3b0ea39..9f634c9a4 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/dokumentti/impl/ExternalPdfServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/dokumentti/impl/ExternalPdfServiceImpl.java @@ -21,14 +21,14 @@ import java.util.Optional; -import static javax.servlet.http.HttpServletResponse.SC_ACCEPTED; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_FOUND; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_ACCEPTED; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; +import static jakarta.servlet.http.HttpServletResponse.SC_METHOD_NOT_ALLOWED; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @Service public class ExternalPdfServiceImpl implements ExternalPdfService { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetLocalService.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetLocalService.java index 25ae20e2c..37dc799bd 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetLocalService.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetLocalService.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Profile; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.ArrayList; import java.util.Date; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetServiceImpl.java index 49e12ac1d..efa5c435e 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/EperusteetServiceImpl.java @@ -38,7 +38,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.client.RestTemplate; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -55,10 +55,10 @@ import java.util.stream.Collectors; import static fi.vm.sade.eperusteet.ylops.service.util.ExceptionUtil.wrapRuntime; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; import static java.util.Collections.singletonList; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static javax.servlet.http.HttpServletResponse.SC_OK; @Slf4j @Service diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/KayttajaClientImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/KayttajaClientImpl.java index 19dcc8410..e2c46525f 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/KayttajaClientImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/KayttajaClientImpl.java @@ -8,18 +8,19 @@ import fi.vm.sade.eperusteet.ylops.service.external.KayttajaClient; import fi.vm.sade.javautils.http.OphHttpClient; import fi.vm.sade.javautils.http.OphHttpRequest; -import java.io.IOException; -import java.util.List; -import java.util.Optional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.util.List; +import java.util.Optional; + import static fi.vm.sade.eperusteet.ylops.service.external.impl.KayttajanTietoParser.parsiKayttaja; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @Service public class KayttajaClientImpl implements KayttajaClient { diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/OrganisaatioServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/OrganisaatioServiceImpl.java index e7d9d60d9..f9d9d16d2 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/OrganisaatioServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/external/impl/OrganisaatioServiceImpl.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -42,7 +42,7 @@ import static fi.vm.sade.eperusteet.ylops.service.security.PermissionEvaluator.RolePermission.CRUD; import static fi.vm.sade.eperusteet.ylops.service.security.PermissionEvaluator.RolePermission.READ; import static fi.vm.sade.eperusteet.ylops.service.security.PermissionEvaluator.RolePermission.READ_UPDATE; -import static javax.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; @Slf4j @Service diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/locking/LockManagerImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/locking/LockManagerImpl.java index 10a694253..70655815b 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/locking/LockManagerImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/locking/LockManagerImpl.java @@ -7,9 +7,9 @@ import java.time.Instant; import java.util.Objects; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; -import javax.persistence.PersistenceException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; +import jakarta.persistence.PersistenceException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OpintojaksoServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OpintojaksoServiceImpl.java index f02d8206e..ae89ad747 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OpintojaksoServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OpintojaksoServiceImpl.java @@ -39,7 +39,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.math.BigDecimal; import java.util.Collections; import java.util.HashSet; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OppiaineServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OppiaineServiceImpl.java index 2d0b8c3c7..3a2f6547d 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OppiaineServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/lops2019/impl/Lops2019OppiaineServiceImpl.java @@ -28,7 +28,7 @@ import java.util.*; import java.util.stream.Collectors; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/LokalisoituTekstiConverter.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/LokalisoituTekstiConverter.java index 24e34cfba..99182dbbf 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/LokalisoituTekstiConverter.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/LokalisoituTekstiConverter.java @@ -9,6 +9,7 @@ import fi.vm.sade.eperusteet.ylops.repository.teksti.LokalisoituTekstiRepository; import fi.vm.sade.eperusteet.ylops.service.exception.BusinessRuleViolationException; import fi.vm.sade.eperusteet.ylops.service.util.SecurityUtil; +import jakarta.servlet.http.HttpServletRequest; import ma.glasnost.orika.MappingContext; import ma.glasnost.orika.converter.BidirectionalConverter; import ma.glasnost.orika.metadata.Type; @@ -20,7 +21,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.servlet.http.HttpServletRequest; import java.security.Principal; import java.util.ArrayList; import java.util.Collections; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/ReferenceableEntityConverter.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/ReferenceableEntityConverter.java index 1fd42aa45..77d6115d5 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/ReferenceableEntityConverter.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/mapping/ReferenceableEntityConverter.java @@ -8,10 +8,10 @@ import ma.glasnost.orika.metadata.Type; import org.springframework.stereotype.Component; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.metamodel.IdentifiableType; -import javax.persistence.metamodel.ManagedType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.metamodel.IdentifiableType; +import jakarta.persistence.metamodel.ManagedType; import java.io.Serializable; import java.util.IdentityHashMap; import java.util.Map; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/OpsDispatcher.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/OpsDispatcher.java index 9cd3aa585..164d111b7 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/OpsDispatcher.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/OpsDispatcher.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/Kommentti2019ServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/Kommentti2019ServiceImpl.java index 3218e8174..9a0b15140 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/Kommentti2019ServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/Kommentti2019ServiceImpl.java @@ -25,7 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Comparator; import java.util.Date; import java.util.List; diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/OpetussuunnitelmaServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/OpetussuunnitelmaServiceImpl.java index 1ef6bca07..f8fa71bcf 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/OpetussuunnitelmaServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/ops/impl/OpetussuunnitelmaServiceImpl.java @@ -134,6 +134,16 @@ import fi.vm.sade.eperusteet.ylops.service.util.NavigationUtil; import fi.vm.sade.eperusteet.ylops.service.util.SecurityUtil; import fi.vm.sade.eperusteet.ylops.service.util.Validointi; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.Subquery; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -153,16 +163,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.Subquery; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; @@ -518,18 +518,18 @@ public Page getSivutettu(Tyyppi tyyppi, Tila tila, Kou if (SecurityUtil.isUserAdmin()) { opetussuunnitelmat = opetussuunnitelmaRepository.findSivutettuAdmin( tyyppi, - tila.name(), + tila, nimi, - koulutustyyppi != null ? koulutustyyppi.name() : "", + koulutustyyppi, Kieli.of(kieli), pageable); } else { Set organisaatiot = SecurityUtil.getOrganizations(EnumSet.allOf(RolePermission.class)); opetussuunnitelmat = opetussuunnitelmaRepository.findSivutettu( tyyppi, - tila.name(), + tila, nimi, - koulutustyyppi != null ? koulutustyyppi.name() : "", + koulutustyyppi, organisaatiot, Kieli.of(kieli), pageable); diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/LogoutService.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/LogoutService.java index e82c41e6e..3503b1eed 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/LogoutService.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/LogoutService.java @@ -1,9 +1,8 @@ package fi.vm.sade.eperusteet.ylops.service.util; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.security.access.prepost.PreAuthorize; -import javax.servlet.http.HttpServletRequest; - public interface LogoutService { @PreAuthorize("isAuthenticated()") diff --git a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/impl/LogoutServiceImpl.java b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/impl/LogoutServiceImpl.java index f18173c6b..96c1e6465 100644 --- a/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/impl/LogoutServiceImpl.java +++ b/eperusteet-ylops-service/src/main/java/fi/vm/sade/eperusteet/ylops/service/util/impl/LogoutServiceImpl.java @@ -1,10 +1,10 @@ package fi.vm.sade.eperusteet.ylops.service.util.impl; import fi.vm.sade.eperusteet.ylops.service.util.LogoutService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.util.Optional; @Service diff --git a/eperusteet-ylops-service/src/main/resources/application.properties b/eperusteet-ylops-service/src/main/resources/application.properties index 2b98b30dc..571028dd1 100644 --- a/eperusteet-ylops-service/src/main/resources/application.properties +++ b/eperusteet-ylops-service/src/main/resources/application.properties @@ -43,4 +43,9 @@ fi.vm.sade.eperusteet.ylops.lukitus.aikaSekunteina=600 fi.vm.sade.eperusteet.ylops.organisaatio-service.peruskoulu-oppilaitostyypit=11,12,19 fi.vm.sade.eperusteet.ylops.organisaatio-service.lukio-oppilaitostyypit=15,19 -connection.uses-ssl-proxy=true \ No newline at end of file +connection.uses-ssl-proxy=true + +springdoc.packagesToScan=fi.vm.sade.eperusteet.ylops.resource +springdoc.swagger-ui.disable-swagger-default-url=true +springdoc.swagger-ui.path=/swagger +springdoc.api-docs.path=/api-docs \ No newline at end of file diff --git a/eperusteet-ylops-service/src/main/resources/db/migration/V1_20250102133900__sequence_restart.sql b/eperusteet-ylops-service/src/main/resources/db/migration/V1_20250102133900__sequence_restart.sql new file mode 100644 index 000000000..ca7d1359c --- /dev/null +++ b/eperusteet-ylops-service/src/main/resources/db/migration/V1_20250102133900__sequence_restart.sql @@ -0,0 +1,24 @@ +SELECT setval('hibernate_sequence', (with pk_list as (select tbl_ns.nspname as table_schema, + tbl.relname as table_name, + cons.conname as pk_name, + col.attname as pk_column + from pg_class tbl + join pg_constraint cons on tbl.oid = cons.conrelid and cons.contype = 'p' + join pg_namespace tbl_ns on tbl_ns.oid = tbl.relnamespace + join pg_attribute col + on col.attrelid = tbl.oid and col.attnum = cons.conkey[1] + join pg_type typ on typ.oid = col.atttypid + where col.attname = 'id' + and typ.typname not in ('uuid')), + maxvals as (select table_schema, + table_name, + pk_column, + (xpath('/row/max/text()', + query_to_xml(format('select max(%I) from %I.%I', + pk_column, table_schema, + table_name), true, true, '')) + )[1]::text as max_val + from pk_list) + select max(max_val::integer) + from maxvals + where pk_column = 'id') + 100) \ No newline at end of file diff --git a/eperusteet-ylops-service/src/main/resources/hibernate-typedefs.hbm.xml b/eperusteet-ylops-service/src/main/resources/hibernate-typedefs.hbm.xml deleted file mode 100644 index 0869e92c7..000000000 --- a/eperusteet-ylops-service/src/main/resources/hibernate-typedefs.hbm.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/eperusteet-ylops-service/src/main/resources/static/swagger/index.html b/eperusteet-ylops-service/src/main/resources/static/swagger/index.html deleted file mode 100644 index 91f310469..000000000 --- a/eperusteet-ylops-service/src/main/resources/static/swagger/index.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - SwaggerUI - - - -
- - - - - \ No newline at end of file diff --git a/eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui-bundle.js b/eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui-bundle.js deleted file mode 100644 index 5c0a6bbd3..000000000 --- a/eperusteet-ylops-service/src/main/resources/static/swagger/swagger-ui-bundle.js +++ /dev/null @@ -1,3 +0,0 @@ -/*! For license information please see swagger-ui-bundle.js.LICENSE.txt */ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.SwaggerUIBundle=t():e.SwaggerUIBundle=t()}(this,(function(){return function(e){var t={};function n(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=e,n.c=t,n.d=function(e,t,r){n.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},n.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.t=function(e,t){if(1&t&&(e=n(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)n.d(r,o,function(t){return e[t]}.bind(null,o));return r},n.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(t,"a",t),t},n.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},n.p="/dist",n(n.s=479)}([function(e,t,n){"use strict";e.exports=n(555)},function(e,t,n){e.exports=function(){"use strict";var e=Array.prototype.slice;function t(e,t){t&&(e.prototype=Object.create(t.prototype)),e.prototype.constructor=e}function n(e){return i(e)?e:J(e)}function r(e){return u(e)?e:K(e)}function o(e){return s(e)?e:Y(e)}function a(e){return i(e)&&!c(e)?e:G(e)}function i(e){return!(!e||!e[f])}function u(e){return!(!e||!e[p])}function s(e){return!(!e||!e[h])}function c(e){return u(e)||s(e)}function l(e){return!(!e||!e[d])}t(r,n),t(o,n),t(a,n),n.isIterable=i,n.isKeyed=u,n.isIndexed=s,n.isAssociative=c,n.isOrdered=l,n.Keyed=r,n.Indexed=o,n.Set=a;var f="@@__IMMUTABLE_ITERABLE__@@",p="@@__IMMUTABLE_KEYED__@@",h="@@__IMMUTABLE_INDEXED__@@",d="@@__IMMUTABLE_ORDERED__@@",m="delete",v=5,g=1<>>0;if(""+n!==t||4294967295===n)return NaN;t=n}return t<0?A(e)+t:t}function C(){return!0}function j(e,t,n){return(0===e||void 0!==n&&e<=-n)&&(void 0===t||void 0!==n&&t>=n)}function T(e,t){return P(e,t,0)}function I(e,t){return P(e,t,t)}function P(e,t,n){return void 0===e?n:e<0?Math.max(0,t+e):void 0===t?e:Math.min(t,e)}var N=0,M=1,R=2,D="function"==typeof Symbol&&Symbol.iterator,L="@@iterator",B=D||L;function F(e){this.next=e}function z(e,t,n,r){var o=0===e?t:1===e?n:[t,n];return r?r.value=o:r={value:o,done:!1},r}function U(){return{value:void 0,done:!0}}function q(e){return!!H(e)}function V(e){return e&&"function"==typeof e.next}function W(e){var t=H(e);return t&&t.call(e)}function H(e){var t=e&&(D&&e[D]||e[L]);if("function"==typeof t)return t}function $(e){return e&&"number"==typeof e.length}function J(e){return null==e?ie():i(e)?e.toSeq():ce(e)}function K(e){return null==e?ie().toKeyedSeq():i(e)?u(e)?e.toSeq():e.fromEntrySeq():ue(e)}function Y(e){return null==e?ie():i(e)?u(e)?e.entrySeq():e.toIndexedSeq():se(e)}function G(e){return(null==e?ie():i(e)?u(e)?e.entrySeq():e:se(e)).toSetSeq()}F.prototype.toString=function(){return"[Iterator]"},F.KEYS=N,F.VALUES=M,F.ENTRIES=R,F.prototype.inspect=F.prototype.toSource=function(){return this.toString()},F.prototype[B]=function(){return this},t(J,n),J.of=function(){return J(arguments)},J.prototype.toSeq=function(){return this},J.prototype.toString=function(){return this.__toString("Seq {","}")},J.prototype.cacheResult=function(){return!this._cache&&this.__iterateUncached&&(this._cache=this.entrySeq().toArray(),this.size=this._cache.length),this},J.prototype.__iterate=function(e,t){return fe(this,e,t,!0)},J.prototype.__iterator=function(e,t){return pe(this,e,t,!0)},t(K,J),K.prototype.toKeyedSeq=function(){return this},t(Y,J),Y.of=function(){return Y(arguments)},Y.prototype.toIndexedSeq=function(){return this},Y.prototype.toString=function(){return this.__toString("Seq [","]")},Y.prototype.__iterate=function(e,t){return fe(this,e,t,!1)},Y.prototype.__iterator=function(e,t){return pe(this,e,t,!1)},t(G,J),G.of=function(){return G(arguments)},G.prototype.toSetSeq=function(){return this},J.isSeq=ae,J.Keyed=K,J.Set=G,J.Indexed=Y;var Q,Z,X,ee="@@__IMMUTABLE_SEQ__@@";function te(e){this._array=e,this.size=e.length}function ne(e){var t=Object.keys(e);this._object=e,this._keys=t,this.size=t.length}function re(e){this._iterable=e,this.size=e.length||e.size}function oe(e){this._iterator=e,this._iteratorCache=[]}function ae(e){return!(!e||!e[ee])}function ie(){return Q||(Q=new te([]))}function ue(e){var t=Array.isArray(e)?new te(e).fromEntrySeq():V(e)?new oe(e).fromEntrySeq():q(e)?new re(e).fromEntrySeq():"object"==typeof e?new ne(e):void 0;if(!t)throw new TypeError("Expected Array or iterable object of [k, v] entries, or keyed object: "+e);return t}function se(e){var t=le(e);if(!t)throw new TypeError("Expected Array or iterable object of values: "+e);return t}function ce(e){var t=le(e)||"object"==typeof e&&new ne(e);if(!t)throw new TypeError("Expected Array or iterable object of values, or keyed object: "+e);return t}function le(e){return $(e)?new te(e):V(e)?new oe(e):q(e)?new re(e):void 0}function fe(e,t,n,r){var o=e._cache;if(o){for(var a=o.length-1,i=0;i<=a;i++){var u=o[n?a-i:i];if(!1===t(u[1],r?u[0]:i,e))return i+1}return i}return e.__iterateUncached(t,n)}function pe(e,t,n,r){var o=e._cache;if(o){var a=o.length-1,i=0;return new F((function(){var e=o[n?a-i:i];return i++>a?U():z(t,r?e[0]:i-1,e[1])}))}return e.__iteratorUncached(t,n)}function he(e,t){return t?de(t,e,"",{"":e}):me(e)}function de(e,t,n,r){return Array.isArray(t)?e.call(r,n,Y(t).map((function(n,r){return de(e,n,r,t)}))):ve(t)?e.call(r,n,K(t).map((function(n,r){return de(e,n,r,t)}))):t}function me(e){return Array.isArray(e)?Y(e).map(me).toList():ve(e)?K(e).map(me).toMap():e}function ve(e){return e&&(e.constructor===Object||void 0===e.constructor)}function ge(e,t){if(e===t||e!=e&&t!=t)return!0;if(!e||!t)return!1;if("function"==typeof e.valueOf&&"function"==typeof t.valueOf){if((e=e.valueOf())===(t=t.valueOf())||e!=e&&t!=t)return!0;if(!e||!t)return!1}return!("function"!=typeof e.equals||"function"!=typeof t.equals||!e.equals(t))}function ye(e,t){if(e===t)return!0;if(!i(t)||void 0!==e.size&&void 0!==t.size&&e.size!==t.size||void 0!==e.__hash&&void 0!==t.__hash&&e.__hash!==t.__hash||u(e)!==u(t)||s(e)!==s(t)||l(e)!==l(t))return!1;if(0===e.size&&0===t.size)return!0;var n=!c(e);if(l(e)){var r=e.entries();return t.every((function(e,t){var o=r.next().value;return o&&ge(o[1],e)&&(n||ge(o[0],t))}))&&r.next().done}var o=!1;if(void 0===e.size)if(void 0===t.size)"function"==typeof e.cacheResult&&e.cacheResult();else{o=!0;var a=e;e=t,t=a}var f=!0,p=t.__iterate((function(t,r){if(n?!e.has(t):o?!ge(t,e.get(r,b)):!ge(e.get(r,b),t))return f=!1,!1}));return f&&e.size===p}function be(e,t){if(!(this instanceof be))return new be(e,t);if(this._value=e,this.size=void 0===t?1/0:Math.max(0,t),0===this.size){if(Z)return Z;Z=this}}function we(e,t){if(!e)throw new Error(t)}function xe(e,t,n){if(!(this instanceof xe))return new xe(e,t,n);if(we(0!==n,"Cannot step a Range by 0"),e=e||0,void 0===t&&(t=1/0),n=void 0===n?1:Math.abs(n),tr?U():z(e,o,n[t?r-o++:o++])}))},t(ne,K),ne.prototype.get=function(e,t){return void 0===t||this.has(e)?this._object[e]:t},ne.prototype.has=function(e){return this._object.hasOwnProperty(e)},ne.prototype.__iterate=function(e,t){for(var n=this._object,r=this._keys,o=r.length-1,a=0;a<=o;a++){var i=r[t?o-a:a];if(!1===e(n[i],i,this))return a+1}return a},ne.prototype.__iterator=function(e,t){var n=this._object,r=this._keys,o=r.length-1,a=0;return new F((function(){var i=r[t?o-a:a];return a++>o?U():z(e,i,n[i])}))},ne.prototype[d]=!0,t(re,Y),re.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);var n=W(this._iterable),r=0;if(V(n))for(var o;!(o=n.next()).done&&!1!==e(o.value,r++,this););return r},re.prototype.__iteratorUncached=function(e,t){if(t)return this.cacheResult().__iterator(e,t);var n=W(this._iterable);if(!V(n))return new F(U);var r=0;return new F((function(){var t=n.next();return t.done?t:z(e,r++,t.value)}))},t(oe,Y),oe.prototype.__iterateUncached=function(e,t){if(t)return this.cacheResult().__iterate(e,t);for(var n,r=this._iterator,o=this._iteratorCache,a=0;a=r.length){var t=n.next();if(t.done)return t;r[o]=t.value}return z(e,o,r[o++])}))},t(be,Y),be.prototype.toString=function(){return 0===this.size?"Repeat []":"Repeat [ "+this._value+" "+this.size+" times ]"},be.prototype.get=function(e,t){return this.has(e)?this._value:t},be.prototype.includes=function(e){return ge(this._value,e)},be.prototype.slice=function(e,t){var n=this.size;return j(e,t,n)?this:new be(this._value,I(t,n)-T(e,n))},be.prototype.reverse=function(){return this},be.prototype.indexOf=function(e){return ge(this._value,e)?0:-1},be.prototype.lastIndexOf=function(e){return ge(this._value,e)?this.size:-1},be.prototype.__iterate=function(e,t){for(var n=0;n=0&&t=0&&nn?U():z(e,a++,i)}))},xe.prototype.equals=function(e){return e instanceof xe?this._start===e._start&&this._end===e._end&&this._step===e._step:ye(this,e)},t(Ee,n),t(_e,Ee),t(Se,Ee),t(ke,Ee),Ee.Keyed=_e,Ee.Indexed=Se,Ee.Set=ke;var Ae="function"==typeof Math.imul&&-2===Math.imul(4294967295,2)?Math.imul:function(e,t){var n=65535&(e|=0),r=65535&(t|=0);return n*r+((e>>>16)*r+n*(t>>>16)<<16>>>0)|0};function Oe(e){return e>>>1&1073741824|3221225471&e}function Ce(e){if(!1===e||null==e)return 0;if("function"==typeof e.valueOf&&(!1===(e=e.valueOf())||null==e))return 0;if(!0===e)return 1;var t=typeof e;if("number"===t){if(e!=e||e===1/0)return 0;var n=0|e;for(n!==e&&(n^=4294967295*e);e>4294967295;)n^=e/=4294967295;return Oe(n)}if("string"===t)return e.length>Fe?je(e):Te(e);if("function"==typeof e.hashCode)return e.hashCode();if("object"===t)return Ie(e);if("function"==typeof e.toString)return Te(e.toString());throw new Error("Value type "+t+" cannot be hashed.")}function je(e){var t=qe[e];return void 0===t&&(t=Te(e),Ue===ze&&(Ue=0,qe={}),Ue++,qe[e]=t),t}function Te(e){for(var t=0,n=0;n0)switch(e.nodeType){case 1:return e.uniqueID;case 9:return e.documentElement&&e.documentElement.uniqueID}}var Re,De="function"==typeof WeakMap;De&&(Re=new WeakMap);var Le=0,Be="__immutablehash__";"function"==typeof Symbol&&(Be=Symbol(Be));var Fe=16,ze=255,Ue=0,qe={};function Ve(e){we(e!==1/0,"Cannot perform this action with an infinite size.")}function We(e){return null==e?ot():He(e)&&!l(e)?e:ot().withMutations((function(t){var n=r(e);Ve(n.size),n.forEach((function(e,n){return t.set(n,e)}))}))}function He(e){return!(!e||!e[Je])}t(We,_e),We.of=function(){var t=e.call(arguments,0);return ot().withMutations((function(e){for(var n=0;n=t.length)throw new Error("Missing value for key: "+t[n]);e.set(t[n],t[n+1])}}))},We.prototype.toString=function(){return this.__toString("Map {","}")},We.prototype.get=function(e,t){return this._root?this._root.get(0,void 0,e,t):t},We.prototype.set=function(e,t){return at(this,e,t)},We.prototype.setIn=function(e,t){return this.updateIn(e,b,(function(){return t}))},We.prototype.remove=function(e){return at(this,e,b)},We.prototype.deleteIn=function(e){return this.updateIn(e,(function(){return b}))},We.prototype.update=function(e,t,n){return 1===arguments.length?e(this):this.updateIn([e],t,n)},We.prototype.updateIn=function(e,t,n){n||(n=t,t=void 0);var r=vt(this,En(e),t,n);return r===b?void 0:r},We.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._root=null,this.__hash=void 0,this.__altered=!0,this):ot()},We.prototype.merge=function(){return pt(this,void 0,arguments)},We.prototype.mergeWith=function(t){return pt(this,t,e.call(arguments,1))},We.prototype.mergeIn=function(t){var n=e.call(arguments,1);return this.updateIn(t,ot(),(function(e){return"function"==typeof e.merge?e.merge.apply(e,n):n[n.length-1]}))},We.prototype.mergeDeep=function(){return pt(this,ht,arguments)},We.prototype.mergeDeepWith=function(t){var n=e.call(arguments,1);return pt(this,dt(t),n)},We.prototype.mergeDeepIn=function(t){var n=e.call(arguments,1);return this.updateIn(t,ot(),(function(e){return"function"==typeof e.mergeDeep?e.mergeDeep.apply(e,n):n[n.length-1]}))},We.prototype.sort=function(e){return qt(fn(this,e))},We.prototype.sortBy=function(e,t){return qt(fn(this,t,e))},We.prototype.withMutations=function(e){var t=this.asMutable();return e(t),t.wasAltered()?t.__ensureOwner(this.__ownerID):this},We.prototype.asMutable=function(){return this.__ownerID?this:this.__ensureOwner(new S)},We.prototype.asImmutable=function(){return this.__ensureOwner()},We.prototype.wasAltered=function(){return this.__altered},We.prototype.__iterator=function(e,t){return new et(this,e,t)},We.prototype.__iterate=function(e,t){var n=this,r=0;return this._root&&this._root.iterate((function(t){return r++,e(t[1],t[0],n)}),t),r},We.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?rt(this.size,this._root,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},We.isMap=He;var $e,Je="@@__IMMUTABLE_MAP__@@",Ke=We.prototype;function Ye(e,t){this.ownerID=e,this.entries=t}function Ge(e,t,n){this.ownerID=e,this.bitmap=t,this.nodes=n}function Qe(e,t,n){this.ownerID=e,this.count=t,this.nodes=n}function Ze(e,t,n){this.ownerID=e,this.keyHash=t,this.entries=n}function Xe(e,t,n){this.ownerID=e,this.keyHash=t,this.entry=n}function et(e,t,n){this._type=t,this._reverse=n,this._stack=e._root&&nt(e._root)}function tt(e,t){return z(e,t[0],t[1])}function nt(e,t){return{node:e,index:0,__prev:t}}function rt(e,t,n,r){var o=Object.create(Ke);return o.size=e,o._root=t,o.__ownerID=n,o.__hash=r,o.__altered=!1,o}function ot(){return $e||($e=rt(0))}function at(e,t,n){var r,o;if(e._root){var a=E(w),i=E(x);if(r=it(e._root,e.__ownerID,0,void 0,t,n,a,i),!i.value)return e;o=e.size+(a.value?n===b?-1:1:0)}else{if(n===b)return e;o=1,r=new Ye(e.__ownerID,[[t,n]])}return e.__ownerID?(e.size=o,e._root=r,e.__hash=void 0,e.__altered=!0,e):r?rt(o,r):ot()}function it(e,t,n,r,o,a,i,u){return e?e.update(t,n,r,o,a,i,u):a===b?e:(_(u),_(i),new Xe(t,r,[o,a]))}function ut(e){return e.constructor===Xe||e.constructor===Ze}function st(e,t,n,r,o){if(e.keyHash===r)return new Ze(t,r,[e.entry,o]);var a,i=(0===n?e.keyHash:e.keyHash>>>n)&y,u=(0===n?r:r>>>n)&y;return new Ge(t,1<>>=1)i[u]=1&n?t[a++]:void 0;return i[r]=o,new Qe(e,a+1,i)}function pt(e,t,n){for(var o=[],a=0;a>1&1431655765))+(e>>2&858993459))+(e>>4)&252645135,e+=e>>8,127&(e+=e>>16)}function yt(e,t,n,r){var o=r?e:k(e);return o[t]=n,o}function bt(e,t,n,r){var o=e.length+1;if(r&&t+1===o)return e[t]=n,e;for(var a=new Array(o),i=0,u=0;u=xt)return ct(e,s,r,o);var p=e&&e===this.ownerID,h=p?s:k(s);return f?u?c===l-1?h.pop():h[c]=h.pop():h[c]=[r,o]:h.push([r,o]),p?(this.entries=h,this):new Ye(e,h)}},Ge.prototype.get=function(e,t,n,r){void 0===t&&(t=Ce(n));var o=1<<((0===e?t:t>>>e)&y),a=this.bitmap;return 0==(a&o)?r:this.nodes[gt(a&o-1)].get(e+v,t,n,r)},Ge.prototype.update=function(e,t,n,r,o,a,i){void 0===n&&(n=Ce(r));var u=(0===t?n:n>>>t)&y,s=1<=Et)return ft(e,p,c,u,d);if(l&&!d&&2===p.length&&ut(p[1^f]))return p[1^f];if(l&&d&&1===p.length&&ut(d))return d;var m=e&&e===this.ownerID,g=l?d?c:c^s:c|s,w=l?d?yt(p,f,d,m):wt(p,f,m):bt(p,f,d,m);return m?(this.bitmap=g,this.nodes=w,this):new Ge(e,g,w)},Qe.prototype.get=function(e,t,n,r){void 0===t&&(t=Ce(n));var o=(0===e?t:t>>>e)&y,a=this.nodes[o];return a?a.get(e+v,t,n,r):r},Qe.prototype.update=function(e,t,n,r,o,a,i){void 0===n&&(n=Ce(r));var u=(0===t?n:n>>>t)&y,s=o===b,c=this.nodes,l=c[u];if(s&&!l)return this;var f=it(l,e,t+v,n,r,o,a,i);if(f===l)return this;var p=this.count;if(l){if(!f&&--p<_t)return lt(e,c,p,u)}else p++;var h=e&&e===this.ownerID,d=yt(c,u,f,h);return h?(this.count=p,this.nodes=d,this):new Qe(e,p,d)},Ze.prototype.get=function(e,t,n,r){for(var o=this.entries,a=0,i=o.length;a0&&r=0&&e>>t&y;if(r>=this.array.length)return new Ct([],e);var o,a=0===r;if(t>0){var i=this.array[r];if((o=i&&i.removeBefore(e,t-v,n))===i&&a)return this}if(a&&!o)return this;var u=Lt(this,e);if(!a)for(var s=0;s>>t&y;if(o>=this.array.length)return this;if(t>0){var a=this.array[o];if((r=a&&a.removeAfter(e,t-v,n))===a&&o===this.array.length-1)return this}var i=Lt(this,e);return i.array.splice(o+1),r&&(i.array[o]=r),i};var jt,Tt,It={};function Pt(e,t){var n=e._origin,r=e._capacity,o=Ut(r),a=e._tail;return i(e._root,e._level,0);function i(e,t,n){return 0===t?u(e,n):s(e,t,n)}function u(e,i){var u=i===o?a&&a.array:e&&e.array,s=i>n?0:n-i,c=r-i;return c>g&&(c=g),function(){if(s===c)return It;var e=t?--c:s++;return u&&u[e]}}function s(e,o,a){var u,s=e&&e.array,c=a>n?0:n-a>>o,l=1+(r-a>>o);return l>g&&(l=g),function(){for(;;){if(u){var e=u();if(e!==It)return e;u=null}if(c===l)return It;var n=t?--l:c++;u=i(s&&s[n],o-v,a+(n<=e.size||t<0)return e.withMutations((function(e){t<0?Ft(e,t).set(0,n):Ft(e,0,t+1).set(t,n)}));t+=e._origin;var r=e._tail,o=e._root,a=E(x);return t>=Ut(e._capacity)?r=Dt(r,e.__ownerID,0,t,n,a):o=Dt(o,e.__ownerID,e._level,t,n,a),a.value?e.__ownerID?(e._root=o,e._tail=r,e.__hash=void 0,e.__altered=!0,e):Nt(e._origin,e._capacity,e._level,o,r):e}function Dt(e,t,n,r,o,a){var i,u=r>>>n&y,s=e&&u0){var c=e&&e.array[u],l=Dt(c,t,n-v,r,o,a);return l===c?e:((i=Lt(e,t)).array[u]=l,i)}return s&&e.array[u]===o?e:(_(a),i=Lt(e,t),void 0===o&&u===i.array.length-1?i.array.pop():i.array[u]=o,i)}function Lt(e,t){return t&&e&&t===e.ownerID?e:new Ct(e?e.array.slice():[],t)}function Bt(e,t){if(t>=Ut(e._capacity))return e._tail;if(t<1<0;)n=n.array[t>>>r&y],r-=v;return n}}function Ft(e,t,n){void 0!==t&&(t|=0),void 0!==n&&(n|=0);var r=e.__ownerID||new S,o=e._origin,a=e._capacity,i=o+t,u=void 0===n?a:n<0?a+n:o+n;if(i===o&&u===a)return e;if(i>=u)return e.clear();for(var s=e._level,c=e._root,l=0;i+l<0;)c=new Ct(c&&c.array.length?[void 0,c]:[],r),l+=1<<(s+=v);l&&(i+=l,o+=l,u+=l,a+=l);for(var f=Ut(a),p=Ut(u);p>=1<f?new Ct([],r):h;if(h&&p>f&&iv;g-=v){var b=f>>>g&y;m=m.array[b]=Lt(m.array[b],r)}m.array[f>>>v&y]=h}if(u=p)i-=p,u-=p,s=v,c=null,d=d&&d.removeBefore(r,0,i);else if(i>o||p>>s&y;if(w!==p>>>s&y)break;w&&(l+=(1<o&&(c=c.removeBefore(r,s,i-l)),c&&pa&&(a=c.size),i(s)||(c=c.map((function(e){return he(e)}))),r.push(c)}return a>e.size&&(e=e.setSize(a)),mt(e,t,r)}function Ut(e){return e>>v<=g&&i.size>=2*a.size?(r=(o=i.filter((function(e,t){return void 0!==e&&u!==t}))).toKeyedSeq().map((function(e){return e[0]})).flip().toMap(),e.__ownerID&&(r.__ownerID=o.__ownerID=e.__ownerID)):(r=a.remove(t),o=u===i.size-1?i.pop():i.set(u,void 0))}else if(s){if(n===i.get(u)[1])return e;r=a,o=i.set(u,[t,n])}else r=a.set(t,i.size),o=i.set(i.size,[t,n]);return e.__ownerID?(e.size=r.size,e._map=r,e._list=o,e.__hash=void 0,e):Wt(r,o)}function Jt(e,t){this._iter=e,this._useKeys=t,this.size=e.size}function Kt(e){this._iter=e,this.size=e.size}function Yt(e){this._iter=e,this.size=e.size}function Gt(e){this._iter=e,this.size=e.size}function Qt(e){var t=bn(e);return t._iter=e,t.size=e.size,t.flip=function(){return e},t.reverse=function(){var t=e.reverse.apply(this);return t.flip=function(){return e.reverse()},t},t.has=function(t){return e.includes(t)},t.includes=function(t){return e.has(t)},t.cacheResult=wn,t.__iterateUncached=function(t,n){var r=this;return e.__iterate((function(e,n){return!1!==t(n,e,r)}),n)},t.__iteratorUncached=function(t,n){if(t===R){var r=e.__iterator(t,n);return new F((function(){var e=r.next();if(!e.done){var t=e.value[0];e.value[0]=e.value[1],e.value[1]=t}return e}))}return e.__iterator(t===M?N:M,n)},t}function Zt(e,t,n){var r=bn(e);return r.size=e.size,r.has=function(t){return e.has(t)},r.get=function(r,o){var a=e.get(r,b);return a===b?o:t.call(n,a,r,e)},r.__iterateUncached=function(r,o){var a=this;return e.__iterate((function(e,o,i){return!1!==r(t.call(n,e,o,i),o,a)}),o)},r.__iteratorUncached=function(r,o){var a=e.__iterator(R,o);return new F((function(){var o=a.next();if(o.done)return o;var i=o.value,u=i[0];return z(r,u,t.call(n,i[1],u,e),o)}))},r}function Xt(e,t){var n=bn(e);return n._iter=e,n.size=e.size,n.reverse=function(){return e},e.flip&&(n.flip=function(){var t=Qt(e);return t.reverse=function(){return e.flip()},t}),n.get=function(n,r){return e.get(t?n:-1-n,r)},n.has=function(n){return e.has(t?n:-1-n)},n.includes=function(t){return e.includes(t)},n.cacheResult=wn,n.__iterate=function(t,n){var r=this;return e.__iterate((function(e,n){return t(e,n,r)}),!n)},n.__iterator=function(t,n){return e.__iterator(t,!n)},n}function en(e,t,n,r){var o=bn(e);return r&&(o.has=function(r){var o=e.get(r,b);return o!==b&&!!t.call(n,o,r,e)},o.get=function(r,o){var a=e.get(r,b);return a!==b&&t.call(n,a,r,e)?a:o}),o.__iterateUncached=function(o,a){var i=this,u=0;return e.__iterate((function(e,a,s){if(t.call(n,e,a,s))return u++,o(e,r?a:u-1,i)}),a),u},o.__iteratorUncached=function(o,a){var i=e.__iterator(R,a),u=0;return new F((function(){for(;;){var a=i.next();if(a.done)return a;var s=a.value,c=s[0],l=s[1];if(t.call(n,l,c,e))return z(o,r?c:u++,l,a)}}))},o}function tn(e,t,n){var r=We().asMutable();return e.__iterate((function(o,a){r.update(t.call(n,o,a,e),0,(function(e){return e+1}))})),r.asImmutable()}function nn(e,t,n){var r=u(e),o=(l(e)?qt():We()).asMutable();e.__iterate((function(a,i){o.update(t.call(n,a,i,e),(function(e){return(e=e||[]).push(r?[i,a]:a),e}))}));var a=yn(e);return o.map((function(t){return mn(e,a(t))}))}function rn(e,t,n,r){var o=e.size;if(void 0!==t&&(t|=0),void 0!==n&&(n===1/0?n=o:n|=0),j(t,n,o))return e;var a=T(t,o),i=I(n,o);if(a!=a||i!=i)return rn(e.toSeq().cacheResult(),t,n,r);var u,s=i-a;s==s&&(u=s<0?0:s);var c=bn(e);return c.size=0===u?u:e.size&&u||void 0,!r&&ae(e)&&u>=0&&(c.get=function(t,n){return(t=O(this,t))>=0&&tu)return U();var e=o.next();return r||t===M?e:z(t,s-1,t===N?void 0:e.value[1],e)}))},c}function on(e,t,n){var r=bn(e);return r.__iterateUncached=function(r,o){var a=this;if(o)return this.cacheResult().__iterate(r,o);var i=0;return e.__iterate((function(e,o,u){return t.call(n,e,o,u)&&++i&&r(e,o,a)})),i},r.__iteratorUncached=function(r,o){var a=this;if(o)return this.cacheResult().__iterator(r,o);var i=e.__iterator(R,o),u=!0;return new F((function(){if(!u)return U();var e=i.next();if(e.done)return e;var o=e.value,s=o[0],c=o[1];return t.call(n,c,s,a)?r===R?e:z(r,s,c,e):(u=!1,U())}))},r}function an(e,t,n,r){var o=bn(e);return o.__iterateUncached=function(o,a){var i=this;if(a)return this.cacheResult().__iterate(o,a);var u=!0,s=0;return e.__iterate((function(e,a,c){if(!u||!(u=t.call(n,e,a,c)))return s++,o(e,r?a:s-1,i)})),s},o.__iteratorUncached=function(o,a){var i=this;if(a)return this.cacheResult().__iterator(o,a);var u=e.__iterator(R,a),s=!0,c=0;return new F((function(){var e,a,l;do{if((e=u.next()).done)return r||o===M?e:z(o,c++,o===N?void 0:e.value[1],e);var f=e.value;a=f[0],l=f[1],s&&(s=t.call(n,l,a,i))}while(s);return o===R?e:z(o,a,l,e)}))},o}function un(e,t){var n=u(e),o=[e].concat(t).map((function(e){return i(e)?n&&(e=r(e)):e=n?ue(e):se(Array.isArray(e)?e:[e]),e})).filter((function(e){return 0!==e.size}));if(0===o.length)return e;if(1===o.length){var a=o[0];if(a===e||n&&u(a)||s(e)&&s(a))return a}var c=new te(o);return n?c=c.toKeyedSeq():s(e)||(c=c.toSetSeq()),(c=c.flatten(!0)).size=o.reduce((function(e,t){if(void 0!==e){var n=t.size;if(void 0!==n)return e+n}}),0),c}function sn(e,t,n){var r=bn(e);return r.__iterateUncached=function(r,o){var a=0,u=!1;function s(e,c){var l=this;e.__iterate((function(e,o){return(!t||c0}function dn(e,t,r){var o=bn(e);return o.size=new te(r).map((function(e){return e.size})).min(),o.__iterate=function(e,t){for(var n,r=this.__iterator(M,t),o=0;!(n=r.next()).done&&!1!==e(n.value,o++,this););return o},o.__iteratorUncached=function(e,o){var a=r.map((function(e){return e=n(e),W(o?e.reverse():e)})),i=0,u=!1;return new F((function(){var n;return u||(n=a.map((function(e){return e.next()})),u=n.some((function(e){return e.done}))),u?U():z(e,i++,t.apply(null,n.map((function(e){return e.value}))))}))},o}function mn(e,t){return ae(e)?t:e.constructor(t)}function vn(e){if(e!==Object(e))throw new TypeError("Expected [K, V] tuple: "+e)}function gn(e){return Ve(e.size),A(e)}function yn(e){return u(e)?r:s(e)?o:a}function bn(e){return Object.create((u(e)?K:s(e)?Y:G).prototype)}function wn(){return this._iter.cacheResult?(this._iter.cacheResult(),this.size=this._iter.size,this):J.prototype.cacheResult.call(this)}function xn(e,t){return e>t?1:e=0;n--)t={value:arguments[n],next:t};return this.__ownerID?(this.size=e,this._head=t,this.__hash=void 0,this.__altered=!0,this):Kn(e,t)},Vn.prototype.pushAll=function(e){if(0===(e=o(e)).size)return this;Ve(e.size);var t=this.size,n=this._head;return e.reverse().forEach((function(e){t++,n={value:e,next:n}})),this.__ownerID?(this.size=t,this._head=n,this.__hash=void 0,this.__altered=!0,this):Kn(t,n)},Vn.prototype.pop=function(){return this.slice(1)},Vn.prototype.unshift=function(){return this.push.apply(this,arguments)},Vn.prototype.unshiftAll=function(e){return this.pushAll(e)},Vn.prototype.shift=function(){return this.pop.apply(this,arguments)},Vn.prototype.clear=function(){return 0===this.size?this:this.__ownerID?(this.size=0,this._head=void 0,this.__hash=void 0,this.__altered=!0,this):Yn()},Vn.prototype.slice=function(e,t){if(j(e,t,this.size))return this;var n=T(e,this.size);if(I(t,this.size)!==this.size)return Se.prototype.slice.call(this,e,t);for(var r=this.size-n,o=this._head;n--;)o=o.next;return this.__ownerID?(this.size=r,this._head=o,this.__hash=void 0,this.__altered=!0,this):Kn(r,o)},Vn.prototype.__ensureOwner=function(e){return e===this.__ownerID?this:e?Kn(this.size,this._head,e,this.__hash):(this.__ownerID=e,this.__altered=!1,this)},Vn.prototype.__iterate=function(e,t){if(t)return this.reverse().__iterate(e);for(var n=0,r=this._head;r&&!1!==e(r.value,n++,this);)r=r.next;return n},Vn.prototype.__iterator=function(e,t){if(t)return this.reverse().__iterator(e);var n=0,r=this._head;return new F((function(){if(r){var t=r.value;return r=r.next,z(e,n++,t)}return U()}))},Vn.isStack=Wn;var Hn,$n="@@__IMMUTABLE_STACK__@@",Jn=Vn.prototype;function Kn(e,t,n,r){var o=Object.create(Jn);return o.size=e,o._head=t,o.__ownerID=n,o.__hash=r,o.__altered=!1,o}function Yn(){return Hn||(Hn=Kn(0))}function Gn(e,t){var n=function(n){e.prototype[n]=t[n]};return Object.keys(t).forEach(n),Object.getOwnPropertySymbols&&Object.getOwnPropertySymbols(t).forEach(n),e}Jn[$n]=!0,Jn.withMutations=Ke.withMutations,Jn.asMutable=Ke.asMutable,Jn.asImmutable=Ke.asImmutable,Jn.wasAltered=Ke.wasAltered,n.Iterator=F,Gn(n,{toArray:function(){Ve(this.size);var e=new Array(this.size||0);return this.valueSeq().__iterate((function(t,n){e[n]=t})),e},toIndexedSeq:function(){return new Kt(this)},toJS:function(){return this.toSeq().map((function(e){return e&&"function"==typeof e.toJS?e.toJS():e})).__toJS()},toJSON:function(){return this.toSeq().map((function(e){return e&&"function"==typeof e.toJSON?e.toJSON():e})).__toJS()},toKeyedSeq:function(){return new Jt(this,!0)},toMap:function(){return We(this.toKeyedSeq())},toObject:function(){Ve(this.size);var e={};return this.__iterate((function(t,n){e[n]=t})),e},toOrderedMap:function(){return qt(this.toKeyedSeq())},toOrderedSet:function(){return Ln(u(this)?this.valueSeq():this)},toSet:function(){return jn(u(this)?this.valueSeq():this)},toSetSeq:function(){return new Yt(this)},toSeq:function(){return s(this)?this.toIndexedSeq():u(this)?this.toKeyedSeq():this.toSetSeq()},toStack:function(){return Vn(u(this)?this.valueSeq():this)},toList:function(){return St(u(this)?this.valueSeq():this)},toString:function(){return"[Iterable]"},__toString:function(e,t){return 0===this.size?e+t:e+" "+this.toSeq().map(this.__toStringMapper).join(", ")+" "+t},concat:function(){return mn(this,un(this,e.call(arguments,0)))},includes:function(e){return this.some((function(t){return ge(t,e)}))},entries:function(){return this.__iterator(R)},every:function(e,t){Ve(this.size);var n=!0;return this.__iterate((function(r,o,a){if(!e.call(t,r,o,a))return n=!1,!1})),n},filter:function(e,t){return mn(this,en(this,e,t,!0))},find:function(e,t,n){var r=this.findEntry(e,t);return r?r[1]:n},forEach:function(e,t){return Ve(this.size),this.__iterate(t?e.bind(t):e)},join:function(e){Ve(this.size),e=void 0!==e?""+e:",";var t="",n=!0;return this.__iterate((function(r){n?n=!1:t+=e,t+=null!=r?r.toString():""})),t},keys:function(){return this.__iterator(N)},map:function(e,t){return mn(this,Zt(this,e,t))},reduce:function(e,t,n){var r,o;return Ve(this.size),arguments.length<2?o=!0:r=t,this.__iterate((function(t,a,i){o?(o=!1,r=t):r=e.call(n,r,t,a,i)})),r},reduceRight:function(e,t,n){var r=this.toKeyedSeq().reverse();return r.reduce.apply(r,arguments)},reverse:function(){return mn(this,Xt(this,!0))},slice:function(e,t){return mn(this,rn(this,e,t,!0))},some:function(e,t){return!this.every(tr(e),t)},sort:function(e){return mn(this,fn(this,e))},values:function(){return this.__iterator(M)},butLast:function(){return this.slice(0,-1)},isEmpty:function(){return void 0!==this.size?0===this.size:!this.some((function(){return!0}))},count:function(e,t){return A(e?this.toSeq().filter(e,t):this)},countBy:function(e,t){return tn(this,e,t)},equals:function(e){return ye(this,e)},entrySeq:function(){var e=this;if(e._cache)return new te(e._cache);var t=e.toSeq().map(er).toIndexedSeq();return t.fromEntrySeq=function(){return e.toSeq()},t},filterNot:function(e,t){return this.filter(tr(e),t)},findEntry:function(e,t,n){var r=n;return this.__iterate((function(n,o,a){if(e.call(t,n,o,a))return r=[o,n],!1})),r},findKey:function(e,t){var n=this.findEntry(e,t);return n&&n[0]},findLast:function(e,t,n){return this.toKeyedSeq().reverse().find(e,t,n)},findLastEntry:function(e,t,n){return this.toKeyedSeq().reverse().findEntry(e,t,n)},findLastKey:function(e,t){return this.toKeyedSeq().reverse().findKey(e,t)},first:function(){return this.find(C)},flatMap:function(e,t){return mn(this,cn(this,e,t))},flatten:function(e){return mn(this,sn(this,e,!0))},fromEntrySeq:function(){return new Gt(this)},get:function(e,t){return this.find((function(t,n){return ge(n,e)}),void 0,t)},getIn:function(e,t){for(var n,r=this,o=En(e);!(n=o.next()).done;){var a=n.value;if((r=r&&r.get?r.get(a,b):b)===b)return t}return r},groupBy:function(e,t){return nn(this,e,t)},has:function(e){return this.get(e,b)!==b},hasIn:function(e){return this.getIn(e,b)!==b},isSubset:function(e){return e="function"==typeof e.includes?e:n(e),this.every((function(t){return e.includes(t)}))},isSuperset:function(e){return(e="function"==typeof e.isSubset?e:n(e)).isSubset(this)},keyOf:function(e){return this.findKey((function(t){return ge(t,e)}))},keySeq:function(){return this.toSeq().map(Xn).toIndexedSeq()},last:function(){return this.toSeq().reverse().first()},lastKeyOf:function(e){return this.toKeyedSeq().reverse().keyOf(e)},max:function(e){return pn(this,e)},maxBy:function(e,t){return pn(this,t,e)},min:function(e){return pn(this,e?nr(e):ar)},minBy:function(e,t){return pn(this,t?nr(t):ar,e)},rest:function(){return this.slice(1)},skip:function(e){return this.slice(Math.max(0,e))},skipLast:function(e){return mn(this,this.toSeq().reverse().skip(e).reverse())},skipWhile:function(e,t){return mn(this,an(this,e,t,!0))},skipUntil:function(e,t){return this.skipWhile(tr(e),t)},sortBy:function(e,t){return mn(this,fn(this,t,e))},take:function(e){return this.slice(0,Math.max(0,e))},takeLast:function(e){return mn(this,this.toSeq().reverse().take(e).reverse())},takeWhile:function(e,t){return mn(this,on(this,e,t))},takeUntil:function(e,t){return this.takeWhile(tr(e),t)},valueSeq:function(){return this.toIndexedSeq()},hashCode:function(){return this.__hash||(this.__hash=ir(this))}});var Qn=n.prototype;Qn[f]=!0,Qn[B]=Qn.values,Qn.__toJS=Qn.toArray,Qn.__toStringMapper=rr,Qn.inspect=Qn.toSource=function(){return this.toString()},Qn.chain=Qn.flatMap,Qn.contains=Qn.includes,Gn(r,{flip:function(){return mn(this,Qt(this))},mapEntries:function(e,t){var n=this,r=0;return mn(this,this.toSeq().map((function(o,a){return e.call(t,[a,o],r++,n)})).fromEntrySeq())},mapKeys:function(e,t){var n=this;return mn(this,this.toSeq().flip().map((function(r,o){return e.call(t,r,o,n)})).flip())}});var Zn=r.prototype;function Xn(e,t){return t}function er(e,t){return[t,e]}function tr(e){return function(){return!e.apply(this,arguments)}}function nr(e){return function(){return-e.apply(this,arguments)}}function rr(e){return"string"==typeof e?JSON.stringify(e):String(e)}function or(){return k(arguments)}function ar(e,t){return et?-1:0}function ir(e){if(e.size===1/0)return 0;var t=l(e),n=u(e),r=t?1:0;return ur(e.__iterate(n?t?function(e,t){r=31*r+sr(Ce(e),Ce(t))|0}:function(e,t){r=r+sr(Ce(e),Ce(t))|0}:t?function(e){r=31*r+Ce(e)|0}:function(e){r=r+Ce(e)|0}),r)}function ur(e,t){return t=Ae(t,3432918353),t=Ae(t<<15|t>>>-15,461845907),t=Ae(t<<13|t>>>-13,5),t=Ae((t=(t+3864292196|0)^e)^t>>>16,2246822507),t=Oe((t=Ae(t^t>>>13,3266489909))^t>>>16)}function sr(e,t){return e^t+2654435769+(e<<6)+(e>>2)|0}return Zn[p]=!0,Zn[B]=Qn.entries,Zn.__toJS=Qn.toObject,Zn.__toStringMapper=function(e,t){return JSON.stringify(t)+": "+rr(e)},Gn(o,{toKeyedSeq:function(){return new Jt(this,!1)},filter:function(e,t){return mn(this,en(this,e,t,!1))},findIndex:function(e,t){var n=this.findEntry(e,t);return n?n[0]:-1},indexOf:function(e){var t=this.keyOf(e);return void 0===t?-1:t},lastIndexOf:function(e){var t=this.lastKeyOf(e);return void 0===t?-1:t},reverse:function(){return mn(this,Xt(this,!1))},slice:function(e,t){return mn(this,rn(this,e,t,!1))},splice:function(e,t){var n=arguments.length;if(t=Math.max(0|t,0),0===n||2===n&&!t)return this;e=T(e,e<0?this.count():this.size);var r=this.slice(0,e);return mn(this,1===n?r:r.concat(k(arguments,2),this.slice(e+t)))},findLastIndex:function(e,t){var n=this.findLastEntry(e,t);return n?n[0]:-1},first:function(){return this.get(0)},flatten:function(e){return mn(this,sn(this,e,!1))},get:function(e,t){return(e=O(this,e))<0||this.size===1/0||void 0!==this.size&&e>this.size?t:this.find((function(t,n){return n===e}),void 0,t)},has:function(e){return(e=O(this,e))>=0&&(void 0!==this.size?this.size===1/0||e1)try{return decodeURIComponent(t[1])}catch(e){console.error(e)}return null}function Pe(e){return t=e.replace(/\.[^./]*$/,""),Y()(J()(t));var t}function Ne(e,t,n,r,a){if(!t)return[];var u=[],s=t.get("nullable"),c=t.get("required"),f=t.get("maximum"),h=t.get("minimum"),d=t.get("type"),m=t.get("format"),g=t.get("maxLength"),b=t.get("minLength"),x=t.get("uniqueItems"),E=t.get("maxItems"),_=t.get("minItems"),S=t.get("pattern"),k=n||!0===c,A=null!=e;if(s&&null===e||!d||!(k||A&&"array"===d||!(!k&&!A)))return[];var O="string"===d&&e,C="array"===d&&l()(e)&&e.length,j="array"===d&&W.a.List.isList(e)&&e.count(),T=[O,C,j,"array"===d&&"string"==typeof e&&e,"file"===d&&e instanceof ue.a.File,"boolean"===d&&(e||!1===e),"number"===d&&(e||0===e),"integer"===d&&(e||0===e),"object"===d&&"object"===i()(e)&&null!==e,"object"===d&&"string"==typeof e&&e],I=P()(T).call(T,(function(e){return!!e}));if(k&&!I&&!r)return u.push("Required field is not provided"),u;if("object"===d&&(null===a||"application/json"===a)){var N,M=e;if("string"==typeof e)try{M=JSON.parse(e)}catch(e){return u.push("Parameter string value must be valid JSON"),u}if(t&&t.has("required")&&_e(c.isList)&&c.isList()&&y()(c).call(c,(function(e){void 0===M[e]&&u.push({propKey:e,error:"Required property not found"})})),t&&t.has("properties"))y()(N=t.get("properties")).call(N,(function(e,t){var n=Ne(M[t],e,!1,r,a);u.push.apply(u,o()(p()(n).call(n,(function(e){return{propKey:t,error:e}}))))}))}if(S){var R=function(e,t){if(!new RegExp(t).test(e))return"Value must follow pattern "+t}(e,S);R&&u.push(R)}if(_&&"array"===d){var D=function(e,t){var n;if(!e&&t>=1||e&&e.lengtht)return v()(n="Array must not contain more then ".concat(t," item")).call(n,1===t?"":"s")}(e,E);L&&u.push({needRemove:!0,error:L})}if(x&&"array"===d){var B=function(e,t){if(e&&("true"===t||!0===t)){var n=Object(V.fromJS)(e),r=n.toSet();if(e.length>r.size){var o=Object(V.Set)();if(y()(n).call(n,(function(e,t){w()(n).call(n,(function(t){return _e(t.equals)?t.equals(e):t===e})).size>1&&(o=o.add(t))})),0!==o.size)return p()(o).call(o,(function(e){return{index:e,error:"No duplicates allowed."}})).toArray()}}}(e,x);B&&u.push.apply(u,o()(B))}if(g||0===g){var F=function(e,t){var n;if(e.length>t)return v()(n="Value must be no longer than ".concat(t," character")).call(n,1!==t?"s":"")}(e,g);F&&u.push(F)}if(b){var z=function(e,t){var n;if(e.lengtht)return"Value must be less than ".concat(t)}(e,f);U&&u.push(U)}if(h||0===h){var q=function(e,t){if(e2&&void 0!==arguments[2]?arguments[2]:{},r=n.isOAS3,o=void 0!==r&&r,a=n.bypassRequiredCheck,i=void 0!==a&&a,u=e.get("required"),s=Object(le.a)(e,{isOAS3:o}),c=s.schema,l=s.parameterContentMediaType;return Ne(t,c,u,i,l)},Re=function(e,t,n){if(e&&(!e.xml||!e.xml.name)){if(e.xml=e.xml||{},!e.$$ref)return e.type||e.items||e.properties||e.additionalProperties?'\n\x3c!-- XML example cannot be generated; root element name is undefined --\x3e':null;var r=e.$$ref.match(/\S*\/(\S+)$/);e.xml.name=r[1]}return Object(ie.memoizedCreateXMLExample)(e,t,n)},De=[{when:/json/,shouldStringifyTypes:["string"]}],Le=["object"],Be=function(e,t,n,r){var a=Object(ie.memoizedSampleFromSchema)(e,t,r),u=i()(a),s=S()(De).call(De,(function(e,t){var r;return t.when.test(n)?v()(r=[]).call(r,o()(e),o()(t.shouldStringifyTypes)):e}),Le);return te()(s,(function(e){return e===u}))?M()(a,null,2):a},Fe=function(e,t,n,r){var o,a=Be(e,t,n,r);try{"\n"===(o=me.a.dump(me.a.load(a),{lineWidth:-1}))[o.length-1]&&(o=T()(o).call(o,0,o.length-1))}catch(e){return console.error(e),"error: could not generate yaml example"}return o.replace(/\t/g," ")},ze=function(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:void 0;return e&&_e(e.toJS)&&(e=e.toJS()),r&&_e(r.toJS)&&(r=r.toJS()),/xml/.test(t)?Re(e,n,r):/(yaml|yml)/.test(t)?Fe(e,n,t,r):Be(e,n,t,r)},Ue=function(){var e={},t=ue.a.location.search;if(!t)return{};if(""!=t){var n=t.substr(1).split("&");for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(r=n[r].split("="),e[decodeURIComponent(r[0])]=r[1]&&decodeURIComponent(r[1])||"")}return e},qe=function(t){return(t instanceof e?t:e.from(t.toString(),"utf-8")).toString("base64")},Ve={operationsSorter:{alpha:function(e,t){return e.get("path").localeCompare(t.get("path"))},method:function(e,t){return e.get("method").localeCompare(t.get("method"))}},tagsSorter:{alpha:function(e,t){return e.localeCompare(t)}}},We=function(e){var t=[];for(var n in e){var r=e[n];void 0!==r&&""!==r&&t.push([n,"=",encodeURIComponent(r).replace(/%20/g,"+")].join(""))}return t.join("&")},He=function(e,t,n){return!!X()(n,(function(n){return re()(e[n],t[n])}))};function $e(e){return"string"!=typeof e||""===e?"":Object(H.sanitizeUrl)(e)}function Je(e){return!(!e||D()(e).call(e,"localhost")>=0||D()(e).call(e,"127.0.0.1")>=0||"none"===e)}function Ke(e){if(!W.a.OrderedMap.isOrderedMap(e))return null;if(!e.size)return null;var t=B()(e).call(e,(function(e,t){return z()(t).call(t,"2")&&E()(e.get("content")||{}).length>0})),n=e.get("default")||W.a.OrderedMap(),r=(n.get("content")||W.a.OrderedMap()).keySeq().toJS().length?n:null;return t||r}var Ye=function(e){return"string"==typeof e||e instanceof String?q()(e).call(e).replace(/\s/g,"%20"):""},Ge=function(e){return ce()(Ye(e).replace(/%20/g,"_"))},Qe=function(e){return w()(e).call(e,(function(e,t){return/^x-/.test(t)}))},Ze=function(e){return w()(e).call(e,(function(e,t){return/^pattern|maxLength|minLength|maximum|minimum/.test(t)}))};function Xe(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:function(){return!0};if("object"!==i()(e)||l()(e)||null===e||!t)return e;var o=A()({},e);return y()(n=E()(o)).call(n,(function(e){e===t&&r(o[e],e)?delete o[e]:o[e]=Xe(o[e],t,r)})),o}function et(e){if("string"==typeof e)return e;if(e&&e.toJS&&(e=e.toJS()),"object"===i()(e)&&null!==e)try{return M()(e,null,2)}catch(t){return String(e)}return null==e?"":e.toString()}function tt(e){return"number"==typeof e?e.toString():e}function nt(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=t.returnAll,r=void 0!==n&&n,o=t.allowHashes,a=void 0===o||o;if(!W.a.Map.isMap(e))throw new Error("paramToIdentifier: received a non-Im.Map parameter as input");var i,u,s,c=e.get("name"),l=e.get("in"),f=[];e&&e.hashCode&&l&&c&&a&&f.push(v()(i=v()(u="".concat(l,".")).call(u,c,".hash-")).call(i,e.hashCode()));l&&c&&f.push(v()(s="".concat(l,".")).call(s,c));return f.push(c),r?f:f[0]||""}function rt(e,t){var n,r=nt(e,{returnAll:!0});return w()(n=p()(r).call(r,(function(e){return t[e]}))).call(n,(function(e){return void 0!==e}))[0]}function ot(){return it(pe()(32).toString("base64"))}function at(e){return it(de()("sha256").update(e).digest("base64"))}function it(e){return e.replace(/\+/g,"-").replace(/\//g,"_").replace(/=/g,"")}var ut=function(e){return!e||!(!ge(e)||!e.isEmpty())}}).call(this,n(129).Buffer)},function(e,t,n){var r=n(415),o=n(185),a=n(249);e.exports=function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=r(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),o(e,"prototype",{writable:!1}),t&&a(e,t)},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){var r=n(250),o=n(137),a=n(416),i=n(764);e.exports=function(e){var t=a();return function(){var n,a=o(e);if(t){var u=o(this).constructor;n=r(a,arguments,u)}else n=a.apply(this,arguments);return i(this,n)}},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t){e.exports=function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){e.exports=n(884)()},function(e,t,n){e.exports=n(348)},function(e,t,n){var r=n(385),o=n(622),a=n(197),i=n(386);e.exports=function(e,t){return r(e)||o(e,t)||a(e,t)||i()},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){var r=n(606),o=n(378),a=n(197),i=n(621);e.exports=function(e){return r(e)||o(e)||a(e)||i()},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){e.exports=n(349)},function(e,t,n){"use strict";var r=n(17),o=n(96),a=n(27),i=n(42),u=n(97).f,s=n(334),c=n(35),l=n(54),f=n(90),p=n(47),h=function(e){var t=function(n,r,a){if(this instanceof t){switch(arguments.length){case 0:return new e;case 1:return new e(n);case 2:return new e(n,r)}return new e(n,r,a)}return o(e,this,arguments)};return t.prototype=e.prototype,t};e.exports=function(e,t){var n,o,d,m,v,g,y,b,w=e.target,x=e.global,E=e.stat,_=e.proto,S=x?r:E?r[w]:(r[w]||{}).prototype,k=x?c:c[w]||f(c,w,{})[w],A=k.prototype;for(d in t)n=!s(x?d:w+(E?".":"#")+d,e.forced)&&S&&p(S,d),v=k[d],n&&(g=e.noTargetGet?(b=u(S,d))&&b.value:S[d]),m=n&&g?g:t[d],n&&typeof v==typeof m||(y=e.bind&&n?l(m,r):e.wrap&&n?h(m):_&&i(m)?a(m):m,(e.sham||m&&m.sham||v&&v.sham)&&f(y,"sham",!0),f(k,d,y),_&&(p(c,o=w+"Prototype")||f(c,o,{}),f(c[o],d,m),e.real&&A&&!A[d]&&f(A,d,m)))}},function(e,t,n){(function(t){var n=function(e){return e&&e.Math==Math&&e};e.exports=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof t&&t)||function(){return this}()||Function("return this")()}).call(this,n(61))},function(e,t,n){"use strict";n.d(t,"a",(function(){return s}));var r="NOT_FOUND";var o=function(e,t){return e===t};function a(e,t){var n,a,i="object"==typeof t?t:{equalityCheck:t},u=i.equalityCheck,s=void 0===u?o:u,c=i.maxSize,l=void 0===c?1:c,f=i.resultEqualityCheck,p=function(e){return function(t,n){if(null===t||null===n||t.length!==n.length)return!1;for(var r=t.length,o=0;o-1){var a=n[o];return o>0&&(n.splice(o,1),n.unshift(a)),a.value}return r}return{get:o,put:function(t,a){o(t)===r&&(n.unshift({key:t,value:a}),n.length>e&&n.pop())},getEntries:function(){return n},clear:function(){n=[]}}}(l,p);function d(){var t=h.get(arguments);if(t===r){if(t=e.apply(null,arguments),f){var n=h.getEntries(),o=n.find((function(e){return f(e.value,t)}));o&&(t=o.value)}h.put(arguments,t)}return t}return d.clearCache=function(){return h.clear()},d}function i(e){var t=Array.isArray(e[0])?e[0]:e;if(!t.every((function(e){return"function"==typeof e}))){var n=t.map((function(e){return"function"==typeof e?"function "+(e.name||"unnamed")+"()":typeof e})).join(", ");throw new Error("createSelector expects all input-selectors to be functions, but received the following types: ["+n+"]")}return t}function u(e){for(var t=arguments.length,n=new Array(t>1?t-1:0),r=1;r>",i=function(){invariant(!1,"ImmutablePropTypes type checking code is stripped in production.")};i.isRequired=i;var u=function(){return i};function s(e){var t=typeof e;return Array.isArray(e)?"array":e instanceof RegExp?"object":e instanceof o.Iterable?"Immutable."+e.toSource().split(" ")[0]:t}function c(e){function t(t,n,r,o,i,u){for(var s=arguments.length,c=Array(s>6?s-6:0),l=6;l4)}function l(e){var t=e.get("swagger");return"string"==typeof t&&i()(t).call(t,"2.0")}function f(e){return function(t,n){return function(r){return n&&n.specSelectors&&n.specSelectors.specJson?c(n.specSelectors.specJson())?s.a.createElement(e,o()({},r,n,{Ori:t})):s.a.createElement(t,r):(console.warn("OAS3 wrapper: couldn't get spec"),null)}}}},function(e,t,n){var r=n(17),o=n(220),a=n(47),i=n(179),u=n(218),s=n(332),c=o("wks"),l=r.Symbol,f=l&&l.for,p=s?l:l&&l.withoutSetter||i;e.exports=function(e){if(!a(c,e)||!u&&"string"!=typeof c[e]){var t="Symbol."+e;u&&a(l,e)?c[e]=l[e]:c[e]=s&&f?f(t):p(t)}return c[e]}},function(e,t,n){var r=n(35);e.exports=function(e){return r[e+"Prototype"]}},function(e,t){e.exports=function(e){return"function"==typeof e}},function(e,t,n){var r=n(244);e.exports=function(e,t,n){var o=null==e?void 0:r(e,t);return void 0===o?n:o}},function(e,t,n){e.exports=n(867)},function(e,t,n){var r=n(42);e.exports=function(e){return"object"==typeof e?null!==e:r(e)}},function(e,t,n){var r=n(17),o=n(42),a=n(178),i=r.TypeError;e.exports=function(e){if(o(e))return e;throw i(a(e)+" is not a function")}},function(e,t,n){var r=n(27),o=n(62),a=r({}.hasOwnProperty);e.exports=Object.hasOwn||function(e,t){return a(o(e),t)}},function(e,t,n){var r=n(35),o=n(47),a=n(230),i=n(63).f;e.exports=function(e){var t=r.Symbol||(r.Symbol={});o(t,e)||i(t,e,{value:a.f(e)})}},function(e,t,n){var r=n(17),o=n(54),a=n(37),i=n(33),u=n(178),s=n(383),c=n(67),l=n(36),f=n(159),p=n(158),h=n(382),d=r.TypeError,m=function(e,t){this.stopped=e,this.result=t},v=m.prototype;e.exports=function(e,t,n){var r,g,y,b,w,x,E,_=n&&n.that,S=!(!n||!n.AS_ENTRIES),k=!(!n||!n.IS_ITERATOR),A=!(!n||!n.INTERRUPTED),O=o(t,_),C=function(e){return r&&h(r,"normal",e),new m(!0,e)},j=function(e){return S?(i(e),A?O(e[0],e[1],C):O(e[0],e[1])):A?O(e,C):O(e)};if(k)r=e;else{if(!(g=p(e)))throw d(u(e)+" is not iterable");if(s(g)){for(y=0,b=c(e);b>y;y++)if((w=j(e[y]))&&l(v,w))return w;return new m(!1)}r=f(e,g)}for(x=r.next;!(E=a(x,r)).done;){try{w=j(E.value)}catch(e){h(r,"throw",e)}if("object"==typeof w&&w&&l(v,w))return w}return new m(!1)}},function(e,t,n){e.exports=n(352)},function(e,t,n){var r=n(34);e.exports=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]}))},function(e,t,n){"use strict";n.r(t),n.d(t,"UPDATE_SPEC",(function(){return ee})),n.d(t,"UPDATE_URL",(function(){return te})),n.d(t,"UPDATE_JSON",(function(){return ne})),n.d(t,"UPDATE_PARAM",(function(){return re})),n.d(t,"UPDATE_EMPTY_PARAM_INCLUSION",(function(){return oe})),n.d(t,"VALIDATE_PARAMS",(function(){return ae})),n.d(t,"SET_RESPONSE",(function(){return ie})),n.d(t,"SET_REQUEST",(function(){return ue})),n.d(t,"SET_MUTATED_REQUEST",(function(){return se})),n.d(t,"LOG_REQUEST",(function(){return ce})),n.d(t,"CLEAR_RESPONSE",(function(){return le})),n.d(t,"CLEAR_REQUEST",(function(){return fe})),n.d(t,"CLEAR_VALIDATE_PARAMS",(function(){return pe})),n.d(t,"UPDATE_OPERATION_META_VALUE",(function(){return he})),n.d(t,"UPDATE_RESOLVED",(function(){return de})),n.d(t,"UPDATE_RESOLVED_SUBTREE",(function(){return me})),n.d(t,"SET_SCHEME",(function(){return ve})),n.d(t,"updateSpec",(function(){return ge})),n.d(t,"updateResolved",(function(){return ye})),n.d(t,"updateUrl",(function(){return be})),n.d(t,"updateJsonSpec",(function(){return we})),n.d(t,"parseToJson",(function(){return xe})),n.d(t,"resolveSpec",(function(){return _e})),n.d(t,"requestResolvedSubtree",(function(){return Ae})),n.d(t,"changeParam",(function(){return Oe})),n.d(t,"changeParamByIdentity",(function(){return Ce})),n.d(t,"updateResolvedSubtree",(function(){return je})),n.d(t,"invalidateResolvedSubtreeCache",(function(){return Te})),n.d(t,"validateParams",(function(){return Ie})),n.d(t,"updateEmptyParamInclusion",(function(){return Pe})),n.d(t,"clearValidateParams",(function(){return Ne})),n.d(t,"changeConsumesValue",(function(){return Me})),n.d(t,"changeProducesValue",(function(){return Re})),n.d(t,"setResponse",(function(){return De})),n.d(t,"setRequest",(function(){return Le})),n.d(t,"setMutatedRequest",(function(){return Be})),n.d(t,"logRequest",(function(){return Fe})),n.d(t,"executeRequest",(function(){return ze})),n.d(t,"execute",(function(){return Ue})),n.d(t,"clearResponse",(function(){return qe})),n.d(t,"clearRequest",(function(){return Ve})),n.d(t,"setScheme",(function(){return We}));var r=n(25),o=n.n(r),a=n(59),i=n.n(a),u=n(79),s=n.n(u),c=n(19),l=n.n(c),f=n(44),p=n.n(f),h=n(22),d=n.n(h),m=n(4),v=n.n(m),g=n(322),y=n.n(g),b=n(31),w=n.n(b),x=n(140),E=n.n(x),_=n(72),S=n.n(_),k=n(12),A=n.n(k),O=n(206),C=n.n(O),j=n(20),T=n.n(j),I=n(23),P=n.n(I),N=n(2),M=n.n(N),R=n(15),D=n.n(R),L=n(24),B=n.n(L),F=n(323),z=n.n(F),U=n(76),q=n(1),V=n(92),W=n.n(V),H=n(138),$=n(454),J=n.n($),K=n(455),Y=n.n(K),G=n(324),Q=n.n(G),Z=n(7),X=["path","method"],ee="spec_update_spec",te="spec_update_url",ne="spec_update_json",re="spec_update_param",oe="spec_update_empty_param_inclusion",ae="spec_validate_param",ie="spec_set_response",ue="spec_set_request",se="spec_set_mutated_request",ce="spec_log_request",le="spec_clear_response",fe="spec_clear_request",pe="spec_clear_validate_param",he="spec_update_operation_meta_value",de="spec_update_resolved",me="spec_update_resolved_subtree",ve="set_scheme";function ge(e){var t,n=(t=e,J()(t)?t:"").replace(/\t/g," ");if("string"==typeof e)return{type:ee,payload:n}}function ye(e){return{type:de,payload:e}}function be(e){return{type:te,payload:e}}function we(e){return{type:ne,payload:e}}var xe=function(e){return function(t){var n=t.specActions,r=t.specSelectors,o=t.errActions,a=r.specStr,i=null;try{e=e||a(),o.clear({source:"parser"}),i=U.a.load(e)}catch(e){return console.error(e),o.newSpecErr({source:"parser",level:"error",message:e.reason,line:e.mark&&e.mark.line?e.mark.line+1:void 0})}return i&&"object"===l()(i)?n.updateJsonSpec(i):{}}},Ee=!1,_e=function(e,t){return function(n){var r=n.specActions,o=n.specSelectors,a=n.errActions,i=n.fn,u=i.fetch,s=i.resolve,c=i.AST,l=void 0===c?{}:c,f=n.getConfigs;Ee||(console.warn("specActions.resolveSpec is deprecated since v3.10.0 and will be removed in v4.0.0; use requestResolvedSubtree instead!"),Ee=!0);var p=f(),h=p.modelPropertyMacro,m=p.parameterMacro,g=p.requestInterceptor,b=p.responseInterceptor;void 0===e&&(e=o.specJson()),void 0===t&&(t=o.url());var w=l.getLineNumberForPath?l.getLineNumberForPath:function(){},x=o.specStr();return s({fetch:u,spec:e,baseDoc:t,modelPropertyMacro:h,parameterMacro:m,requestInterceptor:g,responseInterceptor:b}).then((function(e){var t=e.spec,n=e.errors;if(a.clear({type:"thrown"}),d()(n)&&n.length>0){var o=v()(n).call(n,(function(e){return console.error(e),e.line=e.fullPath?w(x,e.fullPath):null,e.path=e.fullPath?e.fullPath.join("."):null,e.level="error",e.type="thrown",e.source="resolver",y()(e,"message",{enumerable:!0,value:e.message}),e}));a.newThrownErrBatch(o)}return r.updateResolved(t)}))}},Se=[],ke=Y()(s()(p.a.mark((function e(){var t,n,r,o,a,i,u,c,l,f,h,m,g,b,x,_,k,O;return p.a.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(t=Se.system){e.next=4;break}return console.error("debResolveSubtrees: don't have a system to operate on, aborting."),e.abrupt("return");case 4:if(n=t.errActions,r=t.errSelectors,o=t.fn,a=o.resolveSubtree,i=o.fetch,u=o.AST,c=void 0===u?{}:u,l=t.specSelectors,f=t.specActions,a){e.next=8;break}return console.error("Error: Swagger-Client did not provide a `resolveSubtree` method, doing nothing."),e.abrupt("return");case 8:return h=c.getLineNumberForPath?c.getLineNumberForPath:function(){},m=l.specStr(),g=t.getConfigs(),b=g.modelPropertyMacro,x=g.parameterMacro,_=g.requestInterceptor,k=g.responseInterceptor,e.prev=11,e.next=14,w()(Se).call(Se,function(){var e=s()(p.a.mark((function e(t,o){var u,c,f,g,w,O,j,T,I;return p.a.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return e.next=2,t;case 2:return u=e.sent,c=u.resultMap,f=u.specWithCurrentSubtrees,e.next=7,a(f,o,{baseDoc:l.url(),modelPropertyMacro:b,parameterMacro:x,requestInterceptor:_,responseInterceptor:k});case 7:if(g=e.sent,w=g.errors,O=g.spec,r.allErrors().size&&n.clearBy((function(e){var t;return"thrown"!==e.get("type")||"resolver"!==e.get("source")||!E()(t=e.get("fullPath")).call(t,(function(e,t){return e===o[t]||void 0===o[t]}))})),d()(w)&&w.length>0&&(j=v()(w).call(w,(function(e){return e.line=e.fullPath?h(m,e.fullPath):null,e.path=e.fullPath?e.fullPath.join("."):null,e.level="error",e.type="thrown",e.source="resolver",y()(e,"message",{enumerable:!0,value:e.message}),e})),n.newThrownErrBatch(j)),!O||!l.isOAS3()||"components"!==o[0]||"securitySchemes"!==o[1]){e.next=15;break}return e.next=15,S.a.all(v()(T=A()(I=C()(O)).call(I,(function(e){return"openIdConnect"===e.type}))).call(T,function(){var e=s()(p.a.mark((function e(t){var n,r;return p.a.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:return n={url:t.openIdConnectUrl,requestInterceptor:_,responseInterceptor:k},e.prev=1,e.next=4,i(n);case 4:(r=e.sent)instanceof Error||r.status>=400?console.error(r.statusText+" "+n.url):t.openIdConnectData=JSON.parse(r.text),e.next=11;break;case 8:e.prev=8,e.t0=e.catch(1),console.error(e.t0);case 11:case"end":return e.stop()}}),e,null,[[1,8]])})));return function(t){return e.apply(this,arguments)}}()));case 15:return Q()(c,o,O),Q()(f,o,O),e.abrupt("return",{resultMap:c,specWithCurrentSubtrees:f});case 18:case"end":return e.stop()}}),e)})));return function(t,n){return e.apply(this,arguments)}}(),S.a.resolve({resultMap:(l.specResolvedSubtree([])||Object(q.Map)()).toJS(),specWithCurrentSubtrees:l.specJson().toJS()}));case 14:O=e.sent,delete Se.system,Se=[],e.next=22;break;case 19:e.prev=19,e.t0=e.catch(11),console.error(e.t0);case 22:f.updateResolvedSubtree([],O.resultMap);case 23:case"end":return e.stop()}}),e,null,[[11,19]])}))),35),Ae=function(e){return function(t){var n;T()(n=v()(Se).call(Se,(function(e){return e.join("@@")}))).call(n,e.join("@@"))>-1||(Se.push(e),Se.system=t,ke())}};function Oe(e,t,n,r,o){return{type:re,payload:{path:e,value:r,paramName:t,paramIn:n,isXml:o}}}function Ce(e,t,n,r){return{type:re,payload:{path:e,param:t,value:n,isXml:r}}}var je=function(e,t){return{type:me,payload:{path:e,value:t}}},Te=function(){return{type:me,payload:{path:[],value:Object(q.Map)()}}},Ie=function(e,t){return{type:ae,payload:{pathMethod:e,isOAS3:t}}},Pe=function(e,t,n,r){return{type:oe,payload:{pathMethod:e,paramName:t,paramIn:n,includeEmptyValue:r}}};function Ne(e){return{type:pe,payload:{pathMethod:e}}}function Me(e,t){return{type:he,payload:{path:e,value:t,key:"consumes_value"}}}function Re(e,t){return{type:he,payload:{path:e,value:t,key:"produces_value"}}}var De=function(e,t,n){return{payload:{path:e,method:t,res:n},type:ie}},Le=function(e,t,n){return{payload:{path:e,method:t,req:n},type:ue}},Be=function(e,t,n){return{payload:{path:e,method:t,req:n},type:se}},Fe=function(e){return{payload:e,type:ce}},ze=function(e){return function(t){var n,r,o=t.fn,a=t.specActions,i=t.specSelectors,u=t.getConfigs,c=t.oas3Selectors,l=e.pathName,f=e.method,h=e.operation,m=u(),g=m.requestInterceptor,y=m.responseInterceptor,b=h.toJS();h&&h.get("parameters")&&P()(n=A()(r=h.get("parameters")).call(r,(function(e){return e&&!0===e.get("allowEmptyValue")}))).call(n,(function(t){if(i.parameterInclusionSettingFor([l,f],t.get("name"),t.get("in"))){e.parameters=e.parameters||{};var n=Object(Z.B)(t,e.parameters);(!n||n&&0===n.size)&&(e.parameters[t.get("name")]="")}}));if(e.contextUrl=W()(i.url()).toString(),b&&b.operationId?e.operationId=b.operationId:b&&l&&f&&(e.operationId=o.opId(b,l,f)),i.isOAS3()){var w,x=M()(w="".concat(l,":")).call(w,f);e.server=c.selectedServer(x)||c.selectedServer();var E=c.serverVariables({server:e.server,namespace:x}).toJS(),_=c.serverVariables({server:e.server}).toJS();e.serverVariables=D()(E).length?E:_,e.requestContentType=c.requestContentType(l,f),e.responseContentType=c.responseContentType(l,f)||"*/*";var S,k=c.requestBodyValue(l,f),O=c.requestBodyInclusionSetting(l,f);if(k&&k.toJS)e.requestBody=A()(S=v()(k).call(k,(function(e){return q.Map.isMap(e)?e.get("value"):e}))).call(S,(function(e,t){return(d()(e)?0!==e.length:!Object(Z.q)(e))||O.get(t)})).toJS();else e.requestBody=k}var C=B()({},e);C=o.buildRequest(C),a.setRequest(e.pathName,e.method,C);var j=function(){var t=s()(p.a.mark((function t(n){var r,o;return p.a.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,g.apply(undefined,[n]);case 2:return r=t.sent,o=B()({},r),a.setMutatedRequest(e.pathName,e.method,o),t.abrupt("return",r);case 6:case"end":return t.stop()}}),t)})));return function(e){return t.apply(this,arguments)}}();e.requestInterceptor=j,e.responseInterceptor=y;var T=z()();return o.execute(e).then((function(t){t.duration=z()()-T,a.setResponse(e.pathName,e.method,t)})).catch((function(t){"Failed to fetch"===t.message&&(t.name="",t.message='**Failed to fetch.** \n**Possible Reasons:** \n - CORS \n - Network Failure \n - URL scheme must be "http" or "https" for CORS request.'),a.setResponse(e.pathName,e.method,{error:!0,err:Object(H.serializeError)(t)})}))}},Ue=function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},t=e.path,n=e.method,r=i()(e,X);return function(e){var a=e.fn.fetch,i=e.specSelectors,u=e.specActions,s=i.specJsonWithResolvedSubtrees().toJS(),c=i.operationScheme(t,n),l=i.contentTypeValues([t,n]).toJS(),f=l.requestContentType,p=l.responseContentType,h=/xml/i.test(f),d=i.parameterValues([t,n],h).toJS();return u.executeRequest(o()(o()({},r),{},{fetch:a,spec:s,pathName:t,method:n,parameters:d,requestContentType:f,scheme:c,responseContentType:p}))}};function qe(e,t){return{type:le,payload:{path:e,method:t}}}function Ve(e,t){return{type:fe,payload:{path:e,method:t}}}function We(e,t,n){return{type:ve,payload:{scheme:e,path:t,method:n}}}},function(e,t,n){var r;!function(){"use strict";var n={}.hasOwnProperty;function o(){for(var e=[],t=0;t=e.length?{done:!0}:{done:!1,value:e[u++]}},e:function(e){throw e},f:s}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var c,l=!0,f=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return l=e.done,e},e:function(e){f=!0,c=e},f:function(){try{l||null==n.return||n.return()}finally{if(f)throw c}}}},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){var r=n(35),o=n(17),a=n(42),i=function(e){return a(e)?e:void 0};e.exports=function(e,t){return arguments.length<2?i(r[e])||i(o[e]):r[e]&&r[e][t]||o[e]&&o[e][t]}},function(e,t){var n=Array.isArray;e.exports=n},function(e,t,n){var r=n(425),o=n(252),a=n(845);e.exports=function(e,t){if(null==e)return{};var n,i,u=a(e,t);if(r){var s=r(e);for(i=0;i=0||Object.prototype.propertyIsEnumerable.call(e,n)&&(u[n]=e[n])}return u},e.exports.__esModule=!0,e.exports.default=e.exports},function(e,t,n){"use strict";n.r(t),n.d(t,"UPDATE_SELECTED_SERVER",(function(){return r})),n.d(t,"UPDATE_REQUEST_BODY_VALUE",(function(){return o})),n.d(t,"UPDATE_REQUEST_BODY_VALUE_RETAIN_FLAG",(function(){return a})),n.d(t,"UPDATE_REQUEST_BODY_INCLUSION",(function(){return i})),n.d(t,"UPDATE_ACTIVE_EXAMPLES_MEMBER",(function(){return u})),n.d(t,"UPDATE_REQUEST_CONTENT_TYPE",(function(){return s})),n.d(t,"UPDATE_RESPONSE_CONTENT_TYPE",(function(){return c})),n.d(t,"UPDATE_SERVER_VARIABLE_VALUE",(function(){return l})),n.d(t,"SET_REQUEST_BODY_VALIDATE_ERROR",(function(){return f})),n.d(t,"CLEAR_REQUEST_BODY_VALIDATE_ERROR",(function(){return p})),n.d(t,"CLEAR_REQUEST_BODY_VALUE",(function(){return h})),n.d(t,"setSelectedServer",(function(){return d})),n.d(t,"setRequestBodyValue",(function(){return m})),n.d(t,"setRetainRequestBodyValueFlag",(function(){return v})),n.d(t,"setRequestBodyInclusion",(function(){return g})),n.d(t,"setActiveExamplesMember",(function(){return y})),n.d(t,"setRequestContentType",(function(){return b})),n.d(t,"setResponseContentType",(function(){return w})),n.d(t,"setServerVariableValue",(function(){return x})),n.d(t,"setRequestBodyValidateError",(function(){return E})),n.d(t,"clearRequestBodyValidateError",(function(){return _})),n.d(t,"initRequestBodyValidateError",(function(){return S})),n.d(t,"clearRequestBodyValue",(function(){return k}));var r="oas3_set_servers",o="oas3_set_request_body_value",a="oas3_set_request_body_retain_flag",i="oas3_set_request_body_inclusion",u="oas3_set_active_examples_member",s="oas3_set_request_content_type",c="oas3_set_response_content_type",l="oas3_set_server_variable_value",f="oas3_set_request_body_validate_error",p="oas3_clear_request_body_validate_error",h="oas3_clear_request_body_value";function d(e,t){return{type:r,payload:{selectedServerUrl:e,namespace:t}}}function m(e){var t=e.value,n=e.pathMethod;return{type:o,payload:{value:t,pathMethod:n}}}var v=function(e){var t=e.value,n=e.pathMethod;return{type:a,payload:{value:t,pathMethod:n}}};function g(e){var t=e.value,n=e.pathMethod,r=e.name;return{type:i,payload:{value:t,pathMethod:n,name:r}}}function y(e){var t=e.name,n=e.pathMethod,r=e.contextType,o=e.contextName;return{type:u,payload:{name:t,pathMethod:n,contextType:r,contextName:o}}}function b(e){var t=e.value,n=e.pathMethod;return{type:s,payload:{value:t,pathMethod:n}}}function w(e){var t=e.value,n=e.path,r=e.method;return{type:c,payload:{value:t,path:n,method:r}}}function x(e){var t=e.server,n=e.namespace,r=e.key,o=e.val;return{type:l,payload:{server:t,namespace:n,key:r,val:o}}}var E=function(e){var t=e.path,n=e.method,r=e.validationErrors;return{type:f,payload:{path:t,method:n,validationErrors:r}}},_=function(e){var t=e.path,n=e.method;return{type:p,payload:{path:t,method:n}}},S=function(e){var t=e.pathMethod;return{type:p,payload:{path:t[0],method:t[1]}}},k=function(e){var t=e.pathMethod;return{type:h,payload:{pathMethod:t}}}},function(e,t){var n;n=function(){return this}();try{n=n||new Function("return this")()}catch(e){"object"==typeof window&&(n=window)}e.exports=n},function(e,t,n){var r=n(17),o=n(114),a=r.Object;e.exports=function(e){return a(o(e))}},function(e,t,n){var r=n(17),o=n(51),a=n(333),i=n(335),u=n(33),s=n(177),c=r.TypeError,l=Object.defineProperty,f=Object.getOwnPropertyDescriptor,p="enumerable",h="configurable",d="writable";t.f=o?i?function(e,t,n){if(u(e),t=s(t),u(n),"function"==typeof e&&"prototype"===t&&"value"in n&&d in n&&!n.writable){var r=f(e,t);r&&r.writable&&(e[t]=n.value,n={configurable:h in n?n.configurable:r.configurable,enumerable:p in n?n.enumerable:r.enumerable,writable:!1})}return l(e,t,n)}:l:function(e,t,n){if(u(e),t=s(t),u(n),a)try{return l(e,t,n)}catch(e){}if("get"in n||"set"in n)throw c("Accessors not supported");return"value"in n&&(e[t]=n.value),e}},function(e,t,n){"use strict";n.d(t,"b",(function(){return m})),n.d(t,"e",(function(){return v})),n.d(t,"c",(function(){return y})),n.d(t,"a",(function(){return b})),n.d(t,"d",(function(){return w}));var r=n(56),o=n.n(r),a=n(19),i=n.n(a),u=n(109),s=n.n(u),c=n(2),l=n.n(c),f=n(32),p=n.n(f),h=function(e){return String.prototype.toLowerCase.call(e)},d=function(e){return e.replace(/[^\w]/gi,"_")};function m(e){var t=e.openapi;return!!t&&s()(t).call(t,"3")}function v(e,t){var n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:"",r=arguments.length>3&&void 0!==arguments[3]?arguments[3]:{},o=r.v2OperationIdCompatibilityMode;if(!e||"object"!==i()(e))return null;var a=(e.operationId||"").replace(/\s/g,"");return a.length?d(e.operationId):g(t,n,{v2OperationIdCompatibilityMode:o})}function g(e,t){var n,r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{},o=r.v2OperationIdCompatibilityMode;if(o){var a,i,u=l()(a="".concat(t.toLowerCase(),"_")).call(a,e).replace(/[\s!@#$%^&*()_+=[{\]};:<>|./?,\\'""-]/g,"_");return(u=u||l()(i="".concat(e.substring(1),"_")).call(i,t)).replace(/((_){2,})/g,"_").replace(/^(_)*/g,"").replace(/([_])*$/g,"")}return l()(n="".concat(h(t))).call(n,d(e))}function y(e,t){var n;return l()(n="".concat(h(t),"-")).call(n,e)}function b(e,t){return e&&e.paths?function(e,t){return function(e,t,n){if(!e||"object"!==i()(e)||!e.paths||"object"!==i()(e.paths))return null;var r=e.paths;for(var o in r)for(var a in r[o])if("PARAMETERS"!==a.toUpperCase()){var u=r[o][a];if(u&&"object"===i()(u)){var s={spec:e,pathName:o,method:a.toUpperCase(),operation:u},c=t(s);if(n&&c)return s}}return}(e,t,!0)||null}(e,(function(e){var n=e.pathName,r=e.method,o=e.operation;if(!o||"object"!==i()(o))return!1;var a=o.operationId;return[v(o,n,r),y(n,r),a].some((function(e){return e&&e===t}))})):null}function w(e){var t=e.spec,n=t.paths,r={};if(!n||t.$$normalized)return e;for(var a in n){var u,s=n[a];if(null!=s&&p()(u=["object","function"]).call(u,i()(s))){var c=s.parameters,f=function(e){var n,u=s[e];if(null==u||!p()(n=["object","function"]).call(n,i()(u)))return"continue";var f=v(u,a,e);if(f){r[f]?r[f].push(u):r[f]=[u];var h=r[f];if(h.length>1)h.forEach((function(e,t){var n;e.__originalOperationId=e.__originalOperationId||e.operationId,e.operationId=l()(n="".concat(f)).call(n,t+1)}));else if(void 0!==u.operationId){var d=h[0];d.__originalOperationId=d.__originalOperationId||u.operationId,d.operationId=f}}if("parameters"!==e){var m=[],g={};for(var y in t)"produces"!==y&&"consumes"!==y&&"security"!==y||(g[y]=t[y],m.push(g));if(c&&(g.parameters=c,m.push(g)),m.length){var b,w=o()(m);try{for(w.s();!(b=w.n()).done;){var x=b.value;for(var E in x)if(u[E]){if("parameters"===E){var _,S=o()(x[E]);try{var k=function(){var e=_.value;u[E].some((function(t){return t.name&&t.name===e.name||t.$ref&&t.$ref===e.$ref||t.$$ref&&t.$$ref===e.$$ref||t===e}))||u[E].push(e)};for(S.s();!(_=S.n()).done;)k()}catch(e){S.e(e)}finally{S.f()}}}else u[E]=x[E]}}catch(e){w.e(e)}finally{w.f()}}}};for(var h in s)f(h)}}return t.$$normalized=!0,e}},function(e,t,n){"use strict";n.r(t),n.d(t,"NEW_THROWN_ERR",(function(){return o})),n.d(t,"NEW_THROWN_ERR_BATCH",(function(){return a})),n.d(t,"NEW_SPEC_ERR",(function(){return i})),n.d(t,"NEW_SPEC_ERR_BATCH",(function(){return u})),n.d(t,"NEW_AUTH_ERR",(function(){return s})),n.d(t,"CLEAR",(function(){return c})),n.d(t,"CLEAR_BY",(function(){return l})),n.d(t,"newThrownErr",(function(){return f})),n.d(t,"newThrownErrBatch",(function(){return p})),n.d(t,"newSpecErr",(function(){return h})),n.d(t,"newSpecErrBatch",(function(){return d})),n.d(t,"newAuthErr",(function(){return m})),n.d(t,"clear",(function(){return v})),n.d(t,"clearBy",(function(){return g}));var r=n(138),o="err_new_thrown_err",a="err_new_thrown_err_batch",i="err_new_spec_err",u="err_new_spec_err_batch",s="err_new_auth_err",c="err_clear",l="err_clear_by";function f(e){return{type:o,payload:Object(r.serializeError)(e)}}function p(e){return{type:a,payload:e}}function h(e){return{type:i,payload:e}}function d(e){return{type:u,payload:e}}function m(e){return{type:s,payload:e}}function v(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return{type:c,payload:e}}function g(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:function(){return!0};return{type:l,payload:e}}},function(e,t,n){var r=n(176),o=n(114);e.exports=function(e){return r(o(e))}},function(e,t,n){var r=n(336);e.exports=function(e){return r(e.length)}},function(e,t){e.exports=function(e){var t=typeof e;return null!=e&&("object"==t||"function"==t)}},function(e,t){"function"==typeof Object.create?e.exports=function(e,t){t&&(e.super_=t,e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}))}:e.exports=function(e,t){if(t){e.super_=t;var n=function(){};n.prototype=t.prototype,e.prototype=new n,e.prototype.constructor=e}}},function(e,t,n){var r=n(129),o=r.Buffer;function a(e,t){for(var n in e)t[n]=e[n]}function i(e,t,n){return o(e,t,n)}o.from&&o.alloc&&o.allocUnsafe&&o.allocUnsafeSlow?e.exports=r:(a(r,t),t.Buffer=i),a(o,i),i.from=function(e,t,n){if("number"==typeof e)throw new TypeError("Argument must not be a number");return o(e,t,n)},i.alloc=function(e,t,n){if("number"!=typeof e)throw new TypeError("Argument must be a number");var r=o(e);return void 0!==t?"string"==typeof n?r.fill(t,n):r.fill(t):r.fill(0),r},i.allocUnsafe=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return o(e)},i.allocUnsafeSlow=function(e){if("number"!=typeof e)throw new TypeError("Argument must be a number");return r.SlowBuffer(e)}},function(e,t,n){e.exports=n(380)},function(e,t,n){e.exports=n(427)},function(e,t,n){var r=n(17),o=n(80),a=r.String;e.exports=function(e){if("Symbol"===o(e))throw TypeError("Cannot convert a Symbol value to a string");return a(e)}},function(e,t,n){n(83);var r=n(506),o=n(17),a=n(80),i=n(90),u=n(127),s=n(40)("toStringTag");for(var c in r){var l=o[c],f=l&&l.prototype;f&&a(f)!==s&&i(f,s,c),u[c]=u.Array}},function(e,t,n){var r=n(360),o="object"==typeof self&&self&&self.Object===Object&&self,a=r||o||Function("return this")();e.exports=a},function(e,t,n){"use strict";function r(e){return null==e}var o={isNothing:r,isObject:function(e){return"object"==typeof e&&null!==e},toArray:function(e){return Array.isArray(e)?e:r(e)?[]:[e]},repeat:function(e,t){var n,r="";for(n=0;nu&&(t=r-u+(a=" ... ").length),n-r>u&&(n=r+u-(i=" ...").length),{str:a+e.slice(t,n).replace(/\t/g,"→")+i,pos:r-t+a.length}}function c(e,t){return o.repeat(" ",t-e.length)+e}var l=function(e,t){if(t=Object.create(t||null),!e.buffer)return null;t.maxLength||(t.maxLength=79),"number"!=typeof t.indent&&(t.indent=1),"number"!=typeof t.linesBefore&&(t.linesBefore=3),"number"!=typeof t.linesAfter&&(t.linesAfter=2);for(var n,r=/\r?\n|\r|\0/g,a=[0],i=[],u=-1;n=r.exec(e.buffer);)i.push(n.index),a.push(n.index+n[0].length),e.position<=n.index&&u<0&&(u=a.length-2);u<0&&(u=a.length-1);var l,f,p="",h=Math.min(e.line+t.linesAfter,i.length).toString().length,d=t.maxLength-(t.indent+h+3);for(l=1;l<=t.linesBefore&&!(u-l<0);l++)f=s(e.buffer,a[u-l],i[u-l],e.position-(a[u]-a[u-l]),d),p=o.repeat(" ",t.indent)+c((e.line-l+1).toString(),h)+" | "+f.str+"\n"+p;for(f=s(e.buffer,a[u],i[u],e.position,d),p+=o.repeat(" ",t.indent)+c((e.line+1).toString(),h)+" | "+f.str+"\n",p+=o.repeat("-",t.indent+h+3+f.pos)+"^\n",l=1;l<=t.linesAfter&&!(u+l>=i.length);l++)f=s(e.buffer,a[u+l],i[u+l],e.position-(a[u]-a[u+l]),d),p+=o.repeat(" ",t.indent)+c((e.line+l+1).toString(),h)+" | "+f.str+"\n";return p.replace(/\n$/,"")},f=["kind","multi","resolve","construct","instanceOf","predicate","represent","representName","defaultStyle","styleAliases"],p=["scalar","sequence","mapping"];var h=function(e,t){if(t=t||{},Object.keys(t).forEach((function(t){if(-1===f.indexOf(t))throw new u('Unknown option "'+t+'" is met in definition of "'+e+'" YAML type.')})),this.options=t,this.tag=e,this.kind=t.kind||null,this.resolve=t.resolve||function(){return!0},this.construct=t.construct||function(e){return e},this.instanceOf=t.instanceOf||null,this.predicate=t.predicate||null,this.represent=t.represent||null,this.representName=t.representName||null,this.defaultStyle=t.defaultStyle||null,this.multi=t.multi||!1,this.styleAliases=function(e){var t={};return null!==e&&Object.keys(e).forEach((function(n){e[n].forEach((function(e){t[String(e)]=n}))})),t}(t.styleAliases||null),-1===p.indexOf(this.kind))throw new u('Unknown kind "'+this.kind+'" is specified for "'+e+'" YAML type.')};function d(e,t){var n=[];return e[t].forEach((function(e){var t=n.length;n.forEach((function(n,r){n.tag===e.tag&&n.kind===e.kind&&n.multi===e.multi&&(t=r)})),n[t]=e})),n}function m(e){return this.extend(e)}m.prototype.extend=function(e){var t=[],n=[];if(e instanceof h)n.push(e);else if(Array.isArray(e))n=n.concat(e);else{if(!e||!Array.isArray(e.implicit)&&!Array.isArray(e.explicit))throw new u("Schema.extend argument should be a Type, [ Type ], or a schema definition ({ implicit: [...], explicit: [...] })");e.implicit&&(t=t.concat(e.implicit)),e.explicit&&(n=n.concat(e.explicit))}t.forEach((function(e){if(!(e instanceof h))throw new u("Specified list of YAML types (or a single Type object) contains a non-Type object.");if(e.loadKind&&"scalar"!==e.loadKind)throw new u("There is a non-scalar type in the implicit list of a schema. Implicit resolving of such types is not supported.");if(e.multi)throw new u("There is a multi type in the implicit list of a schema. Multi tags can only be listed as explicit.")})),n.forEach((function(e){if(!(e instanceof h))throw new u("Specified list of YAML types (or a single Type object) contains a non-Type object.")}));var r=Object.create(m.prototype);return r.implicit=(this.implicit||[]).concat(t),r.explicit=(this.explicit||[]).concat(n),r.compiledImplicit=d(r,"implicit"),r.compiledExplicit=d(r,"explicit"),r.compiledTypeMap=function(){var e,t,n={scalar:{},sequence:{},mapping:{},fallback:{},multi:{scalar:[],sequence:[],mapping:[],fallback:[]}};function r(e){e.multi?(n.multi[e.kind].push(e),n.multi.fallback.push(e)):n[e.kind][e.tag]=n.fallback[e.tag]=e}for(e=0,t=arguments.length;e=0?"0b"+e.toString(2):"-0b"+e.toString(2).slice(1)},octal:function(e){return e>=0?"0o"+e.toString(8):"-0o"+e.toString(8).slice(1)},decimal:function(e){return e.toString(10)},hexadecimal:function(e){return e>=0?"0x"+e.toString(16).toUpperCase():"-0x"+e.toString(16).toUpperCase().slice(1)}},defaultStyle:"decimal",styleAliases:{binary:[2,"bin"],octal:[8,"oct"],decimal:[10,"dec"],hexadecimal:[16,"hex"]}}),A=new RegExp("^(?:[-+]?(?:[0-9][0-9_]*)(?:\\.[0-9_]*)?(?:[eE][-+]?[0-9]+)?|\\.[0-9_]+(?:[eE][-+]?[0-9]+)?|[-+]?\\.(?:inf|Inf|INF)|\\.(?:nan|NaN|NAN))$");var O=/^[-+]?[0-9]+e/;var C=new h("tag:yaml.org,2002:float",{kind:"scalar",resolve:function(e){return null!==e&&!(!A.test(e)||"_"===e[e.length-1])},construct:function(e){var t,n;return n="-"===(t=e.replace(/_/g,"").toLowerCase())[0]?-1:1,"+-".indexOf(t[0])>=0&&(t=t.slice(1)),".inf"===t?1===n?Number.POSITIVE_INFINITY:Number.NEGATIVE_INFINITY:".nan"===t?NaN:n*parseFloat(t,10)},predicate:function(e){return"[object Number]"===Object.prototype.toString.call(e)&&(e%1!=0||o.isNegativeZero(e))},represent:function(e,t){var n;if(isNaN(e))switch(t){case"lowercase":return".nan";case"uppercase":return".NAN";case"camelcase":return".NaN"}else if(Number.POSITIVE_INFINITY===e)switch(t){case"lowercase":return".inf";case"uppercase":return".INF";case"camelcase":return".Inf"}else if(Number.NEGATIVE_INFINITY===e)switch(t){case"lowercase":return"-.inf";case"uppercase":return"-.INF";case"camelcase":return"-.Inf"}else if(o.isNegativeZero(e))return"-0.0";return n=e.toString(10),O.test(n)?n.replace("e",".e"):n},defaultStyle:"lowercase"}),j=w.extend({implicit:[x,E,k,C]}),T=j,I=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$"),P=new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");var N=new h("tag:yaml.org,2002:timestamp",{kind:"scalar",resolve:function(e){return null!==e&&(null!==I.exec(e)||null!==P.exec(e))},construct:function(e){var t,n,r,o,a,i,u,s,c=0,l=null;if(null===(t=I.exec(e))&&(t=P.exec(e)),null===t)throw new Error("Date resolve error");if(n=+t[1],r=+t[2]-1,o=+t[3],!t[4])return new Date(Date.UTC(n,r,o));if(a=+t[4],i=+t[5],u=+t[6],t[7]){for(c=t[7].slice(0,3);c.length<3;)c+="0";c=+c}return t[9]&&(l=6e4*(60*+t[10]+ +(t[11]||0)),"-"===t[9]&&(l=-l)),s=new Date(Date.UTC(n,r,o,a,i,u,c)),l&&s.setTime(s.getTime()-l),s},instanceOf:Date,represent:function(e){return e.toISOString()}});var M=new h("tag:yaml.org,2002:merge",{kind:"scalar",resolve:function(e){return"<<"===e||null===e}}),R="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=\n\r";var D=new h("tag:yaml.org,2002:binary",{kind:"scalar",resolve:function(e){if(null===e)return!1;var t,n,r=0,o=e.length,a=R;for(n=0;n64)){if(t<0)return!1;r+=6}return r%8==0},construct:function(e){var t,n,r=e.replace(/[\r\n=]/g,""),o=r.length,a=R,i=0,u=[];for(t=0;t>16&255),u.push(i>>8&255),u.push(255&i)),i=i<<6|a.indexOf(r.charAt(t));return 0===(n=o%4*6)?(u.push(i>>16&255),u.push(i>>8&255),u.push(255&i)):18===n?(u.push(i>>10&255),u.push(i>>2&255)):12===n&&u.push(i>>4&255),new Uint8Array(u)},predicate:function(e){return"[object Uint8Array]"===Object.prototype.toString.call(e)},represent:function(e){var t,n,r="",o=0,a=e.length,i=R;for(t=0;t>18&63],r+=i[o>>12&63],r+=i[o>>6&63],r+=i[63&o]),o=(o<<8)+e[t];return 0===(n=a%3)?(r+=i[o>>18&63],r+=i[o>>12&63],r+=i[o>>6&63],r+=i[63&o]):2===n?(r+=i[o>>10&63],r+=i[o>>4&63],r+=i[o<<2&63],r+=i[64]):1===n&&(r+=i[o>>2&63],r+=i[o<<4&63],r+=i[64],r+=i[64]),r}}),L=Object.prototype.hasOwnProperty,B=Object.prototype.toString;var F=new h("tag:yaml.org,2002:omap",{kind:"sequence",resolve:function(e){if(null===e)return!0;var t,n,r,o,a,i=[],u=e;for(t=0,n=u.length;t>10),56320+(e-65536&1023))}for(var ae=new Array(256),ie=new Array(256),ue=0;ue<256;ue++)ae[ue]=re(ue)?1:0,ie[ue]=re(ue);function se(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||W,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typeMap=this.schema.compiledTypeMap,this.length=e.length,this.position=0,this.line=0,this.lineStart=0,this.lineIndent=0,this.firstTabInLine=-1,this.documents=[]}function ce(e,t){var n={name:e.filename,buffer:e.input.slice(0,-1),position:e.position,line:e.line,column:e.position-e.lineStart};return n.snippet=l(n),new u(t,n)}function le(e,t){throw ce(e,t)}function fe(e,t){e.onWarning&&e.onWarning.call(null,ce(e,t))}var pe={YAML:function(e,t,n){var r,o,a;null!==e.version&&le(e,"duplication of %YAML directive"),1!==n.length&&le(e,"YAML directive accepts exactly one argument"),null===(r=/^([0-9]+)\.([0-9]+)$/.exec(n[0]))&&le(e,"ill-formed argument of the YAML directive"),o=parseInt(r[1],10),a=parseInt(r[2],10),1!==o&&le(e,"unacceptable YAML version of the document"),e.version=n[0],e.checkLineBreaks=a<2,1!==a&&2!==a&&fe(e,"unsupported YAML version of the document")},TAG:function(e,t,n){var r,o;2!==n.length&&le(e,"TAG directive accepts exactly two arguments"),r=n[0],o=n[1],Y.test(r)||le(e,"ill-formed tag handle (first argument) of the TAG directive"),H.call(e.tagMap,r)&&le(e,'there is a previously declared suffix for "'+r+'" tag handle'),G.test(o)||le(e,"ill-formed tag prefix (second argument) of the TAG directive");try{o=decodeURIComponent(o)}catch(t){le(e,"tag prefix is malformed: "+o)}e.tagMap[r]=o}};function he(e,t,n,r){var o,a,i,u;if(t1&&(e.result+=o.repeat("\n",t-1))}function we(e,t){var n,r,o=e.tag,a=e.anchor,i=[],u=!1;if(-1!==e.firstTabInLine)return!1;for(null!==e.anchor&&(e.anchorMap[e.anchor]=i),r=e.input.charCodeAt(e.position);0!==r&&(-1!==e.firstTabInLine&&(e.position=e.firstTabInLine,le(e,"tab characters must not be used in indentation")),45===r)&&ee(e.input.charCodeAt(e.position+1));)if(u=!0,e.position++,ge(e,!0,-1)&&e.lineIndent<=t)i.push(null),r=e.input.charCodeAt(e.position);else if(n=e.line,_e(e,t,3,!1,!0),i.push(e.result),ge(e,!0,-1),r=e.input.charCodeAt(e.position),(e.line===n||e.lineIndent>t)&&0!==r)le(e,"bad indentation of a sequence entry");else if(e.lineIndentt?m=1:e.lineIndent===t?m=0:e.lineIndentt?m=1:e.lineIndent===t?m=0:e.lineIndentt)&&(g&&(i=e.line,u=e.lineStart,s=e.position),_e(e,t,4,!0,o)&&(g?m=e.result:v=e.result),g||(me(e,p,h,d,m,v,i,u,s),d=m=v=null),ge(e,!0,-1),c=e.input.charCodeAt(e.position)),(e.line===a||e.lineIndent>t)&&0!==c)le(e,"bad indentation of a mapping entry");else if(e.lineIndent=0))break;0===a?le(e,"bad explicit indentation width of a block scalar; it cannot be less than one"):l?le(e,"repeat of an indentation width identifier"):(f=t+a-1,l=!0)}if(X(i)){do{i=e.input.charCodeAt(++e.position)}while(X(i));if(35===i)do{i=e.input.charCodeAt(++e.position)}while(!Z(i)&&0!==i)}for(;0!==i;){for(ve(e),e.lineIndent=0,i=e.input.charCodeAt(e.position);(!l||e.lineIndentf&&(f=e.lineIndent),Z(i))p++;else{if(e.lineIndent0){for(o=i,a=0;o>0;o--)(i=ne(u=e.input.charCodeAt(++e.position)))>=0?a=(a<<4)+i:le(e,"expected hexadecimal character");e.result+=oe(a),e.position++}else le(e,"unknown escape sequence");n=r=e.position}else Z(u)?(he(e,n,r,!0),be(e,ge(e,!1,t)),n=r=e.position):e.position===e.lineStart&&ye(e)?le(e,"unexpected end of the document within a double quoted scalar"):(e.position++,r=e.position)}le(e,"unexpected end of the stream within a double quoted scalar")}(e,h)?g=!0:!function(e){var t,n,r;if(42!==(r=e.input.charCodeAt(e.position)))return!1;for(r=e.input.charCodeAt(++e.position),t=e.position;0!==r&&!ee(r)&&!te(r);)r=e.input.charCodeAt(++e.position);return e.position===t&&le(e,"name of an alias node must contain at least one character"),n=e.input.slice(t,e.position),H.call(e.anchorMap,n)||le(e,'unidentified alias "'+n+'"'),e.result=e.anchorMap[n],ge(e,!0,-1),!0}(e)?function(e,t,n){var r,o,a,i,u,s,c,l,f=e.kind,p=e.result;if(ee(l=e.input.charCodeAt(e.position))||te(l)||35===l||38===l||42===l||33===l||124===l||62===l||39===l||34===l||37===l||64===l||96===l)return!1;if((63===l||45===l)&&(ee(r=e.input.charCodeAt(e.position+1))||n&&te(r)))return!1;for(e.kind="scalar",e.result="",o=a=e.position,i=!1;0!==l;){if(58===l){if(ee(r=e.input.charCodeAt(e.position+1))||n&&te(r))break}else if(35===l){if(ee(e.input.charCodeAt(e.position-1)))break}else{if(e.position===e.lineStart&&ye(e)||n&&te(l))break;if(Z(l)){if(u=e.line,s=e.lineStart,c=e.lineIndent,ge(e,!1,-1),e.lineIndent>=t){i=!0,l=e.input.charCodeAt(e.position);continue}e.position=a,e.line=u,e.lineStart=s,e.lineIndent=c;break}}i&&(he(e,o,a,!1),be(e,e.line-u),o=a=e.position,i=!1),X(l)||(a=e.position+1),l=e.input.charCodeAt(++e.position)}return he(e,o,a,!1),!!e.result||(e.kind=f,e.result=p,!1)}(e,h,1===n)&&(g=!0,null===e.tag&&(e.tag="?")):(g=!0,null===e.tag&&null===e.anchor||le(e,"alias node should not have any properties")),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):0===m&&(g=s&&we(e,d))),null===e.tag)null!==e.anchor&&(e.anchorMap[e.anchor]=e.result);else if("?"===e.tag){for(null!==e.result&&"scalar"!==e.kind&&le(e,'unacceptable node kind for ! tag; it should be "scalar", not "'+e.kind+'"'),c=0,l=e.implicitTypes.length;c"),null!==e.result&&p.kind!==e.kind&&le(e,"unacceptable node kind for !<"+e.tag+'> tag; it should be "'+p.kind+'", not "'+e.kind+'"'),p.resolve(e.result,e.tag)?(e.result=p.construct(e.result,e.tag),null!==e.anchor&&(e.anchorMap[e.anchor]=e.result)):le(e,"cannot resolve a node with !<"+e.tag+"> explicit tag")}return null!==e.listener&&e.listener("close",e),null!==e.tag||null!==e.anchor||g}function Se(e){var t,n,r,o,a=e.position,i=!1;for(e.version=null,e.checkLineBreaks=e.legacy,e.tagMap=Object.create(null),e.anchorMap=Object.create(null);0!==(o=e.input.charCodeAt(e.position))&&(ge(e,!0,-1),o=e.input.charCodeAt(e.position),!(e.lineIndent>0||37!==o));){for(i=!0,o=e.input.charCodeAt(++e.position),t=e.position;0!==o&&!ee(o);)o=e.input.charCodeAt(++e.position);for(r=[],(n=e.input.slice(t,e.position)).length<1&&le(e,"directive name must not be less than one character in length");0!==o;){for(;X(o);)o=e.input.charCodeAt(++e.position);if(35===o){do{o=e.input.charCodeAt(++e.position)}while(0!==o&&!Z(o));break}if(Z(o))break;for(t=e.position;0!==o&&!ee(o);)o=e.input.charCodeAt(++e.position);r.push(e.input.slice(t,e.position))}0!==o&&ve(e),H.call(pe,n)?pe[n](e,n,r):fe(e,'unknown document directive "'+n+'"')}ge(e,!0,-1),0===e.lineIndent&&45===e.input.charCodeAt(e.position)&&45===e.input.charCodeAt(e.position+1)&&45===e.input.charCodeAt(e.position+2)?(e.position+=3,ge(e,!0,-1)):i&&le(e,"directives end mark is expected"),_e(e,e.lineIndent-1,4,!1,!0),ge(e,!0,-1),e.checkLineBreaks&&J.test(e.input.slice(a,e.position))&&fe(e,"non-ASCII line breaks are interpreted as content"),e.documents.push(e.result),e.position===e.lineStart&&ye(e)?46===e.input.charCodeAt(e.position)&&(e.position+=3,ge(e,!0,-1)):e.position=55296&&r<=56319&&t+1=56320&&n<=57343?1024*(r-55296)+n-56320+65536:r}function qe(e){return/^\n* /.test(e)}function Ve(e,t,n,r,o,a,i,u){var s,c,l=0,f=null,p=!1,h=!1,d=-1!==r,m=-1,v=Be(c=Ue(e,0))&&c!==je&&!Le(c)&&45!==c&&63!==c&&58!==c&&44!==c&&91!==c&&93!==c&&123!==c&&125!==c&&35!==c&&38!==c&&42!==c&&33!==c&&124!==c&&61!==c&&62!==c&&39!==c&&34!==c&&37!==c&&64!==c&&96!==c&&function(e){return!Le(e)&&58!==e}(Ue(e,e.length-1));if(t||i)for(s=0;s=65536?s+=2:s++){if(!Be(l=Ue(e,s)))return 5;v=v&&ze(l,f,u),f=l}else{for(s=0;s=65536?s+=2:s++){if(10===(l=Ue(e,s)))p=!0,d&&(h=h||s-m-1>r&&" "!==e[m+1],m=s);else if(!Be(l))return 5;v=v&&ze(l,f,u),f=l}h=h||d&&s-m-1>r&&" "!==e[m+1]}return p||h?n>9&&qe(e)?5:i?2===a?5:2:h?4:3:!v||i||o(e)?2===a?5:2:1}function We(e,t,n,r,o){e.dump=function(){if(0===t.length)return 2===e.quotingType?'""':"''";if(!e.noCompatMode&&(-1!==Ie.indexOf(t)||Pe.test(t)))return 2===e.quotingType?'"'+t+'"':"'"+t+"'";var a=e.indent*Math.max(1,n),i=-1===e.lineWidth?-1:Math.max(Math.min(e.lineWidth,40),e.lineWidth-a),s=r||e.flowLevel>-1&&n>=e.flowLevel;switch(Ve(t,s,e.indent,i,(function(t){return function(e,t){var n,r;for(n=0,r=e.implicitTypes.length;n"+He(t,e.indent)+$e(Re(function(e,t){var n,r,o=/(\n+)([^\n]*)/g,a=(u=e.indexOf("\n"),u=-1!==u?u:e.length,o.lastIndex=u,Je(e.slice(0,u),t)),i="\n"===e[0]||" "===e[0];var u;for(;r=o.exec(e);){var s=r[1],c=r[2];n=" "===c[0],a+=s+(i||n||""===c?"":"\n")+Je(c,t),i=n}return a}(t,i),a));case 5:return'"'+function(e){for(var t,n="",r=0,o=0;o=65536?o+=2:o++)r=Ue(e,o),!(t=Te[r])&&Be(r)?(n+=e[o],r>=65536&&(n+=e[o+1])):n+=t||Ne(r);return n}(t)+'"';default:throw new u("impossible error: invalid scalar style")}}()}function He(e,t){var n=qe(e)?String(t):"",r="\n"===e[e.length-1];return n+(r&&("\n"===e[e.length-2]||"\n"===e)?"+":r?"":"-")+"\n"}function $e(e){return"\n"===e[e.length-1]?e.slice(0,-1):e}function Je(e,t){if(""===e||" "===e[0])return e;for(var n,r,o=/ [^ ]/g,a=0,i=0,u=0,s="";n=o.exec(e);)(u=n.index)-a>t&&(r=i>a?i:u,s+="\n"+e.slice(a,r),a=r+1),i=u;return s+="\n",e.length-a>t&&i>a?s+=e.slice(a,i)+"\n"+e.slice(i+1):s+=e.slice(a),s.slice(1)}function Ke(e,t,n,r){var o,a,i,u="",s=e.tag;for(o=0,a=n.length;o tag resolver accepts not "'+c+'" style');r=s.represent[c](t,c)}e.dump=r}return!0}return!1}function Ge(e,t,n,r,o,a,i){e.tag=null,e.dump=n,Ye(e,n,!1)||Ye(e,n,!0);var s,c=Oe.call(e.dump),l=r;r&&(r=e.flowLevel<0||e.flowLevel>t);var f,p,h="[object Object]"===c||"[object Array]"===c;if(h&&(p=-1!==(f=e.duplicates.indexOf(n))),(null!==e.tag&&"?"!==e.tag||p||2!==e.indent&&t>0)&&(o=!1),p&&e.usedDuplicates[f])e.dump="*ref_"+f;else{if(h&&p&&!e.usedDuplicates[f]&&(e.usedDuplicates[f]=!0),"[object Object]"===c)r&&0!==Object.keys(e.dump).length?(!function(e,t,n,r){var o,a,i,s,c,l,f="",p=e.tag,h=Object.keys(n);if(!0===e.sortKeys)h.sort();else if("function"==typeof e.sortKeys)h.sort(e.sortKeys);else if(e.sortKeys)throw new u("sortKeys must be a boolean or a function");for(o=0,a=h.length;o1024)&&(e.dump&&10===e.dump.charCodeAt(0)?l+="?":l+="? "),l+=e.dump,c&&(l+=De(e,t)),Ge(e,t+1,s,!0,c)&&(e.dump&&10===e.dump.charCodeAt(0)?l+=":":l+=": ",f+=l+=e.dump));e.tag=p,e.dump=f||"{}"}(e,t,e.dump,o),p&&(e.dump="&ref_"+f+e.dump)):(!function(e,t,n){var r,o,a,i,u,s="",c=e.tag,l=Object.keys(n);for(r=0,o=l.length;r1024&&(u+="? "),u+=e.dump+(e.condenseFlow?'"':"")+":"+(e.condenseFlow?"":" "),Ge(e,t,i,!1,!1)&&(s+=u+=e.dump));e.tag=c,e.dump="{"+s+"}"}(e,t,e.dump),p&&(e.dump="&ref_"+f+" "+e.dump));else if("[object Array]"===c)r&&0!==e.dump.length?(e.noArrayIndent&&!i&&t>0?Ke(e,t-1,e.dump,o):Ke(e,t,e.dump,o),p&&(e.dump="&ref_"+f+e.dump)):(!function(e,t,n){var r,o,a,i="",u=e.tag;for(r=0,o=n.length;r",e.dump=s+" "+e.dump)}return!0}function Qe(e,t){var n,r,o=[],a=[];for(Ze(e,o,a),n=0,r=a.length;nS;S++)if((h||S in x)&&(b=E(y=x[S],S,w),e))if(t)A[S]=b;else if(b)switch(e){case 3:return!0;case 5:return y;case 6:return S;case 2:c(A,y)}else switch(e){case 4:return!1;case 7:c(A,y)}return f?-1:o||l?l:A}};e.exports={forEach:l(0),map:l(1),filter:l(2),some:l(3),every:l(4),find:l(5),findIndex:l(6),filterReject:l(7)}},function(e,t,n){"use strict";var r=n(66),o=n(153),a=n(127),i=n(81),u=n(63).f,s=n(231),c=n(38),l=n(51),f="Array Iterator",p=i.set,h=i.getterFor(f);e.exports=s(Array,"Array",(function(e,t){p(this,{type:f,target:r(e),index:0,kind:t})}),(function(){var e=h(this),t=e.target,n=e.kind,r=e.index++;return!t||r>=t.length?(e.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:t[r],done:!1}:{value:[r,t[r]],done:!1}}),"values");var d=a.Arguments=a.Array;if(o("keys"),o("values"),o("entries"),!c&&l&&"values"!==d.name)try{u(d,"name",{value:"values"})}catch(e){}},function(e,t){e.exports=function(e){return null!=e&&"object"==typeof e}},function(e,t,n){var r=n(159);e.exports=r},function(e,t,n){e.exports=n(623)},function(e,t,n){"use strict";var r=n(952),o=n(953);function a(){this.protocol=null,this.slashes=null,this.auth=null,this.host=null,this.port=null,this.hostname=null,this.hash=null,this.search=null,this.query=null,this.pathname=null,this.path=null,this.href=null}t.parse=b,t.resolve=function(e,t){return b(e,!1,!0).resolve(t)},t.resolveObject=function(e,t){return e?b(e,!1,!0).resolveObject(t):t},t.format=function(e){o.isString(e)&&(e=b(e));return e instanceof a?e.format():a.prototype.format.call(e)},t.Url=a;var i=/^([a-z0-9.+-]+:)/i,u=/:[0-9]*$/,s=/^(\/\/?(?!\/)[^\?\s]*)(\?[^\s]*)?$/,c=["{","}","|","\\","^","`"].concat(["<",">",'"',"`"," ","\r","\n","\t"]),l=["'"].concat(c),f=["%","/","?",";","#"].concat(l),p=["/","?","#"],h=/^[+a-z0-9A-Z_-]{0,63}$/,d=/^([+a-z0-9A-Z_-]{0,63})(.*)$/,m={javascript:!0,"javascript:":!0},v={javascript:!0,"javascript:":!0},g={http:!0,https:!0,ftp:!0,gopher:!0,file:!0,"http:":!0,"https:":!0,"ftp:":!0,"gopher:":!0,"file:":!0},y=n(954);function b(e,t,n){if(e&&o.isObject(e)&&e instanceof a)return e;var r=new a;return r.parse(e,t,n),r}a.prototype.parse=function(e,t,n){if(!o.isString(e))throw new TypeError("Parameter 'url' must be a string, not "+typeof e);var a=e.indexOf("?"),u=-1!==a&&a127?N+="x":N+=P[M];if(!N.match(h)){var D=T.slice(0,O),L=T.slice(O+1),B=P.match(d);B&&(D.push(B[1]),L.unshift(B[2])),L.length&&(b="/"+L.join(".")+b),this.hostname=D.join(".");break}}}this.hostname.length>255?this.hostname="":this.hostname=this.hostname.toLowerCase(),j||(this.hostname=r.toASCII(this.hostname));var F=this.port?":"+this.port:"",z=this.hostname||"";this.host=z+F,this.href+=this.host,j&&(this.hostname=this.hostname.substr(1,this.hostname.length-2),"/"!==b[0]&&(b="/"+b))}if(!m[E])for(O=0,I=l.length;O0)&&n.host.split("@"))&&(n.auth=j.shift(),n.host=n.hostname=j.shift());return n.search=e.search,n.query=e.query,o.isNull(n.pathname)&&o.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.href=n.format(),n}if(!_.length)return n.pathname=null,n.search?n.path="/"+n.search:n.path=null,n.href=n.format(),n;for(var k=_.slice(-1)[0],A=(n.host||e.host||_.length>1)&&("."===k||".."===k)||""===k,O=0,C=_.length;C>=0;C--)"."===(k=_[C])?_.splice(C,1):".."===k?(_.splice(C,1),O++):O&&(_.splice(C,1),O--);if(!x&&!E)for(;O--;O)_.unshift("..");!x||""===_[0]||_[0]&&"/"===_[0].charAt(0)||_.unshift(""),A&&"/"!==_.join("/").substr(-1)&&_.push("");var j,T=""===_[0]||_[0]&&"/"===_[0].charAt(0);S&&(n.hostname=n.host=T?"":_.length?_.shift():"",(j=!!(n.host&&n.host.indexOf("@")>0)&&n.host.split("@"))&&(n.auth=j.shift(),n.host=n.hostname=j.shift()));return(x=x||n.host&&_.length)&&!T&&_.unshift(""),_.length?n.pathname=_.join("/"):(n.pathname=null,n.path=null),o.isNull(n.pathname)&&o.isNull(n.search)||(n.path=(n.pathname?n.pathname:"")+(n.search?n.search:"")),n.auth=e.auth||n.auth,n.slashes=n.slashes||e.slashes,n.href=n.format(),n},a.prototype.parseHost=function(){var e=this.host,t=u.exec(e);t&&(":"!==(t=t[0])&&(this.port=t.substr(1)),e=e.substr(0,e.length-t.length)),e&&(this.hostname=e)}},function(e,t,n){"use strict";n.r(t),n.d(t,"SHOW_AUTH_POPUP",(function(){return h})),n.d(t,"AUTHORIZE",(function(){return d})),n.d(t,"LOGOUT",(function(){return m})),n.d(t,"PRE_AUTHORIZE_OAUTH2",(function(){return v})),n.d(t,"AUTHORIZE_OAUTH2",(function(){return g})),n.d(t,"VALIDATE",(function(){return y})),n.d(t,"CONFIGURE_AUTH",(function(){return b})),n.d(t,"RESTORE_AUTHORIZATION",(function(){return w})),n.d(t,"showDefinitions",(function(){return x})),n.d(t,"authorize",(function(){return E})),n.d(t,"authorizeWithPersistOption",(function(){return _})),n.d(t,"logout",(function(){return S})),n.d(t,"logoutWithPersistOption",(function(){return k})),n.d(t,"preAuthorizeImplicit",(function(){return A})),n.d(t,"authorizeOauth2",(function(){return O})),n.d(t,"authorizeOauth2WithPersistOption",(function(){return C})),n.d(t,"authorizePassword",(function(){return j})),n.d(t,"authorizeApplication",(function(){return T})),n.d(t,"authorizeAccessCodeWithFormParams",(function(){return I})),n.d(t,"authorizeAccessCodeWithBasicAuthentication",(function(){return P})),n.d(t,"authorizeRequest",(function(){return N})),n.d(t,"configureAuth",(function(){return M})),n.d(t,"restoreAuthorization",(function(){return R})),n.d(t,"persistAuthorizationIfNeeded",(function(){return D}));var r=n(19),o=n.n(r),a=n(30),i=n.n(a),u=n(24),s=n.n(u),c=n(92),l=n.n(c),f=n(28),p=n(7),h="show_popup",d="authorize",m="logout",v="pre_authorize_oauth2",g="authorize_oauth2",y="validate",b="configure_auth",w="restore_authorization";function x(e){return{type:h,payload:e}}function E(e){return{type:d,payload:e}}var _=function(e){return function(t){var n=t.authActions;n.authorize(e),n.persistAuthorizationIfNeeded()}};function S(e){return{type:m,payload:e}}var k=function(e){return function(t){var n=t.authActions;n.logout(e),n.persistAuthorizationIfNeeded()}},A=function(e){return function(t){var n=t.authActions,r=t.errActions,o=e.auth,a=e.token,u=e.isValid,s=o.schema,c=o.name,l=s.get("flow");delete f.a.swaggerUIRedirectOauth2,"accessCode"===l||u||r.newAuthErr({authId:c,source:"auth",level:"warning",message:"Authorization may be unsafe, passed state was changed in server Passed state wasn't returned from auth server"}),a.error?r.newAuthErr({authId:c,source:"auth",level:"error",message:i()(a)}):n.authorizeOauth2WithPersistOption({auth:o,token:a})}};function O(e){return{type:g,payload:e}}var C=function(e){return function(t){var n=t.authActions;n.authorizeOauth2(e),n.persistAuthorizationIfNeeded()}},j=function(e){return function(t){var n=t.authActions,r=e.schema,o=e.name,a=e.username,i=e.password,u=e.passwordType,c=e.clientId,l=e.clientSecret,f={grant_type:"password",scope:e.scopes.join(" "),username:a,password:i},h={};switch(u){case"request-body":!function(e,t,n){t&&s()(e,{client_id:t});n&&s()(e,{client_secret:n})}(f,c,l);break;case"basic":h.Authorization="Basic "+Object(p.a)(c+":"+l);break;default:console.warn("Warning: invalid passwordType ".concat(u," was passed, not including client id and secret"))}return n.authorizeRequest({body:Object(p.b)(f),url:r.get("tokenUrl"),name:o,headers:h,query:{},auth:e})}};var T=function(e){return function(t){var n=t.authActions,r=e.schema,o=e.scopes,a=e.name,i=e.clientId,u=e.clientSecret,s={Authorization:"Basic "+Object(p.a)(i+":"+u)},c={grant_type:"client_credentials",scope:o.join(" ")};return n.authorizeRequest({body:Object(p.b)(c),name:a,url:r.get("tokenUrl"),auth:e,headers:s})}},I=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,o=t.schema,a=t.name,i=t.clientId,u=t.clientSecret,s=t.codeVerifier,c={grant_type:"authorization_code",code:t.code,client_id:i,client_secret:u,redirect_uri:n,code_verifier:s};return r.authorizeRequest({body:Object(p.b)(c),name:a,url:o.get("tokenUrl"),auth:t})}},P=function(e){var t=e.auth,n=e.redirectUrl;return function(e){var r=e.authActions,o=t.schema,a=t.name,i=t.clientId,u=t.clientSecret,s=t.codeVerifier,c={Authorization:"Basic "+Object(p.a)(i+":"+u)},l={grant_type:"authorization_code",code:t.code,client_id:i,redirect_uri:n,code_verifier:s};return r.authorizeRequest({body:Object(p.b)(l),name:a,url:o.get("tokenUrl"),auth:t,headers:c})}},N=function(e){return function(t){var n,r=t.fn,a=t.getConfigs,u=t.authActions,c=t.errActions,f=t.oas3Selectors,p=t.specSelectors,h=t.authSelectors,d=e.body,m=e.query,v=void 0===m?{}:m,g=e.headers,y=void 0===g?{}:g,b=e.name,w=e.url,x=e.auth,E=(h.getConfigs()||{}).additionalQueryStringParams;if(p.isOAS3()){var _=f.serverEffectiveValue(f.selectedServer());n=l()(w,_,!0)}else n=l()(w,p.url(),!0);"object"===o()(E)&&(n.query=s()({},n.query,E));var S=n.toString(),k=s()({Accept:"application/json, text/plain, */*","Content-Type":"application/x-www-form-urlencoded","X-Requested-With":"XMLHttpRequest"},y);r.fetch({url:S,method:"post",headers:k,query:v,body:d,requestInterceptor:a().requestInterceptor,responseInterceptor:a().responseInterceptor}).then((function(e){var t=JSON.parse(e.data),n=t&&(t.error||""),r=t&&(t.parseError||"");e.ok?n||r?c.newAuthErr({authId:b,level:"error",source:"auth",message:i()(t)}):u.authorizeOauth2WithPersistOption({auth:x,token:t}):c.newAuthErr({authId:b,level:"error",source:"auth",message:e.statusText})})).catch((function(e){var t=new Error(e).message;if(e.response&&e.response.data){var n=e.response.data;try{var r="string"==typeof n?JSON.parse(n):n;r.error&&(t+=", error: ".concat(r.error)),r.error_description&&(t+=", description: ".concat(r.error_description))}catch(e){}}c.newAuthErr({authId:b,level:"error",source:"auth",message:t})}))}};function M(e){return{type:b,payload:e}}function R(e){return{type:w,payload:e}}var D=function(){return function(e){var t=e.authSelectors;if((0,e.getConfigs)().persistAuthorization){var n=t.authorized();localStorage.setItem("authorized",i()(n.toJS()))}}}},function(e,t,n){var r=n(926);e.exports=function(e){for(var t=1;t0&&"/"!==t[0]}));function Se(e,t,n){var r;t=t||[];var o=xe.apply(void 0,s()(r=[e]).call(r,i()(t))).get("parameters",Object(I.List)());return E()(o).call(o,(function(e,t){var r=n&&"body"===t.get("in")?t.get("value_xml"):t.get("value");return e.set(Object(T.A)(t,{allowHashes:!1}),r)}),Object(I.fromJS)({}))}function ke(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(I.List.isList(e))return A()(e).call(e,(function(e){return I.Map.isMap(e)&&e.get("in")===t}))}function Ae(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(I.List.isList(e))return A()(e).call(e,(function(e){return I.Map.isMap(e)&&e.get("type")===t}))}function Oe(e,t){var n,r;t=t||[];var o=q(e).getIn(s()(n=["paths"]).call(n,i()(t)),Object(I.fromJS)({})),a=e.getIn(s()(r=["meta","paths"]).call(r,i()(t)),Object(I.fromJS)({})),u=Ce(e,t),c=o.get("parameters")||new I.List,l=a.get("consumes_value")?a.get("consumes_value"):Ae(c,"file")?"multipart/form-data":Ae(c,"formData")?"application/x-www-form-urlencoded":void 0;return Object(I.fromJS)({requestContentType:l,responseContentType:u})}function Ce(e,t){var n,r;t=t||[];var o=q(e).getIn(s()(n=["paths"]).call(n,i()(t)),null);if(null!==o){var a=e.getIn(s()(r=["meta","paths"]).call(r,i()(t),["produces_value"]),null),u=o.getIn(["produces",0],null);return a||u||"application/json"}}function je(e,t){var n;t=t||[];var r=q(e),a=r.getIn(s()(n=["paths"]).call(n,i()(t)),null);if(null!==a){var u=t,c=o()(u,1)[0],l=a.get("produces",null),f=r.getIn(["paths",c,"produces"],null),p=r.getIn(["produces"],null);return l||f||p}}function Te(e,t){var n;t=t||[];var r=q(e),a=r.getIn(s()(n=["paths"]).call(n,i()(t)),null);if(null!==a){var u=t,c=o()(u,1)[0],l=a.get("consumes",null),f=r.getIn(["paths",c,"consumes"],null),p=r.getIn(["consumes"],null);return l||f||p}}var Ie=function(e,t,n){var r=e.get("url").match(/^([a-z][a-z0-9+\-.]*):/),o=C()(r)?r[1]:null;return e.getIn(["scheme",t,n])||e.getIn(["scheme","_defaultScheme"])||o||""},Pe=function(e,t,n){var r;return d()(r=["http","https"]).call(r,Ie(e,t,n))>-1},Ne=function(e,t){var n;t=t||[];var r=e.getIn(s()(n=["meta","paths"]).call(n,i()(t),["parameters"]),Object(I.fromJS)([])),o=!0;return p()(r).call(r,(function(e){var t=e.get("errors");t&&t.count()&&(o=!1)})),o},Me=function(e,t){var n,r,o={requestBody:!1,requestContentType:{}},a=e.getIn(s()(n=["resolvedSubtrees","paths"]).call(n,i()(t),["requestBody"]),Object(I.fromJS)([]));return a.size<1||(a.getIn(["required"])&&(o.requestBody=a.getIn(["required"])),p()(r=a.getIn(["content"]).entrySeq()).call(r,(function(e){var t=e[0];if(e[1].getIn(["schema","required"])){var n=e[1].getIn(["schema","required"]).toJS();o.requestContentType[t]=n}}))),o},Re=function(e,t,n,r){var o;if((n||r)&&n===r)return!0;var a=e.getIn(s()(o=["resolvedSubtrees","paths"]).call(o,i()(t),["requestBody","content"]),Object(I.fromJS)([]));if(a.size<2||!n||!r)return!1;var u=a.getIn([n,"schema","properties"],Object(I.fromJS)([])),c=a.getIn([r,"schema","properties"],Object(I.fromJS)([]));return!!u.equals(c)};function De(e){return I.Map.isMap(e)?e:new I.Map}},function(e,t,n){"use strict";(function(t){var r=n(874),o=n(875),a=/^[A-Za-z][A-Za-z0-9+-.]*:\/\//,i=/^([a-z][a-z0-9.+-]*:)?(\/\/)?([\\/]+)?([\S\s]*)/i,u=/^[a-zA-Z]:/,s=new RegExp("^[\\x09\\x0A\\x0B\\x0C\\x0D\\x20\\xA0\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000\\u2028\\u2029\\uFEFF]+");function c(e){return(e||"").toString().replace(s,"")}var l=[["#","hash"],["?","query"],function(e,t){return h(t.protocol)?e.replace(/\\/g,"/"):e},["/","pathname"],["@","auth",1],[NaN,"host",void 0,1,1],[/:(\d+)$/,"port",void 0,1],[NaN,"hostname",void 0,1,1]],f={hash:1,query:1};function p(e){var n,r=("undefined"!=typeof window?window:void 0!==t?t:"undefined"!=typeof self?self:{}).location||{},o={},i=typeof(e=e||r);if("blob:"===e.protocol)o=new m(unescape(e.pathname),{});else if("string"===i)for(n in o=new m(e,{}),f)delete o[n];else if("object"===i){for(n in e)n in f||(o[n]=e[n]);void 0===o.slashes&&(o.slashes=a.test(e.href))}return o}function h(e){return"file:"===e||"ftp:"===e||"http:"===e||"https:"===e||"ws:"===e||"wss:"===e}function d(e,t){e=c(e),t=t||{};var n,r=i.exec(e),o=r[1]?r[1].toLowerCase():"",a=!!r[2],u=!!r[3],s=0;return a?u?(n=r[2]+r[3]+r[4],s=r[2].length+r[3].length):(n=r[2]+r[4],s=r[2].length):u?(n=r[3]+r[4],s=r[3].length):n=r[4],"file:"===o?s>=2&&(n=n.slice(2)):h(o)?n=r[4]:o?a&&(n=n.slice(2)):s>=2&&h(t.protocol)&&(n=r[4]),{protocol:o,slashes:a||h(o),slashesCount:s,rest:n}}function m(e,t,n){if(e=c(e),!(this instanceof m))return new m(e,t,n);var a,i,s,f,v,g,y=l.slice(),b=typeof t,w=this,x=0;for("object"!==b&&"string"!==b&&(n=t,t=null),n&&"function"!=typeof n&&(n=o.parse),a=!(i=d(e||"",t=p(t))).protocol&&!i.slashes,w.slashes=i.slashes||a&&t.slashes,w.protocol=i.protocol||t.protocol||"",e=i.rest,("file:"===i.protocol&&(2!==i.slashesCount||u.test(e))||!i.slashes&&(i.protocol||i.slashesCount<2||!h(w.protocol)))&&(y[3]=[/(.*)/,"pathname"]);x=4?[t[0],t[1],t[2],t[3],"".concat(t[0],".").concat(t[1]),"".concat(t[0],".").concat(t[2]),"".concat(t[0],".").concat(t[3]),"".concat(t[1],".").concat(t[0]),"".concat(t[1],".").concat(t[2]),"".concat(t[1],".").concat(t[3]),"".concat(t[2],".").concat(t[0]),"".concat(t[2],".").concat(t[1]),"".concat(t[2],".").concat(t[3]),"".concat(t[3],".").concat(t[0]),"".concat(t[3],".").concat(t[1]),"".concat(t[3],".").concat(t[2]),"".concat(t[0],".").concat(t[1],".").concat(t[2]),"".concat(t[0],".").concat(t[1],".").concat(t[3]),"".concat(t[0],".").concat(t[2],".").concat(t[1]),"".concat(t[0],".").concat(t[2],".").concat(t[3]),"".concat(t[0],".").concat(t[3],".").concat(t[1]),"".concat(t[0],".").concat(t[3],".").concat(t[2]),"".concat(t[1],".").concat(t[0],".").concat(t[2]),"".concat(t[1],".").concat(t[0],".").concat(t[3]),"".concat(t[1],".").concat(t[2],".").concat(t[0]),"".concat(t[1],".").concat(t[2],".").concat(t[3]),"".concat(t[1],".").concat(t[3],".").concat(t[0]),"".concat(t[1],".").concat(t[3],".").concat(t[2]),"".concat(t[2],".").concat(t[0],".").concat(t[1]),"".concat(t[2],".").concat(t[0],".").concat(t[3]),"".concat(t[2],".").concat(t[1],".").concat(t[0]),"".concat(t[2],".").concat(t[1],".").concat(t[3]),"".concat(t[2],".").concat(t[3],".").concat(t[0]),"".concat(t[2],".").concat(t[3],".").concat(t[1]),"".concat(t[3],".").concat(t[0],".").concat(t[1]),"".concat(t[3],".").concat(t[0],".").concat(t[2]),"".concat(t[3],".").concat(t[1],".").concat(t[0]),"".concat(t[3],".").concat(t[1],".").concat(t[2]),"".concat(t[3],".").concat(t[2],".").concat(t[0]),"".concat(t[3],".").concat(t[2],".").concat(t[1]),"".concat(t[0],".").concat(t[1],".").concat(t[2],".").concat(t[3]),"".concat(t[0],".").concat(t[1],".").concat(t[3],".").concat(t[2]),"".concat(t[0],".").concat(t[2],".").concat(t[1],".").concat(t[3]),"".concat(t[0],".").concat(t[2],".").concat(t[3],".").concat(t[1]),"".concat(t[0],".").concat(t[3],".").concat(t[1],".").concat(t[2]),"".concat(t[0],".").concat(t[3],".").concat(t[2],".").concat(t[1]),"".concat(t[1],".").concat(t[0],".").concat(t[2],".").concat(t[3]),"".concat(t[1],".").concat(t[0],".").concat(t[3],".").concat(t[2]),"".concat(t[1],".").concat(t[2],".").concat(t[0],".").concat(t[3]),"".concat(t[1],".").concat(t[2],".").concat(t[3],".").concat(t[0]),"".concat(t[1],".").concat(t[3],".").concat(t[0],".").concat(t[2]),"".concat(t[1],".").concat(t[3],".").concat(t[2],".").concat(t[0]),"".concat(t[2],".").concat(t[0],".").concat(t[1],".").concat(t[3]),"".concat(t[2],".").concat(t[0],".").concat(t[3],".").concat(t[1]),"".concat(t[2],".").concat(t[1],".").concat(t[0],".").concat(t[3]),"".concat(t[2],".").concat(t[1],".").concat(t[3],".").concat(t[0]),"".concat(t[2],".").concat(t[3],".").concat(t[0],".").concat(t[1]),"".concat(t[2],".").concat(t[3],".").concat(t[1],".").concat(t[0]),"".concat(t[3],".").concat(t[0],".").concat(t[1],".").concat(t[2]),"".concat(t[3],".").concat(t[0],".").concat(t[2],".").concat(t[1]),"".concat(t[3],".").concat(t[1],".").concat(t[0],".").concat(t[2]),"".concat(t[3],".").concat(t[1],".").concat(t[2],".").concat(t[0]),"".concat(t[3],".").concat(t[2],".").concat(t[0],".").concat(t[1]),"".concat(t[3],".").concat(t[2],".").concat(t[1],".").concat(t[0])]:void 0),g[r]}function b(e){var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:{},n=arguments.length>2?arguments[2]:void 0,r=e.filter((function(e){return"token"!==e})),o=y(r);return o.reduce((function(e,t){return p()({},e,n[t])}),t)}function w(e){return e.join(" ")}function x(e){var t=e.node,n=e.stylesheet,r=e.style,o=void 0===r?{}:r,a=e.useInlineStyles,i=e.key,u=t.properties,s=t.type,c=t.tagName,l=t.value;if("text"===s)return l;if(c){var f,h=function(e,t){var n=0;return function(r){return n+=1,r.map((function(r,o){return x({node:r,stylesheet:e,useInlineStyles:t,key:"code-segment-".concat(n,"-").concat(o)})}))}}(n,a);if(a){var m=Object.keys(n).reduce((function(e,t){return t.split(".").forEach((function(t){e.includes(t)||e.push(t)})),e}),[]),g=u.className&&u.className.includes("token")?["token"]:[],y=u.className&&g.concat(u.className.filter((function(e){return!m.includes(e)})));f=p()({},u,{className:w(y)||void 0,style:b(u.className,Object.assign({},u.style,o),n)})}else f=p()({},u,{className:w(u.className)});var E=h(t.children);return d.a.createElement(c,v()({key:i},f),E)}}var E=/\n/g;function _(e){var t=e.codeString,n=e.codeStyle,r=e.containerStyle,o=void 0===r?{float:"left",paddingRight:"10px"}:r,a=e.numberStyle,i=void 0===a?{}:a,u=e.startingLineNumber;return d.a.createElement("code",{style:Object.assign({},n,o)},function(e){var t=e.lines,n=e.startingLineNumber,r=e.style;return t.map((function(e,t){var o=t+n;return d.a.createElement("span",{key:"line-".concat(t),className:"react-syntax-highlighter-line-number",style:"function"==typeof r?r(o):r},"".concat(o,"\n"))}))}({lines:t.replace(/\n$/,"").split("\n"),style:i,startingLineNumber:u}))}function S(e,t){return{type:"element",tagName:"span",properties:{key:"line-number--".concat(e),className:["comment","linenumber","react-syntax-highlighter-line-number"],style:t},children:[{type:"text",value:e}]}}function k(e,t,n){var r,o={display:"inline-block",minWidth:(r=n,"".concat(r.toString().length,".25em")),paddingRight:"1em",textAlign:"right",userSelect:"none"},a="function"==typeof e?e(t):e;return p()({},o,a)}function A(e){var t=e.children,n=e.lineNumber,r=e.lineNumberStyle,o=e.largestLineNumber,a=e.showInlineLineNumbers,i=e.lineProps,u=void 0===i?{}:i,s=e.className,c=void 0===s?[]:s,l=e.showLineNumbers,f=e.wrapLongLines,h="function"==typeof u?u(n):u;if(h.className=c,n&&a){var d=k(r,n,o);t.unshift(S(n,d))}return f&l&&(h.style=p()({},h.style,{display:"flex"})),{type:"element",tagName:"span",properties:h,children:t}}function O(e){for(var t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:[],n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],r=0;r2&&void 0!==arguments[2]?arguments[2]:[];return A({children:e,lineNumber:t,lineNumberStyle:u,largestLineNumber:i,showInlineLineNumbers:o,lineProps:n,className:a,showLineNumbers:r,wrapLongLines:s})}function m(e,t){if(r&&t&&o){var n=k(u,t,i);e.unshift(S(t,n))}return e}function v(e,n){var r=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[];return t||r.length>0?d(e,n,r):m(e,n)}for(var g=function(){var e=l[h],t=e.children[0].value;if(t.match(E)){var n=t.split("\n");n.forEach((function(t,o){var i=r&&f.length+a,u={type:"text",value:"".concat(t,"\n")};if(0===o){var s=v(l.slice(p+1,h).concat(A({children:[u],className:e.properties.className})),i);f.push(s)}else if(o===n.length-1){if(l[h+1]&&l[h+1].children&&l[h+1].children[0]){var c=A({children:[{type:"text",value:"".concat(t)}],className:e.properties.className});l.splice(h+1,0,c)}else{var d=v([u],i,e.properties.className);f.push(d)}}else{var m=v([u],i,e.properties.className);f.push(m)}})),p=h}h++};h .hljs-title":{color:"#88C0D0"},"hljs-keyword":{color:"#81A1C1"},"hljs-literal":{color:"#81A1C1"},"hljs-symbol":{color:"#81A1C1"},"hljs-number":{color:"#B48EAD"},"hljs-regexp":{color:"#EBCB8B"},"hljs-string":{color:"#A3BE8C"},"hljs-title":{color:"#8FBCBB"},"hljs-params":{color:"#D8DEE9"},"hljs-bullet":{color:"#81A1C1"},"hljs-code":{color:"#8FBCBB"},"hljs-emphasis":{fontStyle:"italic"},"hljs-formula":{color:"#8FBCBB"},"hljs-strong":{fontWeight:"bold"},"hljs-link:hover":{textDecoration:"underline"},"hljs-quote":{color:"#4C566A"},"hljs-comment":{color:"#4C566A"},"hljs-doctag":{color:"#8FBCBB"},"hljs-meta":{color:"#5E81AC"},"hljs-meta-keyword":{color:"#5E81AC"},"hljs-meta-string":{color:"#A3BE8C"},"hljs-attr":{color:"#8FBCBB"},"hljs-attribute":{color:"#D8DEE9"},"hljs-builtin-name":{color:"#81A1C1"},"hljs-name":{color:"#81A1C1"},"hljs-section":{color:"#88C0D0"},"hljs-tag":{color:"#81A1C1"},"hljs-variable":{color:"#D8DEE9"},"hljs-template-variable":{color:"#D8DEE9"},"hljs-template-tag":{color:"#5E81AC"},"abnf .hljs-attribute":{color:"#88C0D0"},"abnf .hljs-symbol":{color:"#EBCB8B"},"apache .hljs-attribute":{color:"#88C0D0"},"apache .hljs-section":{color:"#81A1C1"},"arduino .hljs-built_in":{color:"#88C0D0"},"aspectj .hljs-meta":{color:"#D08770"},"aspectj > .hljs-title":{color:"#88C0D0"},"bnf .hljs-attribute":{color:"#8FBCBB"},"clojure .hljs-name":{color:"#88C0D0"},"clojure .hljs-symbol":{color:"#EBCB8B"},"coq .hljs-built_in":{color:"#88C0D0"},"cpp .hljs-meta-string":{color:"#8FBCBB"},"css .hljs-built_in":{color:"#88C0D0"},"css .hljs-keyword":{color:"#D08770"},"diff .hljs-meta":{color:"#8FBCBB"},"ebnf .hljs-attribute":{color:"#8FBCBB"},"glsl .hljs-built_in":{color:"#88C0D0"},"groovy .hljs-meta:not(:first-child)":{color:"#D08770"},"haxe .hljs-meta":{color:"#D08770"},"java .hljs-meta":{color:"#D08770"},"ldif .hljs-attribute":{color:"#8FBCBB"},"lisp .hljs-name":{color:"#88C0D0"},"lua .hljs-built_in":{color:"#88C0D0"},"moonscript .hljs-built_in":{color:"#88C0D0"},"nginx .hljs-attribute":{color:"#88C0D0"},"nginx .hljs-section":{color:"#5E81AC"},"pf .hljs-built_in":{color:"#88C0D0"},"processing .hljs-built_in":{color:"#88C0D0"},"scss .hljs-keyword":{color:"#81A1C1"},"stylus .hljs-keyword":{color:"#81A1C1"},"swift .hljs-meta":{color:"#D08770"},"vim .hljs-built_in":{color:"#88C0D0",fontStyle:"italic"},"yaml .hljs-meta":{color:"#D08770"}},obsidian:{hljs:{display:"block",overflowX:"auto",padding:"0.5em",background:"#282b2e",color:"#e0e2e4"},"hljs-keyword":{color:"#93c763",fontWeight:"bold"},"hljs-selector-tag":{color:"#93c763",fontWeight:"bold"},"hljs-literal":{color:"#93c763",fontWeight:"bold"},"hljs-selector-id":{color:"#93c763"},"hljs-number":{color:"#ffcd22"},"hljs-attribute":{color:"#668bb0"},"hljs-code":{color:"white"},"hljs-class .hljs-title":{color:"white"},"hljs-section":{color:"white",fontWeight:"bold"},"hljs-regexp":{color:"#d39745"},"hljs-link":{color:"#d39745"},"hljs-meta":{color:"#557182"},"hljs-tag":{color:"#8cbbad"},"hljs-name":{color:"#8cbbad",fontWeight:"bold"},"hljs-bullet":{color:"#8cbbad"},"hljs-subst":{color:"#8cbbad"},"hljs-emphasis":{color:"#8cbbad"},"hljs-type":{color:"#8cbbad",fontWeight:"bold"},"hljs-built_in":{color:"#8cbbad"},"hljs-selector-attr":{color:"#8cbbad"},"hljs-selector-pseudo":{color:"#8cbbad"},"hljs-addition":{color:"#8cbbad"},"hljs-variable":{color:"#8cbbad"},"hljs-template-tag":{color:"#8cbbad"},"hljs-template-variable":{color:"#8cbbad"},"hljs-string":{color:"#ec7600"},"hljs-symbol":{color:"#ec7600"},"hljs-comment":{color:"#818e96"},"hljs-quote":{color:"#818e96"},"hljs-deletion":{color:"#818e96"},"hljs-selector-class":{color:"#A082BD"},"hljs-doctag":{fontWeight:"bold"},"hljs-title":{fontWeight:"bold"},"hljs-strong":{fontWeight:"bold"}},"tomorrow-night":{"hljs-comment":{color:"#969896"},"hljs-quote":{color:"#969896"},"hljs-variable":{color:"#cc6666"},"hljs-template-variable":{color:"#cc6666"},"hljs-tag":{color:"#cc6666"},"hljs-name":{color:"#cc6666"},"hljs-selector-id":{color:"#cc6666"},"hljs-selector-class":{color:"#cc6666"},"hljs-regexp":{color:"#cc6666"},"hljs-deletion":{color:"#cc6666"},"hljs-number":{color:"#de935f"},"hljs-built_in":{color:"#de935f"},"hljs-builtin-name":{color:"#de935f"},"hljs-literal":{color:"#de935f"},"hljs-type":{color:"#de935f"},"hljs-params":{color:"#de935f"},"hljs-meta":{color:"#de935f"},"hljs-link":{color:"#de935f"},"hljs-attribute":{color:"#f0c674"},"hljs-string":{color:"#b5bd68"},"hljs-symbol":{color:"#b5bd68"},"hljs-bullet":{color:"#b5bd68"},"hljs-addition":{color:"#b5bd68"},"hljs-title":{color:"#81a2be"},"hljs-section":{color:"#81a2be"},"hljs-keyword":{color:"#b294bb"},"hljs-selector-tag":{color:"#b294bb"},hljs:{display:"block",overflowX:"auto",background:"#1d1f21",color:"#c5c8c6",padding:"0.5em"},"hljs-emphasis":{fontStyle:"italic"},"hljs-strong":{fontWeight:"bold"}}},X=o()(Z),ee=function(e){return i()(X).call(X,e)?Z[e]:(console.warn("Request style '".concat(e,"' is not available, returning default instead")),Q)}},function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.File=t.Blob=t.FormData=void 0;const r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:window;t.FormData=r.FormData,t.Blob=r.Blob,t.File=r.File},function(e,t,n){var r=n(147),o=Function.prototype,a=o.apply,i=o.call;e.exports="object"==typeof Reflect&&Reflect.apply||(r?i.bind(a):function(){return i.apply(a,arguments)})},function(e,t,n){var r=n(51),o=n(37),a=n(175),i=n(98),u=n(66),s=n(177),c=n(47),l=n(333),f=Object.getOwnPropertyDescriptor;t.f=r?f:function(e,t){if(e=u(e),t=s(t),l)try{return f(e,t)}catch(e){}if(c(e,t))return i(!o(a.f,e,t),e[t])}},function(e,t){e.exports=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}}},function(e,t,n){var r=n(57);e.exports=r("navigator","userAgent")||""},function(e,t){},function(e,t,n){var r,o=n(33),a=n(181),i=n(227),u=n(152),s=n(339),c=n(222),l=n(182),f=l("IE_PROTO"),p=function(){},h=function(e){return"