diff --git a/eperusteet/eperusteet-service/pom.xml b/eperusteet/eperusteet-service/pom.xml index 817399e792..0d1819904d 100644 --- a/eperusteet/eperusteet-service/pom.xml +++ b/eperusteet/eperusteet-service/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.3.5 @@ -15,7 +15,6 @@ UTF-8 - 5.3.6.Final 5.7.11 2.4.3 42.5.5 @@ -31,7 +30,7 @@ 9.22.3 2.9 CREATE - 5.3.6.Final + 6.6.2.Final 1.15.3 1.18.34 3.10.1 @@ -85,6 +84,11 @@ + + org.springframework.boot + spring-boot-properties-migrator + runtime + io.springfox springfox-swagger2 @@ -157,12 +161,12 @@ jackson-dataformat-toml ${jackson.version} - - javax.servlet - javax.servlet-api - 3.1.0 - provided - + + + + + + org.springframework.security spring-security-test @@ -180,17 +184,28 @@ 31.1-jre - org.hibernate + org.hibernate.orm hibernate-jcache + org.ehcache ehcache - org.hibernate + org.hibernate.orm hibernate-envers - 5.6.14.Final + + + + com.vladmihalcea + hibernate-types-60 + 2.21.1 + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 javax.transaction @@ -500,9 +515,9 @@ true - org.hibernate + org.hibernate.orm hibernate-jpamodelgen - ${hibernate.jpamodel.version} + ${hibernate.version} javax.xml.bind diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/DefaultConfigs.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/DefaultConfigs.java index 8ab263054b..ec7f53c8a2 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/DefaultConfigs.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/DefaultConfigs.java @@ -3,8 +3,8 @@ import fi.vm.sade.eperusteet.hibernate.HibernateInterceptor; import fi.vm.sade.eperusteet.repository.version.JpaWithVersioningRepositoryFactoryBean; import fi.vm.sade.eperusteet.service.security.PermissionEvaluator; +import jakarta.persistence.EntityManager; import org.flywaydb.core.Flyway; -import org.hibernate.jpa.HibernateEntityManager; import org.hibernate.jpa.HibernatePersistenceProvider; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.EnableCaching; @@ -12,13 +12,11 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.core.task.TaskExecutor; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.scheduling.annotation.EnableAsync; @@ -109,14 +107,14 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory() { entityManagerFactory.setDataSource(dataSource); entityManagerFactory.setPackagesToScan("fi.vm.sade.eperusteet.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("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("jakarta.persistence.validation.factory", validator()); props.put("org.hibernate.envers.revision_listener", "fi.vm.sade.eperusteet.service.impl.AuditRevisionListener"); props.put("hibernate.jdbc.batch_size", 20); props.put("hibernate.jdbc.fetch_size", 20); diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/ExceptionHandlingConfig.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/ExceptionHandlingConfig.java index e292ca9ec7..058a31102d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/ExceptionHandlingConfig.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/ExceptionHandlingConfig.java @@ -20,9 +20,11 @@ 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; +import org.springframework.lang.Nullable; import org.springframework.transaction.TransactionSystemException; import org.springframework.validation.BindException; import org.springframework.web.HttpMediaTypeNotAcceptableException; @@ -38,12 +40,12 @@ import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; -import javax.persistence.PersistenceException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.ValidationException; +import jakarta.persistence.PersistenceException; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.ValidationException; import java.io.IOException; import java.security.Principal; import java.util.ArrayList; @@ -71,8 +73,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 { @@ -123,7 +124,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) { final Map map = new HashMap<>(); boolean suppresstrace = false; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/MvcConfiguration.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/MvcConfiguration.java index 7a1e2d4103..463c4efdd8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/MvcConfiguration.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/MvcConfiguration.java @@ -17,7 +17,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import javax.persistence.EntityManagerFactory; +import jakarta.persistence.EntityManagerFactory; import java.util.List; @Configuration diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfiguration.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfiguration.java index 880cb0400b..9d19343b7e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfiguration.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfiguration.java @@ -5,9 +5,9 @@ import fi.vm.sade.java_utils.security.OpintopolkuCasAuthenticationFilter; import fi.vm.sade.javautils.http.auth.CasAuthenticator; import fi.vm.sade.javautils.kayttooikeusclient.OphUserDetailsServiceImpl; -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; @@ -17,35 +17,24 @@ import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.cas.ServiceProperties; import org.springframework.security.cas.authentication.CasAuthenticationProvider; -import org.springframework.security.cas.authentication.CasAuthenticationToken; import org.springframework.security.cas.web.CasAuthenticationEntryPoint; import org.springframework.security.cas.web.CasAuthenticationFilter; +import org.springframework.security.config.Customizer; 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.config.annotation.web.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory; -import org.springframework.security.core.Authentication; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.web.SecurityFilterChain; -import org.springframework.security.web.WebAttributes; import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler; import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler; -import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter; import org.springframework.security.web.savedrequest.HttpSessionRequestCache; -import org.springframework.security.web.savedrequest.SavedRequest; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.IOException; @Profile({"!dev & !test"}) @Configuration -@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) +@EnableMethodSecurity(securedEnabled = true) @EnableWebSecurity public class WebSecurityConfiguration { @@ -147,18 +136,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 +157,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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfigurationDev.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfigurationDev.java index e72586b16c..2088ed7b7b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfigurationDev.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/config/WebSecurityConfigurationDev.java @@ -2,33 +2,25 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; import org.springframework.context.annotation.Profile; import org.springframework.http.HttpMethod; import org.springframework.security.access.vote.AffirmativeBased; import org.springframework.security.access.vote.RoleVoter; -import org.springframework.security.authentication.AuthenticationManager; -import org.springframework.security.cas.web.CasAuthenticationFilter; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; 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.configuration.WebSecurityConfigurerAdapter; -import org.springframework.security.core.Authentication; +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; import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.logout.HeaderWriterLogoutHandler; -import org.springframework.security.web.authentication.logout.LogoutHandler; import org.springframework.security.web.csrf.CookieCsrfTokenRepository; import org.springframework.security.web.header.writers.ClearSiteDataHeaderWriter; +import org.springframework.security.web.savedrequest.HttpSessionRequestCache; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Arrays; import java.util.List; @Profile({"dev"}) @@ -39,24 +31,24 @@ public class WebSecurityConfigurationDev { @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.POST, "/api/**").permitAll() - .antMatchers(HttpMethod.GET, "/").permitAll() - .anyRequest().authenticated() - .and() - .httpBasic() - .and() + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests((authorize) -> authorize + .requestMatchers("/buildversion.txt").permitAll() + .requestMatchers(HttpMethod.GET, "/api/**").permitAll() + .requestMatchers(HttpMethod.GET, "/").permitAll() + .anyRequest().authenticated()) + .httpBasic(Customizer.withDefaults()) .logout(logout -> { logout.logoutUrl("/api/logout"); logout.logoutSuccessUrl("http://localhost:9001"); 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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AIPEOpetuksenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AIPEOpetuksenSisalto.java index ac6add4665..439c2f0fd9 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AIPEOpetuksenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AIPEOpetuksenSisalto.java @@ -6,8 +6,8 @@ import fi.vm.sade.eperusteet.domain.yl.LaajaalainenOsaaminen; import fi.vm.sade.eperusteet.domain.yl.Oppiaine; import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedEntity.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedEntity.java index 761b242330..dd2730dce6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedEntity.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedEntity.java @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedReferenceableEntity.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedReferenceableEntity.java index 96114b828a..8e16ac35d3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedReferenceableEntity.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractAuditedReferenceableEntity.java @@ -5,10 +5,10 @@ import lombok.Setter; import org.hibernate.envers.Audited; -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 AbstractAuditedReferenceableEntity extends AbstractAuditedEntity implements ReferenceableEntity { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractReferenceableEntity.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractReferenceableEntity.java index 2c8ab06a36..21f0f38860 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractReferenceableEntity.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/AbstractReferenceableEntity.java @@ -2,10 +2,10 @@ import fi.vm.sade.eperusteet.dto.Reference; 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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Diaarinumero.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Diaarinumero.java index 8f10404904..f443aea3b3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Diaarinumero.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Diaarinumero.java @@ -1,7 +1,7 @@ package fi.vm.sade.eperusteet.domain; import java.io.Serializable; -import javax.persistence.Embeddable; +import jakarta.persistence.Embeddable; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Dokumentti.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Dokumentti.java index 396ba98173..7acdd902f7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Dokumentti.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Dokumentti.java @@ -3,8 +3,8 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerinenArviointiasteikko.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerinenArviointiasteikko.java index fde0faf5a2..77980e1b15 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerinenArviointiasteikko.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerinenArviointiasteikko.java @@ -8,18 +8,18 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -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.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Table; -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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerisenOsaamistasonKriteeri.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerisenOsaamistasonKriteeri.java index 5d29909fcf..5db9faebf2 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerisenOsaamistasonKriteeri.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/GeneerisenOsaamistasonKriteeri.java @@ -6,8 +6,8 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPeruste.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPeruste.java index 54849d9ee8..5cef7c5bf5 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPeruste.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPeruste.java @@ -6,20 +6,20 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -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 jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +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 java.util.ArrayList; import java.util.Date; import java.util.HashSet; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPerusteData.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPerusteData.java index c809a4901d..6ef3ff1d52 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPerusteData.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaistuPerusteData.java @@ -1,20 +1,25 @@ package fi.vm.sade.eperusteet.domain; import com.fasterxml.jackson.databind.node.ObjectNode; -import fi.vm.sade.eperusteet.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; @Entity @Immutable @Table(name = "julkaistu_peruste_data") -@TypeDef(name = "jsonb", defaultForType = JsonBType.class, typeClass = JsonBType.class) +//@TypeDef(name = "jsonb", defaultForType = JsonBType.class, typeClass = JsonBType.class) +//@Convert(attributeName = "data", converter = JsonBType.class) public class JulkaistuPerusteData { @Id @@ -30,7 +35,7 @@ public class JulkaistuPerusteData { @NotNull @Getter @Setter - @Type(type = "jsonb") + @JdbcTypeCode(SqlTypes.JSON) @Column(name = "data") private ObjectNode data; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuLiite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuLiite.java index dd01a9ea40..4f6ed50c65 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuLiite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuLiite.java @@ -4,15 +4,15 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -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 javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +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 java.io.Serializable; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuPerusteTila.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuPerusteTila.java index 2fb8479534..81ef62e2b4 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuPerusteTila.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/JulkaisuPerusteTila.java @@ -3,17 +3,17 @@ 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 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 java.io.Serializable; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KVLiite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KVLiite.java index 41d29b560d..8d81922341 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KVLiite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KVLiite.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; import java.util.HashMap; import java.util.Map; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kayttajaprofiili.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kayttajaprofiili.java index 1ff4d9c700..86b200b658 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kayttajaprofiili.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kayttajaprofiili.java @@ -2,15 +2,15 @@ import java.io.Serializable; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KayttajaprofiiliPreferenssi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KayttajaprofiiliPreferenssi.java index 321b406623..72f93182b0 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KayttajaprofiiliPreferenssi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KayttajaprofiiliPreferenssi.java @@ -1,13 +1,13 @@ package fi.vm.sade.eperusteet.domain; import java.io.Serializable; -import javax.persistence.Entity; -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.Entity; +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 lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KevytTekstiKappale.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KevytTekstiKappale.java index e6c5527a4f..2a8553ad84 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KevytTekstiKappale.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/KevytTekstiKappale.java @@ -2,7 +2,7 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kommentti.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kommentti.java index d001a17716..99d24ce78e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kommentti.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Kommentti.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.domain; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koodi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koodi.java index d6f1f3cb92..fc0d503b7e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koodi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koodi.java @@ -8,15 +8,15 @@ import org.hibernate.validator.constraints.NotEmpty; import org.springframework.util.ObjectUtils; -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.PrePersist; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.PrePersist; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koulutus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koulutus.java index a7b6690c26..dc07e723ae 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koulutus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Koulutus.java @@ -6,7 +6,7 @@ import lombok.Setter; import org.hibernate.envers.NotAudited; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/LokalisoituTeksti.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/LokalisoituTeksti.java index 3a3019a224..9b98d52458 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/LokalisoituTeksti.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/LokalisoituTeksti.java @@ -2,11 +2,11 @@ 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; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; @Embeddable public class LokalisoituTeksti implements Serializable { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Lukko.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Lukko.java index 6be89bea6d..5aede73cf5 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Lukko.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Lukko.java @@ -2,13 +2,13 @@ import fi.vm.sade.eperusteet.service.util.SecurityUtil; 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 javax.persistence.Transient; +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 jakarta.persistence.Transient; import lombok.Getter; import org.joda.time.DateTime; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Maarayskirje.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Maarayskirje.java index 8b04a461c9..23eea6f02e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Maarayskirje.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Maarayskirje.java @@ -1,6 +1,6 @@ package fi.vm.sade.eperusteet.domain; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.*; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/MaarayskirjeStatus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/MaarayskirjeStatus.java index 71005bdbb5..ea5e6c35da 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/MaarayskirjeStatus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/MaarayskirjeStatus.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Muutosmaarays.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Muutosmaarays.java index 836413733c..73f2b95940 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Muutosmaarays.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Muutosmaarays.java @@ -6,7 +6,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashMap; import java.util.Map; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OpasSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OpasSisalto.java index de7e75dafe..9fbd6f9b44 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OpasSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OpasSisalto.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OppaanKiinnitettyKoodi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OppaanKiinnitettyKoodi.java index 8c8804a2ad..b71b3e7b55 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OppaanKiinnitettyKoodi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OppaanKiinnitettyKoodi.java @@ -2,13 +2,13 @@ import fi.vm.sade.eperusteet.domain.validation.ValidKoodisto; import fi.vm.sade.eperusteet.dto.koodisto.KoodistoUriArvo; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Osaamistaso.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Osaamistaso.java index 4ca09e61e1..e1ac643084 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Osaamistaso.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Osaamistaso.java @@ -12,15 +12,15 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.Cacheable; -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.Cacheable; +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; @Entity(name = "Osaamistaso") diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OsaamistasonKriteeri.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OsaamistasonKriteeri.java index cbf7626d6d..a2af6dcb3d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OsaamistasonKriteeri.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/OsaamistasonKriteeri.java @@ -3,18 +3,18 @@ import java.io.Serializable; import java.util.*; -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.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OrderColumn; -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.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; import fi.vm.sade.eperusteet.domain.arviointi.ArvioinninKohde; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Peruste.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Peruste.java index 6d33215960..3509b3953a 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Peruste.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Peruste.java @@ -30,31 +30,31 @@ import java.util.List; import java.util.Optional; 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.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.MapKey; -import javax.persistence.OneToMany; -import javax.persistence.OneToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +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.MapKey; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OneToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.persistence.Transient; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import lombok.Getter; import lombok.Setter; import org.apache.commons.collections.CollectionUtils; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteAikataulu.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteAikataulu.java index 28366b7539..d734c92f34 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteAikataulu.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteAikataulu.java @@ -2,19 +2,19 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.util.Date; -import javax.persistence.CascadeType; -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.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.Getter; import lombok.NoArgsConstructor; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteVersion.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteVersion.java index daee4bd10e..735df168db 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteVersion.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteVersion.java @@ -3,7 +3,7 @@ import lombok.Getter; import lombok.Setter; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Date; /** diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenMuokkaustieto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenMuokkaustieto.java index 93f57b8ecf..cd465624ed 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenMuokkaustieto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenMuokkaustieto.java @@ -6,22 +6,22 @@ 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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsa.java index bd20a07954..2c3edcd5f4 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsa.java @@ -7,8 +7,8 @@ import java.io.Serializable; import java.util.HashSet; import java.util.Set; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaTyoryhma.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaTyoryhma.java index 1af31a9bac..aed5b536dc 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaTyoryhma.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaTyoryhma.java @@ -1,15 +1,15 @@ package fi.vm.sade.eperusteet.domain; import java.io.Serializable; -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.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaViite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaViite.java index 07a007b6ec..8ca9e04250 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaViite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteenOsaViite.java @@ -19,7 +19,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Perusteprojekti.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Perusteprojekti.java index ada70ba932..a3ad3d73a8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Perusteprojekti.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Perusteprojekti.java @@ -3,8 +3,8 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.domain.validation.ValidateDateRange; import java.util.Date; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteprojektiTyoryhma.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteprojektiTyoryhma.java index c0e27640f3..6ed0006ba7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteprojektiTyoryhma.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PerusteprojektiTyoryhma.java @@ -1,15 +1,15 @@ package fi.vm.sade.eperusteet.domain; import java.io.Serializable; -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.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PoistettuSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PoistettuSisalto.java index d1bb5e0162..d6a8b2de28 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PoistettuSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/PoistettuSisalto.java @@ -2,19 +2,19 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -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.OneToOne; -import javax.persistence.Table; -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.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/RevisionInfo.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/RevisionInfo.java index 76cb4326f0..22d54c5fdb 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/RevisionInfo.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/RevisionInfo.java @@ -1,11 +1,11 @@ package fi.vm.sade.eperusteet.domain; import fi.vm.sade.eperusteet.service.impl.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; import org.hibernate.envers.DefaultRevisionEntity; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/SkeduloituAjo.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/SkeduloituAjo.java index ff433fa76c..756b3bc302 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/SkeduloituAjo.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/SkeduloituAjo.java @@ -2,15 +2,15 @@ import java.io.Serializable; import java.util.Date; -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.Table; -import javax.validation.constraints.NotNull; +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.Table; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suoritustapa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suoritustapa.java index be57cf1558..1f05890b05 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suoritustapa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suoritustapa.java @@ -10,8 +10,8 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.NotAudited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suosikki.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suosikki.java index f6d1e6c66d..d4730cb87f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suosikki.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Suosikki.java @@ -2,16 +2,16 @@ import java.io.Serializable; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -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 javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +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.persistence.Temporal; +import jakarta.persistence.TemporalType; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiKappale.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiKappale.java index f69dbe5184..3d432dfffd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiKappale.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiKappale.java @@ -14,8 +14,8 @@ import org.hibernate.envers.RelationTargetAuditMode; import org.springframework.util.ObjectUtils; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiPalanen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiPalanen.java index 60781e2d97..9c80d739b1 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiPalanen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TekstiPalanen.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.text.Normalizer; import java.util.*; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; import org.hibernate.annotations.Cache; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Termi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Termi.java index dfd165fcb7..bb1f749d21 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Termi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Termi.java @@ -3,15 +3,15 @@ import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -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.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +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 lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Tiedote.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Tiedote.java index 9d505825bd..2aca4e4e0a 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Tiedote.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Tiedote.java @@ -4,7 +4,7 @@ import fi.vm.sade.eperusteet.domain.validation.ValidKoodisto; import fi.vm.sade.eperusteet.dto.koodisto.KoodistoUriArvo; import java.util.Set; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TutkintonimikeKoodi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TutkintonimikeKoodi.java index f1127cfa00..0bb54f6b8c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TutkintonimikeKoodi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/TutkintonimikeKoodi.java @@ -2,17 +2,17 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -import javax.persistence.CascadeType; -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.ManyToOne; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +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.ManyToOne; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Yllapito.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Yllapito.java index e9fe351052..1c706f3af3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Yllapito.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/Yllapito.java @@ -1,12 +1,12 @@ package fi.vm.sade.eperusteet.domain; import java.io.Serializable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohde.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohde.java index d148837241..20eb79a0f1 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohde.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohde.java @@ -6,16 +6,16 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -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.OneToMany; -import javax.persistence.OrderColumn; -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.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohdealue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohdealue.java index 29244a362c..5fe31a513f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohdealue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/AmmattitaitovaatimuksenKohdealue.java @@ -9,7 +9,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/Ammattitaitovaatimus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/Ammattitaitovaatimus.java index d9b97e58a6..ad48f81bd6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/Ammattitaitovaatimus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/ammattitaitovaatimukset/Ammattitaitovaatimus.java @@ -4,7 +4,7 @@ import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohde.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohde.java index 0175e7247c..f4ebb2da82 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohde.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohde.java @@ -9,8 +9,8 @@ import static fi.vm.sade.eperusteet.service.util.Util.refXnor; import java.io.Serializable; import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.BatchSize; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohdealue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohdealue.java index a4f81d7f45..5854db658b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohdealue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArvioinninKohdealue.java @@ -11,7 +11,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/Arviointi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/Arviointi.java index c8c3aa404c..2d7018d8e7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/Arviointi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/Arviointi.java @@ -12,7 +12,7 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArviointiAsteikko.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArviointiAsteikko.java index ff0a4ae18c..ab55ef94f6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArviointiAsteikko.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/arviointi/ArviointiAsteikko.java @@ -7,7 +7,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/Osaamiskokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/Osaamiskokonaisuus.java index 2b6f94cd12..987e941830 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/Osaamiskokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/Osaamiskokonaisuus.java @@ -10,17 +10,17 @@ 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.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusKasitteisto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusKasitteisto.java index 45081a922f..6bcb5539be 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusKasitteisto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusKasitteisto.java @@ -10,14 +10,14 @@ 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.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; @Entity @Table(name = "osaamiskokonaisuus_kasitteisto") diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlue.java index 6094c35694..5f8da78766 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlue.java @@ -9,15 +9,15 @@ 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.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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlueTasoKuvaus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlueTasoKuvaus.java index 04db0ee63f..95d2c88cd9 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlueTasoKuvaus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusOsaAlueTasoKuvaus.java @@ -9,17 +9,17 @@ 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.ManyToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.ManyToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusPaaAlue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusPaaAlue.java index bcc79bd407..a89c5d4184 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusPaaAlue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/digi/OsaamiskokonaisuusPaaAlue.java @@ -11,18 +11,18 @@ 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.OrderColumn; -import javax.persistence.PreUpdate; -import javax.persistence.Table; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; +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.OrderColumn; +import jakarta.persistence.PreUpdate; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/liite/Liite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/liite/Liite.java index 17b14e25e3..0f02d89ea9 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/liite/Liite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/liite/Liite.java @@ -6,9 +6,9 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.*; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.sql.Blob; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/Lops2019Sisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/Lops2019Sisalto.java index 608141ac1f..bccf677328 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/Lops2019Sisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/Lops2019Sisalto.java @@ -7,8 +7,8 @@ import lombok.*; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminen.java index f0a52fe0ed..55f6da699a 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminen.java @@ -14,7 +14,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; import static fi.vm.sade.eperusteet.service.util.Util.refXnor; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminenKokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminenKokonaisuus.java index 9422f4e28c..d047e21c71 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminenKokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/laajaalainenosaaminen/Lops2019LaajaAlainenOsaaminenKokonaisuus.java @@ -6,7 +6,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Arviointi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Arviointi.java index bd92ec9034..d8400e7fa3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Arviointi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Arviointi.java @@ -8,7 +8,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; @Getter @Setter diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OpiskeluymparistoTyotavat.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OpiskeluymparistoTyotavat.java index 704b20d1bf..5a21a1842b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OpiskeluymparistoTyotavat.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OpiskeluymparistoTyotavat.java @@ -4,13 +4,13 @@ import fi.vm.sade.eperusteet.domain.TekstiPalanen; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.util.Objects; -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 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 lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Oppiaine.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Oppiaine.java index b233e9f5ab..ef69692b7e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Oppiaine.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Oppiaine.java @@ -14,7 +14,7 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineLaajaAlainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineLaajaAlainenOsaaminen.java index 03afff95b4..96d3cf40ac 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineLaajaAlainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineLaajaAlainenOsaaminen.java @@ -8,7 +8,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; import static fi.vm.sade.eperusteet.service.util.Util.refXnor; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitealue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitealue.java index e717eee5d7..c95c5bd67e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitealue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitealue.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitteet.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitteet.java index 0de0c32173..61d840d6e6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitteet.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019OppiaineTavoitteet.java @@ -8,7 +8,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Tehtava.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Tehtava.java index 5a4873e295..20fe06cb04 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Tehtava.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/Lops2019Tehtava.java @@ -8,7 +8,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; @Getter diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019Moduuli.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019Moduuli.java index f6b5a44414..4daedb2635 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019Moduuli.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019Moduuli.java @@ -20,18 +20,18 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -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.OrderBy; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.OrderBy; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliSisalto.java index 9929df065f..8c20873b39 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliSisalto.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliTavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliTavoite.java index 29eddc7445..6d6a4883c9 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliTavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/lops2019/oppiaineet/moduuli/Lops2019ModuuliTavoite.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/Maarays.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/Maarays.java index d567dbb06d..776754e41d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/Maarays.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/Maarays.java @@ -9,27 +9,27 @@ import lombok.NoArgsConstructor; import lombok.Setter; -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.MapKeyEnumerated; -import javax.persistence.OneToMany; -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.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapKeyEnumerated; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysAsiasana.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysAsiasana.java index 54d6da170b..25cc6520fd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysAsiasana.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysAsiasana.java @@ -5,13 +5,13 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.CollectionTable; -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.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysKieliLiitteet.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysKieliLiitteet.java index 86622f7906..c59747b231 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysKieliLiitteet.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysKieliLiitteet.java @@ -5,14 +5,14 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysLiite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysLiite.java index 25cc1dfd93..4799b12c5d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysLiite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/maarays/MaaraysLiite.java @@ -7,19 +7,19 @@ import lombok.NoArgsConstructor; import lombok.Setter; -import javax.persistence.Basic; -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.Id; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.Basic; +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.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import java.sql.Blob; import java.util.UUID; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/Osaamismerkki.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/Osaamismerkki.java index d715a6a5fc..01770f9b96 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/Osaamismerkki.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/Osaamismerkki.java @@ -7,24 +7,24 @@ import lombok.Setter; 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.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -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.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiArviointikriteeri.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiArviointikriteeri.java index 8164ef3c2a..d9a57dffe1 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiArviointikriteeri.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiArviointikriteeri.java @@ -5,15 +5,15 @@ import lombok.Getter; import lombok.Setter; -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 javax.validation.constraints.NotNull; +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 jakarta.validation.constraints.NotNull; import java.io.Serializable; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiKategoria.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiKategoria.java index 13b204dda9..d10441054c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiKategoria.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiKategoria.java @@ -8,14 +8,14 @@ import lombok.Setter; import org.hibernate.envers.Audited; -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 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 static org.hibernate.envers.RelationTargetAuditMode.NOT_AUDITED; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiOsaamistavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiOsaamistavoite.java index fb8f3f652a..5c793162e6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiOsaamistavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/osaamismerkki/OsaamismerkkiOsaamistavoite.java @@ -7,15 +7,15 @@ 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 javax.validation.constraints.NotNull; +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 jakarta.validation.constraints.NotNull; import java.io.Serializable; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/permissions/PerusteenosanProjekti.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/permissions/PerusteenosanProjekti.java index b80a1ca1f9..c98fef641c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/permissions/PerusteenosanProjekti.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/permissions/PerusteenosanProjekti.java @@ -2,13 +2,13 @@ import fi.vm.sade.eperusteet.domain.ProjektiTila; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.Id; -import javax.persistence.IdClass; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.Table; import lombok.EqualsAndHashCode; import lombok.Getter; import org.hibernate.annotations.Immutable; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimukset2019.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimukset2019.java index a66cc551dd..593ff673f4 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimukset2019.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimukset2019.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import static fi.vm.sade.eperusteet.service.util.Util.refXnor; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019.java index 0b6325631b..53bfbf03f4 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019.java @@ -11,7 +11,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.Objects; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019Kohdealue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019Kohdealue.java index d7d8e896a5..5b38ad4d67 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019Kohdealue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Ammattitaitovaatimus2019Kohdealue.java @@ -9,7 +9,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.*; import static fi.vm.sade.eperusteet.service.util.Util.refXnor; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaAlue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaAlue.java index b4efb2a3e9..c6a626a2d0 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaAlue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaAlue.java @@ -13,7 +13,7 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.*; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenArviointi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenArviointi.java index 75da63eba6..e026add6a9 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenArviointi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenArviointi.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.BatchSize; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenTavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenTavoite.java index 0956b1bf14..845826364d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenTavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/OsaamisenTavoite.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.BatchSize; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Osaamistavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Osaamistavoite.java index 2b08a3032f..1a04270112 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Osaamistavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/Osaamistavoite.java @@ -14,7 +14,7 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/TutkinnonOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/TutkinnonOsa.java index c34e90b5fb..ad7daab0ef 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/TutkinnonOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/TutkinnonOsa.java @@ -13,8 +13,8 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.*; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/ValmaTelmaSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/ValmaTelmaSisalto.java index ad79d576e6..4216945ec3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/ValmaTelmaSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonosa/ValmaTelmaSisalto.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.*; +import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/AbstractRakenneOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/AbstractRakenneOsa.java index 97c9117a1b..9c435ca0fd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/AbstractRakenneOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/AbstractRakenneOsa.java @@ -10,8 +10,8 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; import java.util.Optional; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/MuodostumisSaanto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/MuodostumisSaanto.java index a3c74d96c5..a9cd768bea 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/MuodostumisSaanto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/MuodostumisSaanto.java @@ -2,10 +2,10 @@ import fi.vm.sade.eperusteet.domain.LaajuusYksikko; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Embeddable; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; +import jakarta.persistence.Column; +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneModuuli.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneModuuli.java index b50335e4d1..01212f7cec 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneModuuli.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneModuuli.java @@ -12,11 +12,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; import java.util.*; -import javax.persistence.*; -import javax.validation.Constraint; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; -import javax.validation.Payload; +import jakarta.persistence.*; +import jakarta.validation.Constraint; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.Payload; import lombok.Getter; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneOsa.java index 14f4b73b33..40f715f6f1 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/RakenneOsa.java @@ -1,10 +1,10 @@ package fi.vm.sade.eperusteet.domain.tutkinnonrakenne; import com.google.common.base.Objects; -import javax.persistence.DiscriminatorValue; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/TutkinnonOsaViite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/TutkinnonOsaViite.java index 59f6f5dae5..514f416235 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/TutkinnonOsaViite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tutkinnonrakenne/TutkinnonOsaViite.java @@ -12,8 +12,8 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/KoulutuksenOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/KoulutuksenOsa.java index be836e15ae..818c823012 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/KoulutuksenOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/KoulutuksenOsa.java @@ -13,17 +13,17 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -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.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +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.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TutkintoonvalmentavaSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TutkintoonvalmentavaSisalto.java index 40fac51d52..04f9fe4f51 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TutkintoonvalmentavaSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TutkintoonvalmentavaSisalto.java @@ -5,13 +5,13 @@ import fi.vm.sade.eperusteet.domain.PerusteenOsaViite; import fi.vm.sade.eperusteet.domain.PerusteenSisalto; import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TuvaLaajaAlainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TuvaLaajaAlainenOsaaminen.java index f9719a4682..c4681ccb84 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TuvaLaajaAlainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/tuva/TuvaLaajaAlainenOsaaminen.java @@ -11,12 +11,12 @@ import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import java.io.Serializable; import java.util.Objects; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohde.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohde.java index 338fd8496c..32e0c41d21 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohde.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohde.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({TYPE, ANNOTATION_TYPE}) @Retention(RUNTIME) diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohdeValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohdeValidator.java index 7f3153317e..404b9f1186 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohdeValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidArvioinninKohdeValidator.java @@ -4,8 +4,8 @@ import fi.vm.sade.eperusteet.domain.arviointi.ArviointiAsteikko; import fi.vm.sade.eperusteet.domain.Osaamistaso; import fi.vm.sade.eperusteet.domain.OsaamistasonKriteeri; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidArvioinninKohdeValidator implements ConstraintValidator { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidDateRangeValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidDateRangeValidator.java index f3d2632966..2a41e1ed5b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidDateRangeValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidDateRangeValidator.java @@ -2,8 +2,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Date; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtml.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtml.java index 11e2bd39fa..42206cbd3d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtml.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtml.java @@ -2,8 +2,8 @@ import org.jsoup.safety.Safelist; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlCollectionValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlCollectionValidator.java index 8310c5503b..04847e838b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlCollectionValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlCollectionValidator.java @@ -2,8 +2,8 @@ import java.util.Collection; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import fi.vm.sade.eperusteet.domain.TekstiPalanen; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlValidator.java index 150969b98c..939a271f44 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidHtmlValidator.java @@ -1,7 +1,7 @@ package fi.vm.sade.eperusteet.domain.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import fi.vm.sade.eperusteet.domain.TekstiPalanen; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodiValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodiValidator.java index 5db068323b..ce109f3361 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodiValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodiValidator.java @@ -1,14 +1,14 @@ package fi.vm.sade.eperusteet.domain.validation; import fi.vm.sade.eperusteet.domain.Koodi; -import java.util.Collection; -import javax.validation.UnexpectedTypeException; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import jakarta.validation.UnexpectedTypeException; import org.springframework.util.ObjectUtils; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; public class ValidKoodiValidator implements ConstraintValidator { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodisto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodisto.java index dd8294f868..de3b5c5242 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodisto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidKoodisto.java @@ -1,7 +1,8 @@ package fi.vm.sade.eperusteet.domain.validation; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLength.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLength.java index 96c427e123..4eb694295f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLength.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLength.java @@ -1,7 +1,7 @@ package fi.vm.sade.eperusteet.domain.validation; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; import java.lang.annotation.Documented; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLengthValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLengthValidator.java index 2a80ba5e28..730fddc57f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLengthValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidMaxLengthValidator.java @@ -4,8 +4,8 @@ import fi.vm.sade.eperusteet.domain.TekstiPalanen; import org.springframework.util.StringUtils; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.util.Map; public class ValidMaxLengthValidator extends ValidHtmlValidatorBase implements ConstraintValidator { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitieto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitieto.java index a786c3baef..2edb5c889d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitieto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitieto.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({TYPE, ANNOTATION_TYPE}) @Retention(RUNTIME) diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitietoValidator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitietoValidator.java index 79d7929e18..266e129cd6 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitietoValidator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidOsaamistavoiteEsitietoValidator.java @@ -1,8 +1,8 @@ package fi.vm.sade.eperusteet.domain.validation; import fi.vm.sade.eperusteet.domain.tutkinnonosa.Osaamistavoite; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class ValidOsaamistavoiteEsitietoValidator implements ConstraintValidator { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidateDateRange.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidateDateRange.java index 204d1297ce..7d2cbcaffc 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidateDateRange.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/validation/ValidateDateRange.java @@ -6,8 +6,8 @@ import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; @Target({TYPE, ANNOTATION_TYPE}) @Retention(RUNTIME) diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoKielitaitotaso.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoKielitaitotaso.java index 93ba08e850..bfcd1008dc 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoKielitaitotaso.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoKielitaitotaso.java @@ -13,15 +13,15 @@ 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.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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlainenOsaaminen.java index 1b8f557b0d..fd6cdee0a3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlainenOsaaminen.java @@ -10,15 +10,15 @@ 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.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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlaisenOsaamisenAlue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlaisenOsaamisenAlue.java index 2b550c4042..8ce84dac2d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlaisenOsaamisenAlue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoLaajaAlaisenOsaamisenAlue.java @@ -12,11 +12,11 @@ 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.ManyToOne; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; @Entity @Table(name = "koto_laaja_alainen_osaaminen_alue") diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoOpinto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoOpinto.java index c8a6ea2b10..34149f6074 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoOpinto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoOpinto.java @@ -14,15 +14,15 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -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.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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoTaitotaso.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoTaitotaso.java index e0295e9830..f489097f74 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoTaitotaso.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/KotoTaitotaso.java @@ -6,14 +6,14 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.domain.validation.ValidKoodisto; import fi.vm.sade.eperusteet.dto.koodisto.KoodistoUriArvo; -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 lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Opintokokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Opintokokonaisuus.java index 5fe5d7e660..2c3f5dd78b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Opintokokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Opintokokonaisuus.java @@ -14,17 +14,17 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -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.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; +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.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/TavoiteAlue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/TavoiteAlue.java index 1170d55a92..42ec0a1ce3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/TavoiteAlue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/TavoiteAlue.java @@ -9,21 +9,21 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -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.OrderColumn; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +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.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Tavoitesisaltoalue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Tavoitesisaltoalue.java index f1bbe54bec..bc2ec25c9e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Tavoitesisaltoalue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/Tavoitesisaltoalue.java @@ -12,15 +12,15 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -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.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.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/VapaasivistystyoSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/VapaasivistystyoSisalto.java index 0c9a4b8122..1d40179711 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/VapaasivistystyoSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/vst/VapaasivistystyoSisalto.java @@ -12,13 +12,13 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEKurssi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEKurssi.java index 43e18e2a36..1b6b8c8ead 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEKurssi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEKurssi.java @@ -10,7 +10,7 @@ import java.util.Objects; import java.util.Set; import java.util.UUID; -import javax.persistence.*; +import jakarta.persistence.*; import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEOppiaine.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEOppiaine.java index 61551fa7b0..2911e1cf7c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEOppiaine.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEOppiaine.java @@ -9,9 +9,9 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import fi.vm.sade.eperusteet.domain.validation.ValidHtml.WhitelistType; import java.util.*; -import javax.persistence.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEVaihe.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEVaihe.java index 0fb4392958..95878fd9c7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEVaihe.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AIPEVaihe.java @@ -7,8 +7,8 @@ import fi.vm.sade.eperusteet.domain.Tunnistettava; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.util.*; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AbstractOppiaineOpetuksenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AbstractOppiaineOpetuksenSisalto.java index 0f9187d53d..fa73ffa691 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AbstractOppiaineOpetuksenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/AbstractOppiaineOpetuksenSisalto.java @@ -4,7 +4,7 @@ import fi.vm.sade.eperusteet.domain.Peruste; import fi.vm.sade.eperusteet.domain.PerusteenOsaViite; -import javax.persistence.MappedSuperclass; +import jakarta.persistence.MappedSuperclass; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/DigitaalisenOsaamisenPerusteenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/DigitaalisenOsaamisenPerusteenSisalto.java index 33eff2bab7..68fdd97e2b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/DigitaalisenOsaamisenPerusteenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/DigitaalisenOsaamisenPerusteenSisalto.java @@ -9,13 +9,13 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; @Entity @Audited diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/EsiopetuksenPerusteenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/EsiopetuksenPerusteenSisalto.java index 331f6830ea..2809632408 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/EsiopetuksenPerusteenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/EsiopetuksenPerusteenSisalto.java @@ -3,13 +3,13 @@ import fi.vm.sade.eperusteet.domain.AbstractAuditedReferenceableEntity; import fi.vm.sade.eperusteet.domain.Peruste; import fi.vm.sade.eperusteet.domain.PerusteenOsaViite; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import fi.vm.sade.eperusteet.domain.PerusteenSisalto; import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/KeskeinenSisaltoalue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/KeskeinenSisaltoalue.java index 5ff3818ae4..87104168da 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/KeskeinenSisaltoalue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/KeskeinenSisaltoalue.java @@ -8,8 +8,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Kurssi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Kurssi.java index 72134fd5e0..0c28e2ea71 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Kurssi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Kurssi.java @@ -7,8 +7,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/LaajaalainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/LaajaalainenOsaaminen.java index 69f3737002..ea3e0e1767 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/LaajaalainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/LaajaalainenOsaaminen.java @@ -11,8 +11,8 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import lombok.Getter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenKohdealue.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenKohdealue.java index e1c9e003f4..c9c864f14f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenKohdealue.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenKohdealue.java @@ -10,8 +10,8 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenTavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenTavoite.java index c3ad6e32b7..59eab233e4 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenTavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OpetuksenTavoite.java @@ -10,18 +10,18 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -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.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.OrderColumn; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +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.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.OrderColumn; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Oppiaine.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Oppiaine.java index 7b4eca5029..851f0b3129 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Oppiaine.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Oppiaine.java @@ -15,10 +15,10 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.persistence.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.persistence.*; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import fi.vm.sade.eperusteet.dto.peruste.NavigationType; import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenTavoitteenOpetuksenTavoite.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenTavoitteenOpetuksenTavoite.java index 3a00464d79..08434c8aa0 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenTavoitteenOpetuksenTavoite.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenTavoitteenOpetuksenTavoite.java @@ -5,15 +5,15 @@ import lombok.Getter; import lombok.Setter; -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 javax.validation.constraints.NotNull; +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 jakarta.validation.constraints.NotNull; import java.io.Serializable; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenVuosiluokkaKokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenVuosiluokkaKokonaisuus.java index e0d6d6d2f7..22a64c8f7c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenVuosiluokkaKokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/OppiaineenVuosiluokkaKokonaisuus.java @@ -10,8 +10,8 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.*; import org.hibernate.envers.RelationTargetAuditMode; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusopetuksenPerusteenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusopetuksenPerusteenSisalto.java index 80092d37c2..ad912b00de 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusopetuksenPerusteenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusopetuksenPerusteenSisalto.java @@ -9,8 +9,8 @@ import org.hibernate.annotations.BatchSize; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.HashSet; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusteenMuokkaustietoLisaparametrit.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusteenMuokkaustietoLisaparametrit.java index 8f47465489..5c3e707154 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusteenMuokkaustietoLisaparametrit.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/PerusteenMuokkaustietoLisaparametrit.java @@ -5,11 +5,11 @@ import lombok.Getter; import lombok.NoArgsConstructor; -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 java.io.Serializable; @Getter diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Taiteenala.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Taiteenala.java index 50017e08f0..bf9ffd0d77 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Taiteenala.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/Taiteenala.java @@ -13,7 +13,7 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; +import jakarta.persistence.*; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TavoitteenArviointi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TavoitteenArviointi.java index 933f809b2f..8c2a2c5873 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TavoitteenArviointi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TavoitteenArviointi.java @@ -6,14 +6,14 @@ import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.util.HashSet; import java.util.Set; -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.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.Table; import lombok.Getter; import lombok.Setter; import org.hibernate.envers.Audited; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TekstiOsa.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TekstiOsa.java index 9eeaf798c8..b7b3afe834 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TekstiOsa.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TekstiOsa.java @@ -5,7 +5,7 @@ import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; import java.io.Serializable; -import javax.persistence.*; +import jakarta.persistence.*; import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; import lombok.Getter; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TpoOpetuksenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TpoOpetuksenSisalto.java index acc1237e21..a41842387e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TpoOpetuksenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/TpoOpetuksenSisalto.java @@ -5,13 +5,13 @@ import fi.vm.sade.eperusteet.domain.PerusteenOsaViite; import fi.vm.sade.eperusteet.domain.PerusteenSisalto; import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.OneToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuudenLaajaalainenOsaaminen.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuudenLaajaalainenOsaaminen.java index fef91587ff..d2cdc4798e 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuudenLaajaalainenOsaaminen.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuudenLaajaalainenOsaaminen.java @@ -4,12 +4,12 @@ import fi.vm.sade.eperusteet.domain.TekstiPalanen; import fi.vm.sade.eperusteet.domain.annotation.RelatesToPeruste; import fi.vm.sade.eperusteet.domain.validation.ValidHtml; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; +import jakarta.persistence.CascadeType; +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; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuus.java index 0b4b90cece..4c789786e2 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/VuosiluokkaKokonaisuus.java @@ -13,8 +13,8 @@ import org.hibernate.envers.NotAudited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.ArrayList; import java.util.EnumSet; import java.util.HashSet; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuudet.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuudet.java index 8542134fa7..077d5def23 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuudet.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuus.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuus.java index 4d9572cae3..c6ecb433fd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Aihekokonaisuus.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/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; import java.util.function.Predicate; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukioOpetussuunnitelmaRakenne.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukioOpetussuunnitelmaRakenne.java index 554669bb4e..9fa5375609 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukioOpetussuunnitelmaRakenne.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukioOpetussuunnitelmaRakenne.java @@ -11,7 +11,7 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; +import jakarta.persistence.*; import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukiokoulutuksenPerusteenSisalto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukiokoulutuksenPerusteenSisalto.java index 5f04d0e6b3..81f3401fe1 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukiokoulutuksenPerusteenSisalto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/LukiokoulutuksenPerusteenSisalto.java @@ -10,8 +10,8 @@ import lombok.Setter; import org.hibernate.envers.Audited; -import javax.persistence.*; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; import java.util.Set; @Entity diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Lukiokurssi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Lukiokurssi.java index d7bb805f66..3b97b2459f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Lukiokurssi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/Lukiokurssi.java @@ -11,9 +11,9 @@ import org.hibernate.envers.Audited; import org.hibernate.envers.RelationTargetAuditMode; -import javax.persistence.*; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; +import jakarta.persistence.*; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import java.util.HashSet; import java.util.Set; import java.util.function.Predicate; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OpetuksenYleisetTavoitteet.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OpetuksenYleisetTavoitteet.java index 02c97c456e..eb88f42e96 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OpetuksenYleisetTavoitteet.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OpetuksenYleisetTavoitteet.java @@ -12,7 +12,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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OppiaineLukiokurssi.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OppiaineLukiokurssi.java index 7ae13b27dc..0166245a24 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/lukio/OppiaineLukiokurssi.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/domain/yl/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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusLuontiDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusLuontiDto.java index 523c646c74..7b8cd49259 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusLuontiDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusLuontiDto.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Optional; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusMuokkausDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusMuokkausDto.java index da09febaa4..47c55458f2 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusMuokkausDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioAihekokonaisuusMuokkausDto.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Optional; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioKurssiLuontiDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioKurssiLuontiDto.java index 953a9e55b5..f2559a4661 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioKurssiLuontiDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukioKurssiLuontiDto.java @@ -5,7 +5,7 @@ import fi.vm.sade.eperusteet.dto.yl.TekstiOsaDto; import lombok.*; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; import java.util.Optional; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiMuokkausDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiMuokkausDto.java index e0e94905d0..db621c9e2b 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiMuokkausDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiMuokkausDto.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; @Data diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiOppaineMuokkausDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiOppaineMuokkausDto.java index ab20489dec..4b838238ed 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiOppaineMuokkausDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiOppaineMuokkausDto.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiTarkasteleDto.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiTarkasteleDto.java index 189f7d496e..2e6984a49d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiTarkasteleDto.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/dto/yl/lukio/LukiokurssiTarkasteleDto.java @@ -8,7 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.ArrayList; import java.util.Date; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/hibernate/MetadataIntegrator.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/hibernate/MetadataIntegrator.java index 1b6cb4f24c..53e02f1788 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/hibernate/MetadataIntegrator.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/hibernate/MetadataIntegrator.java @@ -7,7 +7,7 @@ import org.hibernate.integrator.spi.Integrator; import org.hibernate.service.spi.SessionFactoryServiceRegistry; -import javax.persistence.Transient; +import jakarta.persistence.Transient; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/OphSessionMappingStorage.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/OphSessionMappingStorage.java index 2582543b17..ff58a104ba 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/OphSessionMappingStorage.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/OphSessionMappingStorage.java @@ -1,6 +1,7 @@ package fi.vm.sade.eperusteet.repository; -import org.jasig.cas.client.session.SessionMappingStorage; + +import org.apereo.cas.client.session.SessionMappingStorage; public interface OphSessionMappingStorage extends SessionMappingStorage { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/AmmattitaitovaatimusRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/AmmattitaitovaatimusRepositoryImpl.java index 82651c1ade..529f375c37 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/AmmattitaitovaatimusRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/AmmattitaitovaatimusRepositoryImpl.java @@ -13,10 +13,10 @@ import org.springframework.data.domain.PageRequest; import org.springframework.util.StringUtils; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; @Slf4j public class AmmattitaitovaatimusRepositoryImpl implements AmmattitaitovaatimusRepositoryCustom { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/JulkaistuPerusteDataStoreRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/JulkaistuPerusteDataStoreRepositoryImpl.java index 5e4d3f6e22..5460377311 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/JulkaistuPerusteDataStoreRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/JulkaistuPerusteDataStoreRepositoryImpl.java @@ -13,8 +13,8 @@ import org.springframework.transaction.annotation.Transactional; import javax.cache.Cache; -import javax.persistence.EntityManager; -import javax.persistence.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OphSessionMappingStorageImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OphSessionMappingStorageImpl.java index fbe1ee187b..1873d83638 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OphSessionMappingStorageImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OphSessionMappingStorageImpl.java @@ -2,27 +2,22 @@ import java.time.Duration; import java.util.*; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; import fi.vm.sade.eperusteet.repository.OphSessionMappingStorage; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; +import lombok.RequiredArgsConstructor; 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; +@RequiredArgsConstructor public class OphSessionMappingStorageImpl implements OphSessionMappingStorage { - private final JdbcTemplate jdbcTemplate; private final SessionRepository sessionRepository; - public OphSessionMappingStorageImpl( - JdbcTemplate jdbcTemplate, SessionRepository sessionRepository) { - this.jdbcTemplate = jdbcTemplate; - this.sessionRepository = sessionRepository; - } - private Optional queryForOptional(String sql, Class requiredType, Object... args) { List results = jdbcTemplate.query(sql, new SingleColumnRowMapper<>(requiredType), args); int size = results.size(); @@ -39,10 +34,10 @@ private Optional queryForOptional(String sql, Class requiredType, Obje public HttpSession removeSessionByMappingId(String mappingId) { String sql = "SELECT session_id FROM cas_client_session WHERE mapping_id = ?"; return queryForOptional(sql, String.class, mappingId) - .map(sessionRepository::findById) - .filter(Objects::nonNull) - .map(session -> new HttpSessionAdapter(sessionRepository, session)) - .orElse(null); + .map(sessionRepository::findById) + .filter(Objects::nonNull) + .map(session -> new HttpSessionAdapter(sessionRepository, session)) + .orElse(null); } @Override @@ -53,30 +48,21 @@ public void removeBySessionById(String sessionId) { @Override public void addSessionById(String mappingId, HttpSession session) { - String sql = - "INSERT INTO cas_client_session (mapping_id, session_id) VALUES (?, ?) ON CONFLICT (mapping_id) DO NOTHING"; + String sql = "INSERT INTO cas_client_session (mapping_id, session_id) VALUES (?, ?) ON CONFLICT (mapping_id) DO NOTHING"; jdbcTemplate.update(sql, mappingId, session.getId()); } @Override public void clean() { - String sql = - "DELETE FROM cas_client_session WHERE session_id NOT IN (SELECT session_id FROM spring_session)"; + String sql = "DELETE FROM cas_client_session WHERE session_id NOT IN (SELECT session_id FROM spring_session)"; jdbcTemplate.update(sql); } - @SuppressWarnings("deprecation") + @RequiredArgsConstructor private static class HttpSessionAdapter implements HttpSession { - private final SessionRepository sessionRepository; private final Session session; - public HttpSessionAdapter( - SessionRepository sessionRepository, Session session) { - this.sessionRepository = sessionRepository; - this.session = session; - } - @Override public long getCreationTime() { return session.getCreationTime().toEpochMilli(); @@ -107,52 +93,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()); @@ -163,18 +123,4 @@ public boolean isNew() { return false; } } - - @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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OsaamismerkkiRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OsaamismerkkiRepositoryImpl.java index 5dfc1b322d..a90da4195a 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OsaamismerkkiRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/OsaamismerkkiRepositoryImpl.java @@ -12,22 +12,21 @@ import fi.vm.sade.eperusteet.dto.osaamismerkki.OsaamismerkkiQuery; import fi.vm.sade.eperusteet.repository.OsaamismerkkiRepositoryCustom; import lombok.extern.slf4j.Slf4j; -import org.hibernate.Query; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import java.util.Date; import java.util.List; import java.util.Set; @@ -46,8 +45,6 @@ public Page findBy(PageRequest page, OsaamismerkkiQuery oquery) { query.setFirstResult(Long.valueOf(page.getOffset()).intValue()); query.setMaxResults(page.getPageSize()); - log.debug(query.unwrap(Query.class).getQueryString()); - List result = query.getResultList().stream() .map(t -> t.get(0, Osaamismerkki.class)) .collect(Collectors.toList()); diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteRepositoryImpl.java index 05c7958974..0be21172cb 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteRepositoryImpl.java @@ -10,11 +10,11 @@ import fi.vm.sade.eperusteet.repository.PerusteRepositoryCustom; import java.util.*; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteprojektiRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteprojektiRepositoryImpl.java index 35747c4c0a..1b1c0afc24 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteprojektiRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/PerusteprojektiRepositoryImpl.java @@ -7,20 +7,20 @@ import java.util.Date; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Expression; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.JoinType; -import javax.persistence.criteria.Order; -import javax.persistence.criteria.Path; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; -import javax.persistence.criteria.SetJoin; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Path; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.data.domain.Page; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TekstiPalanenRepositoryCustomImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TekstiPalanenRepositoryCustomImpl.java index 855aa4f1e0..d6896216d7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TekstiPalanenRepositoryCustomImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TekstiPalanenRepositoryCustomImpl.java @@ -1,21 +1,22 @@ package fi.vm.sade.eperusteet.repository.custom; import com.google.common.collect.Lists; -import fi.vm.sade.eperusteet.domain.Kieli; import fi.vm.sade.eperusteet.dto.util.LokalisoituTekstiHakuDto; import fi.vm.sade.eperusteet.repository.TekstiPalanenRepositoryCustom; -import org.hibernate.Query; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Query; import org.hibernate.Session; import org.hibernate.transform.AliasToBeanResultTransformer; -import org.hibernate.type.EnumType; -import org.hibernate.type.LongType; -import org.hibernate.type.StringType; -import org.hibernate.type.Type; +import org.hibernate.type.StandardBasicTypes; import org.springframework.stereotype.Repository; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import static java.util.stream.Collectors.toList; @@ -48,31 +49,32 @@ private List getTekstipalaset(List tekstiPalanen params.put("ids_"+i, ids); ++i; } - Query q =session.createSQLQuery("SELECT " + + Query q =session.createNativeQuery("SELECT " + " t.tekstipalanen_id as id, " + " t.kieli as kieli, " + " t.teksti as teksti " + " FROM tekstipalanen_teksti t " + " WHERE (" + or + ") ORDER BY t.tekstipalanen_id, t.kieli") - .addScalar("id", LongType.INSTANCE) - .addScalar("kieli", enumType(session, Kieli.class)) - .addScalar("teksti", StringType.INSTANCE) + .addScalar("id", StandardBasicTypes.LONG) +// .addScalar("kieli", enumType(session, Kieli.class)) + .addScalar("kieli", StandardBasicTypes.STRING) + .addScalar("teksti", StandardBasicTypes.STRING) .setResultTransformer(new AliasToBeanResultTransformer(LokalisoituTekstiHakuDto.class)); for (Map.Entry> p : params.entrySet()) { - q.setParameterList(p.getKey(), p.getValue()); + q.setParameter(p.getKey(), p.getValue()); } return list(q); } @SuppressWarnings("unchecked") protected List list(Query q) { - return q.list(); + return q.getResultList(); } - protected> Type enumType(Session session, Class e) { - Properties params = new Properties(); - params.put("enumClass", e.getCanonicalName()); - params.put("type", "12");/*type 12 instructs to use the String representation of enum value*/ - return session.getTypeHelper().custom(EnumType.class, params); - } +// protected> Type enumType(Session session, Class e) { +// Properties params = new Properties(); +// params.put("enumClass", e.getCanonicalName()); +// params.put("type", "12");/*type 12 instructs to use the String representation of enum value*/ +// return session.getSessionFactory().getTypeHelper().custom(UserType.class, params); +// } } diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TiedoteRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TiedoteRepositoryImpl.java index e738e9f66d..cc10fdbcda 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TiedoteRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TiedoteRepositoryImpl.java @@ -1,21 +1,39 @@ package fi.vm.sade.eperusteet.repository.custom; -import fi.vm.sade.eperusteet.domain.*; +import fi.vm.sade.eperusteet.domain.KoulutusTyyppi; +import fi.vm.sade.eperusteet.domain.LokalisoituTeksti; +import fi.vm.sade.eperusteet.domain.LokalisoituTeksti_; +import fi.vm.sade.eperusteet.domain.Peruste; +import fi.vm.sade.eperusteet.domain.Peruste_; +import fi.vm.sade.eperusteet.domain.Perusteprojekti; +import fi.vm.sade.eperusteet.domain.Perusteprojekti_; +import fi.vm.sade.eperusteet.domain.TekstiPalanen; +import fi.vm.sade.eperusteet.domain.TekstiPalanen_; +import fi.vm.sade.eperusteet.domain.Tiedote; +import fi.vm.sade.eperusteet.domain.TiedoteJulkaisuPaikka; +import fi.vm.sade.eperusteet.domain.Tiedote_; import fi.vm.sade.eperusteet.dto.peruste.TiedoteQuery; import fi.vm.sade.eperusteet.repository.TiedoteRepositoryCustom; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.Tuple; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Expression; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.JoinType; +import jakarta.persistence.criteria.Order; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; +import jakarta.persistence.criteria.SetJoin; import lombok.extern.slf4j.Slf4j; -import org.hibernate.Query; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.Tuple; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.*; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -34,8 +52,6 @@ public Page findBy(PageRequest page, TiedoteQuery tquery) { query.setFirstResult(Long.valueOf(page.getOffset()).intValue()); query.setMaxResults(page.getPageSize()); - log.debug(query.unwrap(Query.class).getQueryString()); - List result = query.getResultList().stream() .map(t -> t.get(0, Tiedote.class)) .collect(Collectors.toList()); diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TutkinnonOsaRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TutkinnonOsaRepositoryImpl.java index 70f887c62e..85c960b2bd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TutkinnonOsaRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/custom/TutkinnonOsaRepositoryImpl.java @@ -11,10 +11,10 @@ import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import javax.persistence.criteria.*; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.persistence.TypedQuery; +import jakarta.persistence.criteria.*; @Slf4j public class TutkinnonOsaRepositoryImpl implements TutkinnonOsaRepositoryCustom { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/dialect/JsonBType.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/dialect/JsonBType.java index 20a17b3238..1720b84071 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/dialect/JsonBType.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/dialect/JsonBType.java @@ -23,8 +23,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,19 +37,19 @@ 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 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 { @@ -85,6 +85,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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/LiiteRepositoryCustom.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/LiiteRepositoryCustom.java index 6f6393aa2c..9a16a1b6fc 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/LiiteRepositoryCustom.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/LiiteRepositoryCustom.java @@ -3,6 +3,7 @@ import fi.vm.sade.eperusteet.domain.liite.Liite; import fi.vm.sade.eperusteet.domain.liite.LiiteTyyppi; +import java.io.IOException; import java.io.InputStream; import java.util.UUID; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/impl/LiiteRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/impl/LiiteRepositoryImpl.java index 88270f2f00..80883dc2c5 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/impl/LiiteRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/liite/impl/LiiteRepositoryImpl.java @@ -3,12 +3,16 @@ import fi.vm.sade.eperusteet.domain.liite.Liite; import fi.vm.sade.eperusteet.domain.liite.LiiteTyyppi; import fi.vm.sade.eperusteet.repository.liite.LiiteRepositoryCustom; + +import java.io.IOException; import java.io.InputStream; import java.sql.Blob; import java.util.UUID; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; +import org.apache.commons.io.IOUtils; import org.hibernate.Hibernate; import org.hibernate.Session; +import org.hibernate.engine.jdbc.BlobProxy; import org.springframework.beans.factory.annotation.Autowired; public class LiiteRepositoryImpl implements LiiteRepositoryCustom { @@ -18,8 +22,12 @@ public class LiiteRepositoryImpl implements LiiteRepositoryCustom { @Override public Liite add(LiiteTyyppi tyyppi, String mime, 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, mime, nimi, blob); em.persist(liite); em.flush(); @@ -28,8 +36,7 @@ public Liite add(LiiteTyyppi tyyppi, String mime, String nimi, long length, Inpu @Override public Liite add(LiiteTyyppi tyyppi, String mime, String nimi, byte[] bytes) { - Session session = em.unwrap(Session.class); - Blob blob = Hibernate.getLobCreator(session).createBlob(bytes); + Blob blob = BlobProxy.generateProxy(bytes); Liite liite = new Liite(tyyppi, mime, nimi, blob); em.persist(liite); em.flush(); @@ -38,8 +45,7 @@ public Liite add(LiiteTyyppi tyyppi, String mime, String nimi, byte[] bytes) { @Override public Liite add(UUID uuid, LiiteTyyppi tyyppi, String mime, String nimi, byte[] bytes) { - Session session = em.unwrap(Session.class); - Blob blob = Hibernate.getLobCreator(session).createBlob(bytes); + Blob blob = BlobProxy.generateProxy(bytes); Liite liite = new Liite(uuid, tyyppi, mime, nimi, blob); em.persist(liite); em.flush(); diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryFactoryBean.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryFactoryBean.java index 530e3364a5..7c24ad50d7 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryFactoryBean.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryFactoryBean.java @@ -26,7 +26,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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryImpl.java index 695a47b46e..a2ccc05205 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/repository/version/JpaWithVersioningRepositoryImpl.java @@ -8,8 +8,8 @@ import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.LockModeType; +import jakarta.persistence.EntityManager; +import jakarta.persistence.LockModeType; import org.hibernate.envers.AuditReader; import org.hibernate.envers.AuditReaderFactory; import org.hibernate.envers.query.AuditEntity; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/MaaraysController.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/MaaraysController.java index d594f62e30..05a93a4283 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/MaaraysController.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/MaaraysController.java @@ -30,7 +30,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; import java.sql.SQLException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/PerusteenOsaController.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/PerusteenOsaController.java index 5095380530..073da7b72c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/PerusteenOsaController.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/PerusteenOsaController.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/julkinen/ExternalController.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/julkinen/ExternalController.java index 6222459e34..d0aa6676e3 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/julkinen/ExternalController.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/julkinen/ExternalController.java @@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/peruste/LiitetiedostoController.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/peruste/LiitetiedostoController.java index 2dafee2d9c..d43b252d82 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/peruste/LiitetiedostoController.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/peruste/LiitetiedostoController.java @@ -27,8 +27,8 @@ import org.springframework.web.bind.annotation.RestController; import org.springframework.web.util.UriComponentsBuilder; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheHeaderInterceptor.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheHeaderInterceptor.java index 1e7d797b69..1a127a8ad8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheHeaderInterceptor.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheHeaderInterceptor.java @@ -1,8 +1,8 @@ package fi.vm.sade.eperusteet.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.ResponseEntity; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheableResponse.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheableResponse.java index 669a0b6300..4cf802fa37 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheableResponse.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/CacheableResponse.java @@ -3,7 +3,7 @@ import com.google.common.base.Supplier; import fi.vm.sade.eperusteet.dto.peruste.PerusteVersionDto; import fi.vm.sade.eperusteet.repository.version.Revision; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/ProfilingInterceptor.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/ProfilingInterceptor.java index 39e369a349..8fc9f8246f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/ProfilingInterceptor.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/resource/util/ProfilingInterceptor.java @@ -1,7 +1,7 @@ package fi.vm.sade.eperusteet.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/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/LiiteTiedostoService.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/LiiteTiedostoService.java index 724503a11d..00ddf7aa87 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/LiiteTiedostoService.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/LiiteTiedostoService.java @@ -5,7 +5,7 @@ import org.apache.tika.mime.MimeTypeException; import org.springframework.web.HttpMediaTypeNotSupportedException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import java.io.IOException; import java.io.InputStream; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/ExternalPdfServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/ExternalPdfServiceImpl.java index 01bbf67186..520e1c3041 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/ExternalPdfServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/dokumentti/impl/ExternalPdfServiceImpl.java @@ -22,14 +22,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_UNAUTHORIZED; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; +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_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND; @Service public class ExternalPdfServiceImpl implements ExternalPdfService { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/FlushUtilImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/FlushUtilImpl.java index bc75af1086..a828b8e310 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/FlushUtilImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/FlushUtilImpl.java @@ -4,8 +4,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; @Component public class FlushUtilImpl implements FlushUtil { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/ResolverUtilImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/ResolverUtilImpl.java index b345cdfd23..4dd65cfc66 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/ResolverUtilImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/event/impl/ResolverUtilImpl.java @@ -8,8 +8,8 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KayttajanTietoServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KayttajanTietoServiceImpl.java index 6f33fa50fc..032b136c48 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KayttajanTietoServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KayttajanTietoServiceImpl.java @@ -45,9 +45,9 @@ import org.springframework.util.ObjectUtils; import static fi.vm.sade.eperusteet.service.mapping.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 @Profile("!test & !docker") diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KoodistoClientImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KoodistoClientImpl.java index 16b65360c1..5054383738 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KoodistoClientImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/KoodistoClientImpl.java @@ -52,13 +52,13 @@ import javax.annotation.PostConstruct; -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_CREATED; -import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN; -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_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST; +import static jakarta.servlet.http.HttpServletResponse.SC_CREATED; +import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN; +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_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @Slf4j @Service diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteServiceImpl.java index c376a6661b..5a6a43a07f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteServiceImpl.java @@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; @Service public class LiiteServiceImpl implements LiiteService { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteTiedostoServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteTiedostoServiceImpl.java index f023f057e9..23703ddab5 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteTiedostoServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LiiteTiedostoServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam; import javax.imageio.ImageIO; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LockManagerImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LockManagerImpl.java index a905d6903e..b4764bd9f8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LockManagerImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/LockManagerImpl.java @@ -14,9 +14,9 @@ import java.util.concurrent.TimeoutException; import java.util.stream.Collectors; import java.util.stream.Stream; -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; import org.springframework.dao.DataAccessException; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/MaaraysServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/MaaraysServiceImpl.java index f430d0fbf8..4eff3d6df8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/MaaraysServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/MaaraysServiceImpl.java @@ -28,6 +28,7 @@ import org.apache.commons.io.IOUtils; import org.hibernate.Hibernate; import org.hibernate.Session; +import org.hibernate.engine.jdbc.BlobProxy; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -39,7 +40,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; @@ -271,13 +272,12 @@ public UUID uploadFile(MaaraysLiiteDto maaraysLiiteUploadDto) { } pis.unread(buf); - Session session = em.unwrap(Session.class); MaaraysLiite liite = new MaaraysLiite( UUID.randomUUID(), dtoMapper.map(maaraysLiiteUploadDto.getNimi(), TekstiPalanen.class), maaraysLiiteUploadDto.getTiedostonimi(), maaraysLiiteUploadDto.getTyyppi(), - Hibernate.getLobCreator(session).createBlob(pis, decoder.length)); + BlobProxy.generateProxy(IOUtils.toByteArray(is))); em.persist(liite); em.flush(); diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/OsaAlueServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/OsaAlueServiceImpl.java index feb688153f..99158f486f 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/OsaAlueServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/OsaAlueServiceImpl.java @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteImportLops2019.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteImportLops2019.java index 372b0bac15..3f24087c8d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteImportLops2019.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteImportLops2019.java @@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.*; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteServiceImpl.java index 4e87e819dd..d8a8b89501 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteServiceImpl.java @@ -192,11 +192,11 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.multipart.MultipartHttpServletRequest; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validator; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validator; import java.io.File; import java.io.IOException; import java.sql.Blob; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteenOsaServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteenOsaServiceImpl.java index 3ee1b807d9..c7b132c74c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteenOsaServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteenOsaServiceImpl.java @@ -41,7 +41,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityNotFoundException; import java.util.*; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteprojektiServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteprojektiServiceImpl.java index 1bcd0b29b0..81ca652b59 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteprojektiServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/PerusteprojektiServiceImpl.java @@ -134,8 +134,8 @@ import static fi.vm.sade.eperusteet.domain.ProjektiTila.LAADINTA; import static fi.vm.sade.eperusteet.resource.peruste.LiitetiedostoController.DOCUMENT_TYPES; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @Slf4j @Service diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/UlkopuolisetServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/UlkopuolisetServiceImpl.java index 5fa08ad1d1..b12f4caa10 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/UlkopuolisetServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/UlkopuolisetServiceImpl.java @@ -16,8 +16,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; +import static jakarta.servlet.http.HttpServletResponse.SC_OK; +import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; @Service public class UlkopuolisetServiceImpl implements UlkopuolisetService { diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/AIPEOpetuksenPerusteenSisaltoServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/AIPEOpetuksenPerusteenSisaltoServiceImpl.java index 74012501d9..c0afc78861 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/AIPEOpetuksenPerusteenSisaltoServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/AIPEOpetuksenPerusteenSisaltoServiceImpl.java @@ -21,7 +21,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; import org.springframework.transaction.annotation.Transactional; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/Lops2019ServiceImpl.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/Lops2019ServiceImpl.java index f50db8ca31..4b1b66a35c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/Lops2019ServiceImpl.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/impl/yl/Lops2019ServiceImpl.java @@ -34,8 +34,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; -import javax.persistence.EntityManager; -import javax.persistence.EntityNotFoundException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityNotFoundException; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferencableUncachedEntityConverter.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferencableUncachedEntityConverter.java index 5864f43135..6ad7b959d8 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferencableUncachedEntityConverter.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferencableUncachedEntityConverter.java @@ -7,8 +7,8 @@ import ma.glasnost.orika.metadata.Type; import org.springframework.stereotype.Component; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; @Component @UncachedDto diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferenceableEntityConverter.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferenceableEntityConverter.java index 1f754b9d14..be4220b3fd 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferenceableEntityConverter.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/mapping/ReferenceableEntityConverter.java @@ -7,9 +7,9 @@ import ma.glasnost.orika.metadata.Type; import org.springframework.stereotype.Component; -import javax.persistence.EntityManager; -import javax.persistence.Inheritance; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Inheritance; +import jakarta.persistence.PersistenceContext; @Component @Dto diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/security/PermissionHelper.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/security/PermissionHelper.java index 77b93e437d..90aade2e3c 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/security/PermissionHelper.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/security/PermissionHelper.java @@ -14,12 +14,12 @@ import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Join; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; +import jakarta.persistence.EntityManager; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Join; +import jakarta.persistence.criteria.Predicate; +import jakarta.persistence.criteria.Root; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; diff --git a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/util/VirheServlet.java b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/util/VirheServlet.java index 02c30e6c9b..4ee8a7cd5d 100644 --- a/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/util/VirheServlet.java +++ b/eperusteet/eperusteet-service/src/main/java/fi/vm/sade/eperusteet/service/util/VirheServlet.java @@ -5,11 +5,11 @@ import com.google.common.base.Throwables; import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +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; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/AbstractPerusteprojektiTest.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/AbstractPerusteprojektiTest.java index 903edf6867..52673e78f7 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/AbstractPerusteprojektiTest.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/AbstractPerusteprojektiTest.java @@ -29,7 +29,7 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/ArviointiServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/ArviointiServiceIT.java index bc24f9deed..ae15cea4b9 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/ArviointiServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/ArviointiServiceIT.java @@ -28,9 +28,9 @@ import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.validation.ConstraintViolationException; import java.io.IOException; import java.util.Arrays; import java.util.Collections; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/OpasServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/OpasServiceIT.java index 3adcfd758a..304ac34402 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/OpasServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/OpasServiceIT.java @@ -45,8 +45,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import static org.assertj.core.api.Assertions.*; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceDbIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceDbIT.java index 1e27c30233..38cdeb2e27 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceDbIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceDbIT.java @@ -14,8 +14,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.Collections; import static org.junit.Assert.assertEquals; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceIT.java index 27721a0241..9437f0caa7 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteServiceIT.java @@ -26,8 +26,8 @@ import java.util.ArrayList; import java.util.Date; import java.util.stream.Collectors; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.assertj.core.api.Assertions; import org.junit.After; import org.junit.Assert; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaServiceIT.java index ca4b9d0fbe..d508f25ca8 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaServiceIT.java @@ -73,9 +73,9 @@ import org.springframework.test.context.transaction.TestTransaction; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; -import javax.validation.ConstraintViolationException; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import jakarta.validation.ConstraintViolationException; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaViiteIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaViiteIT.java index 9c7c4e9433..4f6b057a12 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaViiteIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenOsaViiteIT.java @@ -10,8 +10,8 @@ import fi.vm.sade.eperusteet.service.exception.BusinessRuleViolationException; import fi.vm.sade.eperusteet.service.test.AbstractIntegrationTest; import java.util.ArrayList; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.junit.Before; import org.junit.Rule; import org.junit.Test; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenRakenneIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenRakenneIT.java index 35a0e36e13..40bd09ba98 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenRakenneIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteenRakenneIT.java @@ -22,7 +22,7 @@ import fi.vm.sade.eperusteet.service.test.AbstractIntegrationTest; import fi.vm.sade.eperusteet.service.test.util.PerusteprojektiTestUtils; import fi.vm.sade.eperusteet.service.test.util.TestUtils; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import fi.vm.sade.eperusteet.service.util.Validointi; import org.junit.Before; @@ -32,7 +32,7 @@ import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiLuontiTestIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiLuontiTestIT.java index 5e2faa228d..31f4087f47 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiLuontiTestIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiLuontiTestIT.java @@ -56,7 +56,7 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.List; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceIT.java index 080e3ade0b..b4ce2d0ad7 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceIT.java @@ -25,8 +25,8 @@ import org.springframework.test.annotation.Rollback; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.util.*; import java.util.function.Consumer; import java.util.stream.Collectors; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceTilaIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceTilaIT.java index 66ec8a96c9..4dfa5d1c27 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceTilaIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/PerusteprojektiServiceTilaIT.java @@ -59,8 +59,8 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.support.TransactionTemplate; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/TiedoteServiceIT.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/TiedoteServiceIT.java index 7e13270666..c8faeb368e 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/TiedoteServiceIT.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/TiedoteServiceIT.java @@ -26,7 +26,7 @@ import fi.vm.sade.eperusteet.service.test.util.TestUtils; import java.util.*; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/test/util/PerusteprojektiTestUtils.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/test/util/PerusteprojektiTestUtils.java index b83cf1b21a..87d6f8b975 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/test/util/PerusteprojektiTestUtils.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/test/util/PerusteprojektiTestUtils.java @@ -26,7 +26,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.*; import java.util.function.Consumer; diff --git a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/util/PerusteprojektiTestHelper.java b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/util/PerusteprojektiTestHelper.java index a14628e10f..513db230f7 100644 --- a/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/util/PerusteprojektiTestHelper.java +++ b/eperusteet/eperusteet-service/src/test/java/fi/vm/sade/eperusteet/service/util/PerusteprojektiTestHelper.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; @Component @Transactional diff --git a/eperusteet/eperusteet-service/src/test/resources/it-db-test-context.xml b/eperusteet/eperusteet-service/src/test/resources/it-db-test-context.xml index 4927fa1dd6..86abd1b7e6 100644 --- a/eperusteet/eperusteet-service/src/test/resources/it-db-test-context.xml +++ b/eperusteet/eperusteet-service/src/test/resources/it-db-test-context.xml @@ -74,11 +74,11 @@ - + - + diff --git a/eperusteet/eperusteet-service/src/test/resources/it-docker-test-context.xml b/eperusteet/eperusteet-service/src/test/resources/it-docker-test-context.xml index 6c94710ed3..8a9957bb52 100644 --- a/eperusteet/eperusteet-service/src/test/resources/it-docker-test-context.xml +++ b/eperusteet/eperusteet-service/src/test/resources/it-docker-test-context.xml @@ -75,11 +75,11 @@ - + - + diff --git a/eperusteet/eperusteet-service/src/test/resources/it-test-context.xml b/eperusteet/eperusteet-service/src/test/resources/it-test-context.xml index f8a7c54594..ba14af9107 100644 --- a/eperusteet/eperusteet-service/src/test/resources/it-test-context.xml +++ b/eperusteet/eperusteet-service/src/test/resources/it-test-context.xml @@ -75,16 +75,17 @@ + - + - +