- * Because of this bug in hql, we are using native sql instead, and need to do the result mapping to + * Because of this bug in hql, we are using native sql instead, and need to do + * the result mapping to * ClassificationFamilySummary manually. *
- * If above bug is fixed then this class and the custom interface should be deleted and an hql query should be used + * If above bug is fixed then this class and the custom interface should be + * deleted and an hql query should be used * instead. *
- * Note: Above mentioned bug is fixed in Hibernate and is included in version 5.1. However Spring Boot is not yet using + * Note: Above mentioned bug is fixed in Hibernate and is included in version + * 5.1. However Spring Boot is not yet using * this version (currently 5.0 of Hibernate) - * + * *
* A possible HQL that can be included in ClassificationFamilyRepository if bug is fixed, is shown below;
- *
+ *
* @Query("select new no.ssb.klass.core.repository.ClassificationFamilySummary(family.name, family.iconName, count(classification)) "
* + "from ClassificationFamily family "
* + "left join family.classificationSeriesList as classification with classification.deleted <> '1' "
@@ -49,11 +53,11 @@ public List findClassificationFamilySummaries(Strin
ClassificationType classificationType) {
List result = new ArrayList<>();
List rows = em.createNativeQuery(
- // @formatter:off
+ // @formatter:off
"select family.id, family.name, family.icon_name, count(classification.id) from classification_family family "
+ "left outer join classification_series classification on classification.classification_family_id=family.id "
- + " and classification.deleted <> '1' "
- + " and (:section is null or :section = (select user.section from user user where user.id = classification.contact_person_id)) "
+ + " and classification.deleted = false"
+ + " and (:section is null or :section = (select usr.section from user usr where usr.id = classification.contact_person_id)) "
+ " and (:classificationType is null or :classificationType = classification.classification_type) "
+ "group by family.id"
// @formatter:on
@@ -78,13 +82,13 @@ public List findPublicClassificationFamilySummaries
"select family.id, family.name, family.icon_name, count(DISTINCT(classification.id)) from classification_family family "
+ " left outer join classification_series classification on classification.classification_family_id=family.id "
+ " left outer join statistical_classification version on version.classification_id=classification.id "
- + " where (version.published_en = '1' or version.published_no = '1' or version.published_nn = '1') "
- + " and version.deleted <> '1' "
- + " and classification.deleted <> '1' "
- + " and classification.copyrighted <> '1' "
+ + " where (version.published_en is true or version.published_no is true or version.published_nn is true) "
+ + " and version.deleted is false "
+ + " and classification.deleted is false "
+ + " and classification.copyrighted is false "
+ " and (:classificationType is null or :classificationType = classification.classification_type) "
+ " and (:section is null or :section "
- + " = (select user.section from user user where user.id = classification.contact_person_id)) "
+ + " = (select usr.section from user usr where usr.id = classification.contact_person_id)) "
+ " group by family.id"
// @formatter:on
).setParameter("section", section).setParameter("classificationType", classificationType == null ? null
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationSeriesRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationSeriesRepository.java
index 3d0649ca..ea7a4c36 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationSeriesRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationSeriesRepository.java
@@ -41,42 +41,42 @@ public interface ClassificationSeriesRepository extends JpaRepository findResponsibleSectionsWithPublishedVersions();
@Query(value = "select count(*) from ClassificationSeries classification join classification.contactPerson user where "
- + "classification.deleted is false" + CHECKPARAMETERS)
+ + "classification.deleted = false" + CHECKPARAMETERS)
int finNumberOfClassifications(@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
@Query(value = "select count(distinct classification.id) from ClassificationVersion version join version.classification classification join "
- + "classification.contactPerson user where classification.deleted is false and version.deleted is false "
- + "and (version.published.published_no is true or "
- + "version.published.published_nn is true or version.published.published_en is true)" + CHECKPARAMETERS)
+ + "classification.contactPerson user where classification.deleted = false and version.deleted = false "
+ + "and (version.published.published_no = true or "
+ + "version.published.published_nn = true or version.published.published_en = true)" + CHECKPARAMETERS)
int findNumberOfPublishedClassifications(@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
@Query(value = "select count(version.id) from ClassificationVersion version join version.classification classification join "
- + "classification.contactPerson user where classification.deleted is false and version.deleted is false "
- + "and (version.published.published_no is true "
- + "or version.published.published_nn is true or version.published.published_en is true)" + CHECKPARAMETERS)
+ + "classification.contactPerson user where classification.deleted = false and version.deleted = false "
+ + "and (version.published.published_no = true "
+ + "or version.published.published_nn = true or version.published.published_en = true)" + CHECKPARAMETERS)
int findNumberOfPublishedVersionsAnyLanguages(@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
@Query(value = "select count(version.id) from ClassificationVersion version join version.classification classification join "
- + "classification.contactPerson user where classification.deleted is false and version.deleted is false "
- + "and version.published.published_no is true "
- + "and version.published.published_nn is true and version.published.published_en is true" + CHECKPARAMETERS)
+ + "classification.contactPerson user where classification.deleted = false and version.deleted = false "
+ + "and version.published.published_no = true "
+ + "and version.published.published_nn = true and version.published.published_en = true" + CHECKPARAMETERS)
int findNumberOfPublishedVersionsAllLanguages(@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
@Query(value = "select new no.ssb.klass.core.service.dto.ClassificationReportDto(classification, user) "
+ "from ClassificationSeries classification join classification.contactPerson user where "
- + "classification.deleted is false" + CHECKPARAMETERS + " order by classification.id")
+ + "classification.deleted = false" + CHECKPARAMETERS + " order by classification.id")
List getClassificationReport(
@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
@Query(value = "select new no.ssb.klass.core.service.dto.ClassificationReportDto(classification, user) "
+ "from ClassificationVersion version join version.classification classification join "
- + "classification.contactPerson user where classification.deleted is false and (version.published.published_no is true or "
- + "version.published.published_nn is true or version.published.published_en is true)" + CHECKPARAMETERS
+ + "classification.contactPerson user where classification.deleted = false and (version.published.published_no = true or "
+ + "version.published.published_nn = true or version.published.published_en = true)" + CHECKPARAMETERS
+ " order by classification.id")
List getPublishedClassificationReport(
@Param("classificationType") ClassificationType classificationType,
@@ -84,9 +84,9 @@ List getPublishedClassificationReport(
@Query(value = "select new no.ssb.klass.core.service.dto.ClassificationVersionReportDto(version, classification, user) "
+ "from ClassificationVersion version join version.classification classification join "
- + "classification.contactPerson user where classification.deleted is false and version.deleted is false "
- + "and (version.published.published_no is true "
- + "or version.published.published_nn is true or version.published.published_en is true)" + CHECKPARAMETERS
+ + "classification.contactPerson user where classification.deleted = false and version.deleted = false "
+ + "and (version.published.published_no = true "
+ + "or version.published.published_nn = true or version.published.published_en = true)" + CHECKPARAMETERS
+ " order by version.id")
List getPublishedVersionsAnyLanguages(
@Param("classificationType") ClassificationType classificationType,
@@ -96,20 +96,20 @@ List getPublishedVersionsAnyLanguages(
+ "from ClassificationVersion version "
+ " join version.classification classification "
+ " join classification.contactPerson user "
- + "where classification.deleted is false and version.deleted is false "
- + " and version.published.published_no is true "
- + " and version.published.published_nn is true and version.published.published_en is true "
+ + "where classification.deleted = false and version.deleted = false "
+ + " and version.published.published_no = true "
+ + " and version.published.published_nn = true and version.published.published_en = true "
+ CHECKPARAMETERS
+ " order by version.id")
List getPublishedVersionsAllLanguages(
@Param("classificationType") ClassificationType classificationType,
@Param("section") String section);
- @Query(value = "select count(id) from ClassificationSeries where deleted is false and :user = contactPerson")
+ @Query(value = "select count(id) from ClassificationSeries where deleted = false and :user = contactPerson")
int getNumberOfClassificationForUser(@Param("user") User user);
@Modifying
- @Query("update ClassificationSeries set contactPerson = :newUser where contactPerson = :oldUser and deleted is false")
+ @Query("update ClassificationSeries set contactPerson = :newUser where contactPerson = :oldUser and deleted = false")
void updateUser(@Param("oldUser") User oldUser, @Param("newUser") User newUser);
ClassificationSeries findByNameNoIgnoreCase(@Param("name") String name);
@@ -130,6 +130,6 @@ List getPublishedVersionsAllLanguages(
void updateClassificationLastModified(@Param("classificationId") Long classificationId,
@Param("timeStamp") Date timeStamp);
- @Query("select distinct statisticalUnits from ClassificationSeries where deleted is false")
+ @Query("select distinct statisticalUnits from ClassificationSeries where deleted = false")
List findAllClassificationStatisticalUnits();
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationVariantRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationVariantRepository.java
index f94ef092..2db4be3d 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationVariantRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/ClassificationVariantRepository.java
@@ -16,7 +16,7 @@ public interface ClassificationVariantRepository extends JpaRepository findByContactPerson(User contactPerson);
@Modifying
- @Query("update ClassificationVariant set contactPerson = :newUser where contactPerson = :oldUser and deleted is false")
+ @Query("update ClassificationVariant set contactPerson = :newUser where contactPerson = :oldUser and deleted = false")
void updateUser(@Param("oldUser") User oldUser, @Param("newUser") User newUser);
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/SearchWordsRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/SearchWordsRepository.java
index bcefef96..92ec1f63 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/SearchWordsRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/SearchWordsRepository.java
@@ -17,12 +17,12 @@ public interface SearchWordsRepository extends JpaRepository
int getNumberOfSearchWords(@Param("fromDate") Date fromDate, @Param("toDate") Date toDate);
@Query(value = "select count(*) from SearchWords sw "
- + "where sw.hit is false and sw.timeStamp between :fromDate and :toDate")
+ + "where sw.hit = false and sw.timeStamp between :fromDate and :toDate")
int getNumberOfMiss(@Param("fromDate") Date fromDate, @Param("toDate") Date toDate);
@Query(value = "select new no.ssb.klass.core.service.dto.AccessCounterDto(sw.searchString, count(sw.searchString)) "
+ "from SearchWords sw "
- + "where sw.hit is :hit and sw.timeStamp between :fromDate and :toDate group by sw.searchString "
+ + "where sw.hit = :hit and sw.timeStamp between :fromDate and :toDate group by sw.searchString "
+ "order by count(sw.searchString) desc, sw.searchString")
Page getSearchWords(@Param("hit") Boolean hit,
@Param("fromDate") Date fromDate, @Param("toDate") Date toDate, Pageable p);
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/StatisticalUnitRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/StatisticalUnitRepository.java
index 58b1bccb..184910b4 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/StatisticalUnitRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/StatisticalUnitRepository.java
@@ -19,12 +19,12 @@
@Repository
public interface StatisticalUnitRepository extends JpaRepository {
@Query(value = "select new no.ssb.klass.core.service.dto.StatisticalUnitDto(su, count(cs)) "
- + "from ClassificationSeries cs join cs.statisticalUnits su where cs.deleted is false group by su.name order by su.name")
+ + "from ClassificationSeries cs join cs.statisticalUnits su where cs.deleted = false group by su.name order by su.name")
Page getStaticalUnitsOverView(Pageable p);
@Query(value = "select new no.ssb.klass.core.service.dto.ClassificationReportDto(cs, user) "
+ "from ClassificationSeries cs join cs.statisticalUnits su join cs.contactPerson user "
- + "where su=:statisticalUnit and cs.deleted is false")
+ + "where su=:statisticalUnit and cs.deleted = false")
List getAllClassificationSeriesForStaticalUnit(
@Param("statisticalUnit") StatisticalUnit statisticalUnit);
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/SubscriberRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/SubscriberRepository.java
index d8410129..e6619c38 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/SubscriberRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/SubscriberRepository.java
@@ -13,7 +13,6 @@
import no.ssb.klass.core.model.ClassificationSeries;
import no.ssb.klass.core.model.Subscriber;
-
@Repository
public interface SubscriberRepository extends JpaRepository {
Optional findOneByEmail(String email);
@@ -36,22 +35,24 @@ public interface SubscriberRepository extends JpaRepository {
@Query(value = "select new no.ssb.klass.core.service.dto.AccessCounterDto(s.email,count(s.email)) "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "group by s.email "
+ "order by count(s.email) desc,s.email")
Page getSubscriberReportAll(Pageable p);
+
@Query(value = "select new no.ssb.klass.core.service.dto.AccessCounterDto(s.email,count(s.email)) "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email LIKE '%ssb.no%' "
+ "group by s.email "
+ "order by count(s.email) desc,s.email")
Page getSubscriberReportInternal(Pageable p);
+
@Query(value = "select new no.ssb.klass.core.service.dto.AccessCounterDto(s.email, count(s.email)) "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email NOT LIKE '%ssb.no%' "
+ "group by s.email "
+ "order by count(s.email) desc,s.email")
@@ -64,10 +65,11 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "group by substring(s.email, LOCATE('@', s.email)+1) "
+ "order by sub_count desc,name")
Page getSubscriberDomainReportAll(Pageable p);
+
@Query(value = "select new no.ssb.klass.core.service.dto.SubscriberCounterDto"
+ "("
+ "substring(s.email, LOCATE('@', s.email)+1) as name,"
@@ -75,11 +77,12 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email LIKE '%ssb.no%' "
+ "group by substring(s.email, LOCATE('@', s.email)+1) "
+ "order by sub_count desc,name")
Page getSubscriberDomainReportInternal(Pageable p);
+
@Query(value = "select new no.ssb.klass.core.service.dto.SubscriberCounterDto"
+ "("
+ "substring(s.email, LOCATE('@', s.email)+1) as name,"
@@ -87,7 +90,7 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email NOT LIKE '%ssb.no%' "
+ "group by substring(s.email, LOCATE('@', s.email)+1) "
+ "order by sub_count desc,name")
@@ -100,7 +103,7 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "group by case c.primaryLanguage when 0 then c.nameNo when 1 then c.nameNn when 2 then c.nameEn end "
+ "order by sub_count desc,name")
Page getSubscriberClassReportAll(Pageable p);
@@ -112,7 +115,7 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email LIKE '%ssb.no%' "
+ "group by case c.primaryLanguage when 0 then c.nameNo when 1 then c.nameNn when 2 then c.nameEn end "
+ "order by sub_count desc,name")
@@ -125,11 +128,10 @@ public interface SubscriberRepository extends JpaRepository {
+ ") "
+ "from Subscriber s join s.subscriptions as su "
+ "join su.classification as c "
- + "where c.deleted is false and su.verification = 'VALID' "
+ + "where c.deleted = false and su.verification = 'VALID' "
+ "and s.email NOT LIKE '%ssb.no%' "
+ "group by case c.primaryLanguage when 0 then c.nameNo when 1 then c.nameNn when 2 then c.nameEn end "
+ "order by sub_count desc,name")
Page getSubscriberClassReportExternal(Pageable p);
-
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/repository/UserRepository.java b/klass-shared/src/main/java/no/ssb/klass/core/repository/UserRepository.java
index 7ba6a255..d1d1bce5 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/repository/UserRepository.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/repository/UserRepository.java
@@ -1,6 +1,7 @@
package no.ssb.klass.core.repository;
import java.math.BigInteger;
+import java.util.Optional;
import java.util.Set;
import org.springframework.data.jpa.repository.JpaRepository;
@@ -12,11 +13,12 @@
@Repository
public interface UserRepository extends JpaRepository {
- User findOneByUsername(String username);
+ Optional findOneByUsername(String username);
- User findOneByFullname(String fullname);
+ Optional findOneByFullname(String fullname);
- // Hibernate does not support UNION and other HQL alternatives might cause performance issues. [Using Native query]
+ // Hibernate does not support UNION and other HQL alternatives might cause
+ // performance issues. [Using Native query]
@Query(value = "SELECT DISTINCT(u.id) FROM user AS u, classification_series AS c"
+ " WHERE c.deleted = false AND c.contact_person_id = u.id"
+ " UNION "
@@ -28,11 +30,11 @@ public interface UserRepository extends JpaRepository {
+ " where"
+ " variant.contact_person_id = u.id"
+ " AND variant.dtype = 'variant'"
- + " And classification.deleted is false"
- + " And variant.deleted is false"
- + " AND version.deleted is false;",
- nativeQuery = true)
- // Native query returns BigInteger a Set definition wont change that, only confuse the reader.
+ + " And classification.deleted = false"
+ + " And variant.deleted = false"
+ + " AND version.deleted = false;", nativeQuery = true)
+ // Native query returns BigInteger a Set definition wont change that, only
+ // confuse the reader.
Set getUserIdsForUsersWithClassifications();
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/service/ClassificationServiceImpl.java b/klass-shared/src/main/java/no/ssb/klass/core/service/ClassificationServiceImpl.java
index 90fea0a0..cfc8df04 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/service/ClassificationServiceImpl.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/service/ClassificationServiceImpl.java
@@ -115,8 +115,9 @@ public List findAllClassificationSeries() {
@Override
public ClassificationSeries getClassificationSeries(Long id) {
- ClassificationSeries classificationSeries = classificationRepository.findOne(id);
- if (classificationSeries == null || classificationSeries.isDeleted()) {
+ ClassificationSeries classificationSeries = classificationRepository.findById(id).orElseThrow(() -> new
+ KlassResourceNotFoundException("Classification not found with id = " + id));
+ if (classificationSeries.isDeleted()) {
throw new KlassResourceNotFoundException("Classification not found with id = " + id);
}
Hibernate.initialize(classificationSeries.getClassificationVersions());
@@ -136,8 +137,9 @@ public ClassificationSeries getClassificationSeriesFullyInitialized(Long id) {
@Override
public ClassificationVariant getClassificationVariant(Long id) {
- ClassificationVariant variant = classificationVariantRepository.findOne(id);
- if (variant == null || variant.isDeleted()) {
+ ClassificationVariant variant = classificationVariantRepository.findById(id).orElseThrow(() -> new
+ KlassResourceNotFoundException("Classification Variant not found with id = " + id));
+ if (variant.isDeleted()) {
throw new KlassResourceNotFoundException("Classification Variant not found with id = " + id);
}
Hibernate.initialize(variant.getLevels());
@@ -147,8 +149,9 @@ public ClassificationVariant getClassificationVariant(Long id) {
@Override
public ClassificationVersion getClassificationVersion(Long id) {
- ClassificationVersion version = classificationVersionRepository.findOne(id);
- if (version == null || version.isDeleted()) {
+ ClassificationVersion version = classificationVersionRepository.findById(id).orElseThrow(() -> new
+ KlassResourceNotFoundException("Classification Version not found with id = " + id));
+ if (version.isDeleted()) {
throw new KlassResourceNotFoundException("Classification Version not found with id = " + id);
}
Hibernate.initialize(version.getLevels());
@@ -160,8 +163,9 @@ public ClassificationVersion getClassificationVersion(Long id) {
@Override
public CorrespondenceTable getCorrespondenceTable(long id) {
- CorrespondenceTable correspondenceTable = correspondenceTableRepository.findOne(id);
- if (correspondenceTable == null || correspondenceTable.isThisOrSourceOrTargetDeleted()) {
+ CorrespondenceTable correspondenceTable = correspondenceTableRepository.findById(id).orElseThrow(() -> new
+ KlassResourceNotFoundException("Correspondence Table not found with id = " + id));
+ if (correspondenceTable.isThisOrSourceOrTargetDeleted()) {
throw new KlassResourceNotFoundException("Correspondence Table not found with id = " + id);
}
Hibernate.initialize(correspondenceTable.getSource().getLevels());
@@ -173,10 +177,8 @@ public CorrespondenceTable getCorrespondenceTable(long id) {
@Override
public ClassificationFamily getClassificationFamily(long id) {
- ClassificationFamily classificationFamily = classificationFamilyRepository.findOne(id);
- if (classificationFamily == null) {
- throw new KlassResourceNotFoundException("ClassificationFamily not found with id = " + id);
- }
+ ClassificationFamily classificationFamily = classificationFamilyRepository.findById(id).orElseThrow(() -> new
+ KlassResourceNotFoundException("ClassificationFamily not found with id = " + id));
Hibernate.initialize(classificationFamily.getClassificationSeries());
return classificationFamily;
}
@@ -415,7 +417,8 @@ public Set findResponsibleSectionsWithPublishedVersions() {
public void deleteNotIndexClassification(User user, ClassificationSeries classification)
throws KlassMessageException {
classification = reloadToAvoidLazyInitialization(classification);
- user = userRepository.findOne(user.getId()); // get attached object
+ user = userRepository.findById(user.getId()).orElseThrow(() ->
+ new RuntimeException("User not found")); // get attached object
checkAllowedToDelete(user, classification);
classification.setDeleted();
saveNotIndexClassification(classification);
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java b/klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java
index 233e3907..79c838ca 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/service/SearchServiceImpl.java
@@ -10,6 +10,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Pageable;
import org.springframework.data.solr.core.SolrTemplate;
import org.springframework.data.solr.core.query.FacetAndHighlightQuery;
@@ -37,6 +38,8 @@
@Service
public class SearchServiceImpl implements SearchService {
private static final Logger log = LoggerFactory.getLogger(SearchServiceImpl.class);
+ @Value("${klass.env.search.solr.core}")
+ protected String solrCore;
private final ClassificationSeriesRepository classificationRepository;
@@ -51,7 +54,7 @@ public SearchServiceImpl(ClassificationSeriesRepository classificationRepository
public FacetAndHighlightPage search(FacetAndHighlightQuery query) {
Date start = TimeUtil.now();
- FacetAndHighlightPage searchResults = solrTemplate.queryForFacetAndHighlightPage(query,
+ FacetAndHighlightPage searchResults = solrTemplate.queryForFacetAndHighlightPage(solrCore, query,
SolrSearchResult.class);
log.info("Search for: '" + query + "' resulted in " + searchResults.getTotalElements() + " hits. Took (ms): "
+ TimeUtil.millisecondsSince(start));
@@ -99,7 +102,7 @@ public FacetAndHighlightPage internalSearch(String query, Page
}
public void clearIndex() {
- solrTemplate.delete(new SimpleQuery("*:*"));
+ solrTemplate.delete(solrCore, new SimpleQuery("*:*"));
}
@Async
@@ -146,7 +149,7 @@ public void indexSync(ClassificationSeries classification) {
}
}
- solrTemplate.commit();
+ solrTemplate.commit(solrCore);
log.info("Indexing: " + classification.getNameInPrimaryLanguage() + ". Took (ms): " + TimeUtil
.millisecondsSince(start));
}
@@ -211,9 +214,9 @@ private void indexVariants(List variants, Language langua
private void updateSolr(SoftDeletable entity, SolrInputDocument doc) {
if (!entity.isDeleted()) {
- solrTemplate.saveDocument(doc);
+ solrTemplate.saveDocument(solrCore, doc);
} else {
- solrTemplate.deleteById((String) doc.getField("uuid").getValue());
+ solrTemplate.deleteByIds(solrCore, (String) doc.getField("uuid").getValue());
}
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/core/service/UserServiceImpl.java b/klass-shared/src/main/java/no/ssb/klass/core/service/UserServiceImpl.java
index cdc631be..86dda318 100644
--- a/klass-shared/src/main/java/no/ssb/klass/core/service/UserServiceImpl.java
+++ b/klass-shared/src/main/java/no/ssb/klass/core/service/UserServiceImpl.java
@@ -2,6 +2,7 @@
import java.math.BigInteger;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
@@ -49,7 +50,7 @@ public List getUsersWithClassifications() {
Set userIds = userRepository.getUserIdsForUsersWithClassifications();
List collect = userIds.stream().map(bigInteger -> bigInteger.longValueExact()).collect(Collectors
.toList());
- return userRepository.findAll(collect);
+ return userRepository.findAllById(collect);
}
@@ -65,14 +66,14 @@ public User getUserByUserName(String userName) {
@Override
public User getUserById(long userId) {
- return initializeFavorites(userRepository.findOne(userId));
+ return initializeFavorites(userRepository.findById(userId));
}
- private User initializeFavorites(User user) {
- if (user == null) {
- return null;
+ private User initializeFavorites(Optional user) {
+ if (user.isPresent()) {
+ Hibernate.initialize(user.get().getFavorites());
+ return user.get();
}
- Hibernate.initialize(user.getFavorites());
- return user;
+ return null;
}
}
diff --git a/klass-shared/src/main/java/no/ssb/klass/initializer/stabas/StabasInitializer.java b/klass-shared/src/main/java/no/ssb/klass/initializer/stabas/StabasInitializer.java
index 04c79a1d..d7865d08 100644
--- a/klass-shared/src/main/java/no/ssb/klass/initializer/stabas/StabasInitializer.java
+++ b/klass-shared/src/main/java/no/ssb/klass/initializer/stabas/StabasInitializer.java
@@ -11,11 +11,12 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import javax.persistence.EntityManager;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+
+import javax.persistence.EntityManager;
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.lang3.StringUtils;
diff --git a/klass-shared/src/main/resources/application-h2-inmemory.properties b/klass-shared/src/main/resources/application-h2-inmemory.properties
new file mode 100644
index 00000000..47b48b42
--- /dev/null
+++ b/klass-shared/src/main/resources/application-h2-inmemory.properties
@@ -0,0 +1,2 @@
+# custom properties used when "h2-inmemory" Profile is used
+spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE;MODE=MySQL;NON_KEYWORDS=user
diff --git a/klass-shared/src/main/resources/application.properties b/klass-shared/src/main/resources/application.properties
index 19aba98f..0ba3f962 100644
--- a/klass-shared/src/main/resources/application.properties
+++ b/klass-shared/src/main/resources/application.properties
@@ -1 +1 @@
-spring.jpa.properties.hibernate.ejb.interceptor=no.ssb.klass.core.util.BaseEntityInterceptor
+spring.jpa.properties.hibernate.session_factory.interceptor=no.ssb.klass.core.util.BaseEntityInterceptor
diff --git a/klass-shared/src/main/resources/db/migration/V10__drop_column_in_correspondencetable.sql b/klass-shared/src/main/resources/db/migration/V10__drop_column_in_correspondencetable.sql
index f5bd67a5..41adcefc 100644
--- a/klass-shared/src/main/resources/db/migration/V10__drop_column_in_correspondencetable.sql
+++ b/klass-shared/src/main/resources/db/migration/V10__drop_column_in_correspondencetable.sql
@@ -1,2 +1,2 @@
-ALTER TABLE correspondence_table DROP FOREIGN KEY fk_4tx0j45sopr6yj8wcedohj9w3;
+ALTER TABLE correspondence_table DROP CONSTRAINT fk_4tx0j45sopr6yj8wcedohj9w3;
ALTER TABLE correspondence_table DROP COLUMN statistical_classification;
diff --git a/klass-shared/src/main/resources/db/migration/V12__increase_column_size.sql b/klass-shared/src/main/resources/db/migration/V12__increase_column_size.sql
index 324c0f05..3f11bb92 100644
--- a/klass-shared/src/main/resources/db/migration/V12__increase_column_size.sql
+++ b/klass-shared/src/main/resources/db/migration/V12__increase_column_size.sql
@@ -1,2 +1,2 @@
-- Migrating classifications from Stabas requires some increased column sizes
-ALTER TABLE classification_item MODIFY official_name VARCHAR(2048);
+ALTER TABLE classification_item ALTER COLUMN official_name VARCHAR(2048);
diff --git a/klass-shared/src/main/resources/db/migration/V16__correspondencetable_uses_level_numbers.sql b/klass-shared/src/main/resources/db/migration/V16__correspondencetable_uses_level_numbers.sql
index 2abed74c..757a55ba 100644
--- a/klass-shared/src/main/resources/db/migration/V16__correspondencetable_uses_level_numbers.sql
+++ b/klass-shared/src/main/resources/db/migration/V16__correspondencetable_uses_level_numbers.sql
@@ -1,6 +1,6 @@
-- CorrespondenceTables stores level number instead of a foreign key to level
-ALTER TABLE correspondence_table DROP FOREIGN KEY fk_cqdqwek3akelq2qqnhuydrkqr;
-ALTER TABLE correspondence_table DROP FOREIGN KEY fk_8bn11tm1gsou84v8kmoug6qyt;
+ALTER TABLE correspondence_table DROP CONSTRAINT fk_cqdqwek3akelq2qqnhuydrkqr;
+ALTER TABLE correspondence_table DROP CONSTRAINT fk_8bn11tm1gsou84v8kmoug6qyt;
UPDATE correspondence_table ct SET ct.source_level_id =
COALESCE((SELECT l.level_number FROM level l WHERE l.id = ct.source_level_id), 0);
@@ -8,8 +8,8 @@ UPDATE correspondence_table ct SET ct.source_level_id =
UPDATE correspondence_table ct SET ct.target_level_id =
COALESCE((SELECT l.level_number FROM level l WHERE l.id = ct.target_level_id), 0);
-ALTER TABLE correspondence_table CHANGE source_level_id source_level_number BIGINT;
-ALTER TABLE correspondence_table CHANGE target_level_id target_level_number BIGINT;
+ALTER TABLE correspondence_table ALTER COLUMN source_level_id RENAME TO source_level_number;
+ALTER TABLE correspondence_table ALTER COLUMN target_level_id RENAME TO target_level_number;
-ALTER TABLE correspondence_table MODIFY source_level_number INTEGER NOT NULL;
-ALTER TABLE correspondence_table MODIFY target_level_number INTEGER NOT NULL;
+ALTER TABLE correspondence_table ALTER COLUMN source_level_number INTEGER NOT NULL;
+ALTER TABLE correspondence_table ALTER COLUMN target_level_number INTEGER NOT NULL;
diff --git a/klass-shared/src/main/resources/db/migration/V17__adding_phonenumber_and_email_to_users.sql b/klass-shared/src/main/resources/db/migration/V17__adding_phonenumber_and_email_to_users.sql
index 20e21dea..04683456 100644
--- a/klass-shared/src/main/resources/db/migration/V17__adding_phonenumber_and_email_to_users.sql
+++ b/klass-shared/src/main/resources/db/migration/V17__adding_phonenumber_and_email_to_users.sql
@@ -1,2 +1,2 @@
-ALTER TABLE user ADD email VARCHAR(255) NULL;
-ALTER TABLE user ADD phone VARCHAR(255) NULL;
\ No newline at end of file
+ALTER TABLE "USER" ADD email VARCHAR(255) NULL;
+ALTER TABLE "USER" ADD phone VARCHAR(255) NULL;
diff --git a/klass-shared/src/main/resources/db/migration/V18__subscription_verify_column.sql b/klass-shared/src/main/resources/db/migration/V18__subscription_verify_column.sql
index e695e4f9..e081fdb1 100644
--- a/klass-shared/src/main/resources/db/migration/V18__subscription_verify_column.sql
+++ b/klass-shared/src/main/resources/db/migration/V18__subscription_verify_column.sql
@@ -1 +1 @@
-ALTER TABLE subscription MODIFY verification VARCHAR(255) NOT NULL;
+ALTER TABLE subscription ALTER COLUMN verification VARCHAR(255) NOT NULL;
diff --git a/klass-shared/src/main/resources/db/migration/V1__init.sql b/klass-shared/src/main/resources/db/migration/V1__init.sql
index 1a19a6ab..d7435579 100644
--- a/klass-shared/src/main/resources/db/migration/V1__init.sql
+++ b/klass-shared/src/main/resources/db/migration/V1__init.sql
@@ -166,7 +166,7 @@ CREATE TABLE subscription
PRIMARY KEY (id)
);
-CREATE TABLE user
+CREATE TABLE "USER"
(
id BIGINT NOT NULL auto_increment,
deleted BIT NOT NULL,
@@ -205,10 +205,10 @@ CREATE INDEX ct_target_idx ON correspondence_table (target_id);
ALTER TABLE subscriber
ADD CONSTRAINT subscriber_email_idx UNIQUE (email);
-ALTER TABLE user
+ALTER TABLE "USER"
ADD CONSTRAINT user_username_idx UNIQUE (username);
-CREATE INDEX user_fullname_idx ON user (fullname);
+CREATE INDEX user_fullname_idx ON "USER" (fullname);
ALTER TABLE user_favorites
ADD CONSTRAINT uk_dk8ngwbk9dgeuegrx1nuktdv1 UNIQUE (favorites_id);
@@ -231,7 +231,7 @@ ALTER TABLE classification_series
ALTER TABLE classification_series
ADD CONSTRAINT fk_jefvdo01kn4kq98m64ajli6y5 FOREIGN KEY (contact_person_id)
- REFERENCES user (id);
+ REFERENCES "USER" (id);
ALTER TABLE classification_series_statistical_units
ADD CONSTRAINT fk_rfx4t7rjg3hykfr39xi8dvrdu FOREIGN KEY (statistical_units_id)
@@ -283,7 +283,7 @@ ALTER TABLE statistical_classification
ALTER TABLE statistical_classification
ADD CONSTRAINT fk_12hsnu91tsf1c8b4697tv1bts FOREIGN KEY (contact_person_id)
- REFERENCES user (id);
+ REFERENCES "USER" (id);
ALTER TABLE statistical_classification
ADD CONSTRAINT fk_ie31cb245vkf1vhswws053s29 FOREIGN KEY (classification_id)
@@ -311,4 +311,4 @@ ALTER TABLE user_favorites
ALTER TABLE user_favorites
ADD CONSTRAINT fk_dx271ymxhckcafibaqijpda8h FOREIGN KEY (user_id) REFERENCES
- user (id);
\ No newline at end of file
+ "USER" (id);
diff --git a/klass-shared/src/main/resources/db/migration/V20__adding_hierachy_timstamp.sql b/klass-shared/src/main/resources/db/migration/V20__adding_hierachy_timstamp.sql
index bb93cac0..03e6860a 100644
--- a/klass-shared/src/main/resources/db/migration/V20__adding_hierachy_timstamp.sql
+++ b/klass-shared/src/main/resources/db/migration/V20__adding_hierachy_timstamp.sql
@@ -1,3 +1,3 @@
ALTER TABLE classification_series ADD hierarchy_last_modified DATETIME NULL;
UPDATE classification_series SET hierarchy_last_modified = last_modified;
-ALTER TABLE classification_series MODIFY hierarchy_last_modified DATETIME NOT NULL;
\ No newline at end of file
+ALTER TABLE classification_series ALTER COLUMN hierarchy_last_modified DATETIME NOT NULL;
\ No newline at end of file
diff --git a/klass-shared/src/main/resources/db/migration/V24__resizing_fields_to_make_room_for_longer_names.sql b/klass-shared/src/main/resources/db/migration/V24__resizing_fields_to_make_room_for_longer_names.sql
index 6959157a..e343f674 100644
--- a/klass-shared/src/main/resources/db/migration/V24__resizing_fields_to_make_room_for_longer_names.sql
+++ b/klass-shared/src/main/resources/db/migration/V24__resizing_fields_to_make_room_for_longer_names.sql
@@ -1,8 +1,8 @@
-- due to row limits of 65535 we need to reduce size for some fields to be able to increase name field
-- reduce
-ALTER TABLE statistical_classification MODIFY valid_from VARCHAR(16);
-ALTER TABLE statistical_classification MODIFY valid_to VARCHAR(16);
-ALTER TABLE statistical_classification MODIFY uuid VARCHAR(64) NOT NULL;
+ALTER TABLE statistical_classification ALTER COLUMN valid_from VARCHAR(16);
+ALTER TABLE statistical_classification ALTER COLUMN valid_to VARCHAR(16);
+ALTER TABLE statistical_classification ALTER COLUMN uuid VARCHAR(64) NOT NULL;
-- increase
-ALTER TABLE statistical_classification MODIFY name VARCHAR(1000);
+ALTER TABLE statistical_classification ALTER COLUMN name VARCHAR(1000);
diff --git a/klass-shared/src/main/resources/db/migration/V25__remove_favorite_constraint.sql b/klass-shared/src/main/resources/db/migration/V25__remove_favorite_constraint.sql
index 8b7a8c65..d4eda067 100644
--- a/klass-shared/src/main/resources/db/migration/V25__remove_favorite_constraint.sql
+++ b/klass-shared/src/main/resources/db/migration/V25__remove_favorite_constraint.sql
@@ -9,7 +9,7 @@ CREATE TABLE user_favorites
PRIMARY KEY (id)
);
ALTER TABLE user_favorites ADD CONSTRAINT fk_favorite_id FOREIGN KEY (favorites_id) REFERENCES classification_series (id);
-ALTER TABLE user_favorites ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES user (id);
+ALTER TABLE user_favorites ADD CONSTRAINT fk_user_id FOREIGN KEY (user_id) REFERENCES "USER" (id);
INSERT INTO user_favorites (user_id, favorites_id) SELECT
user_id,
favorites_id
diff --git a/klass-shared/src/main/resources/db/migration/V27__change_varchar_to_text.sql b/klass-shared/src/main/resources/db/migration/V27__change_varchar_to_text.sql
index 85595158..69250e27 100644
--- a/klass-shared/src/main/resources/db/migration/V27__change_varchar_to_text.sql
+++ b/klass-shared/src/main/resources/db/migration/V27__change_varchar_to_text.sql
@@ -1,4 +1,4 @@
-ALTER TABLE correspondence_table MODIFY description TEXT NOT NULL;
-ALTER TABLE classification_series MODIFY description TEXT NOT NULL;
-ALTER TABLE statistical_classification MODIFY introduction TEXT NOT NULL;
+ALTER TABLE correspondence_table ALTER COLUMN description TEXT NOT NULL;
+ALTER TABLE classification_series ALTER COLUMN description TEXT NOT NULL;
+ALTER TABLE statistical_classification ALTER COLUMN introduction TEXT NOT NULL;
diff --git a/klass-shared/src/main/resources/db/migration/V2__statisticalclassification_level_bidirectional.sql b/klass-shared/src/main/resources/db/migration/V2__statisticalclassification_level_bidirectional.sql
index bda3e418..c47fc261 100644
--- a/klass-shared/src/main/resources/db/migration/V2__statisticalclassification_level_bidirectional.sql
+++ b/klass-shared/src/main/resources/db/migration/V2__statisticalclassification_level_bidirectional.sql
@@ -1,9 +1,11 @@
-- renames a foreign key column
ALTER TABLE level
- DROP FOREIGN KEY fk_sxgu9ljubog3jnujn8fvohvn4;
+ DROP CONSTRAINT fk_sxgu9ljubog3jnujn8fvohvn4;
-ALTER TABLE level CHANGE statistical_classification statistical_classification_id BIGINT not null;
+ALTER TABLE level ALTER COLUMN statistical_classification RENAME TO statistical_classification_id;
+
+ALTER TABLE level ALTER COLUMN statistical_classification_id BIGINT not null;
ALTER TABLE level
ADD CONSTRAINT fk_sxgu9ljubog3jnujn8fvohvn4 FOREIGN KEY (
diff --git a/klass-shared/src/main/resources/db/migration/V3__correspondencetable_correspondencemap_bidirectional.sql b/klass-shared/src/main/resources/db/migration/V3__correspondencetable_correspondencemap_bidirectional.sql
index da53038e..5304e7b0 100644
--- a/klass-shared/src/main/resources/db/migration/V3__correspondencetable_correspondencemap_bidirectional.sql
+++ b/klass-shared/src/main/resources/db/migration/V3__correspondencetable_correspondencemap_bidirectional.sql
@@ -1,9 +1,11 @@
-- renames a foreign key column
ALTER TABLE correspondence_map
- DROP FOREIGN KEY fk_74gwtjl4rjw3gw4x9idj4ux98;
+ DROP CONSTRAINT fk_74gwtjl4rjw3gw4x9idj4ux98;
-ALTER TABLE correspondence_map CHANGE correspondence_table correspondence_table_id BIGINT not null;
+ALTER TABLE correspondence_map ALTER COLUMN correspondence_table RENAME TO correspondence_table_id;
+
+ALTER TABLE correspondence_map ALTER COLUMN correspondence_table_id BIGINT not null;
ALTER TABLE correspondence_map
ADD CONSTRAINT fk_74gwtjl4rjw3gw4x9idj4ux98 FOREIGN KEY (correspondence_table_id)
diff --git a/klass-shared/src/main/resources/db/migration/V4__drop_deleted_columns.sql b/klass-shared/src/main/resources/db/migration/V4__drop_deleted_columns.sql
index ae09b1eb..29e13898 100644
--- a/klass-shared/src/main/resources/db/migration/V4__drop_deleted_columns.sql
+++ b/klass-shared/src/main/resources/db/migration/V4__drop_deleted_columns.sql
@@ -1,5 +1,5 @@
-- Only classes(tables) implementing SoftDeletable shall have deleted column
-
+
ALTER TABLE classification_family DROP COLUMN deleted;
ALTER TABLE classification_item DROP COLUMN deleted;
ALTER TABLE correspondence_map DROP COLUMN deleted;
@@ -7,4 +7,4 @@ ALTER TABLE level DROP COLUMN deleted;
ALTER TABLE statistical_unit DROP COLUMN deleted;
ALTER TABLE subscriber DROP COLUMN deleted;
ALTER TABLE subscription DROP COLUMN deleted;
-ALTER TABLE user DROP COLUMN deleted;
+ALTER TABLE "USER" DROP COLUMN deleted;
diff --git a/klass-shared/src/main/resources/db/migration/V7__remove_constraints_classificationitem.sql b/klass-shared/src/main/resources/db/migration/V7__remove_constraints_classificationitem.sql
index 5ffe6b26..1e2452ff 100644
--- a/klass-shared/src/main/resources/db/migration/V7__remove_constraints_classificationitem.sql
+++ b/klass-shared/src/main/resources/db/migration/V7__remove_constraints_classificationitem.sql
@@ -1,3 +1,3 @@
-- Removed not null constraint since a ReferencingClassificationItem does not have these set
-ALTER TABLE classification_item MODIFY code VARCHAR(255);
-ALTER TABLE classification_item MODIFY official_name VARCHAR(1024);
+ALTER TABLE classification_item ALTER COLUMN code VARCHAR(255) null ;
+ALTER TABLE classification_item ALTER COLUMN official_name VARCHAR(1024) null;
diff --git a/klass-shared/src/main/resources/db/migration/V9__increase_column_sizes.sql b/klass-shared/src/main/resources/db/migration/V9__increase_column_sizes.sql
index 809d1434..c544194f 100644
--- a/klass-shared/src/main/resources/db/migration/V9__increase_column_sizes.sql
+++ b/klass-shared/src/main/resources/db/migration/V9__increase_column_sizes.sql
@@ -1,11 +1,11 @@
-- Migrating classifications from Stabas requires some increased column sizes
-ALTER TABLE classification_item MODIFY notes VARCHAR(6000);
+ALTER TABLE classification_item ALTER COLUMN notes VARCHAR(6000);
-ALTER TABLE statistical_classification MODIFY introduction VARCHAR(7168) not null;
-ALTER TABLE statistical_classification MODIFY legal_base VARCHAR(4000);
-ALTER TABLE statistical_classification MODIFY publications VARCHAR(4000);
-ALTER TABLE statistical_classification MODIFY derived_from VARCHAR(4000);
+ALTER TABLE statistical_classification ALTER COLUMN introduction VARCHAR(7168) not null;
+ALTER TABLE statistical_classification ALTER COLUMN legal_base VARCHAR(4000);
+ALTER TABLE statistical_classification ALTER COLUMN publications VARCHAR(4000);
+ALTER TABLE statistical_classification ALTER COLUMN derived_from VARCHAR(4000);
-ALTER TABLE correspondence_table MODIFY description VARCHAR(4000) not null;
+ALTER TABLE correspondence_table ALTER COLUMN description VARCHAR(4000) not null;
-ALTER TABLE level MODIFY name VARCHAR(1000) not null;
+ALTER TABLE level ALTER COLUMN name VARCHAR(1000) not null;
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/ldap/ActiveDirectoryServiceTest.java b/klass-shared/src/test/java/no/ssb/klass/core/ldap/ActiveDirectoryServiceTest.java
index 5a7c43a9..a9752112 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/ldap/ActiveDirectoryServiceTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/ldap/ActiveDirectoryServiceTest.java
@@ -4,20 +4,20 @@
import static org.hamcrest.core.Is.*;
import static org.hamcrest.core.IsNull.*;
import static org.hamcrest.core.StringContains.*;
-import static org.mockito.Matchers.any;
import static org.mockito.Mockito.*;
import java.util.List;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.Spy;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.ldap.core.DirContextAdapter;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.ldap.search.LdapUserSearch;
@@ -29,7 +29,7 @@
/**
* @author Mads Lundemo, SSB.
*/
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
public class ActiveDirectoryServiceTest {
@Mock
@@ -42,9 +42,9 @@ public class ActiveDirectoryServiceTest {
@InjectMocks
private ActiveDirectoryServiceImpl adService;
- @Before
+ @BeforeEach
public void configureUserServiceMock() {
- when(userService.saveUser(any(User.class))).thenAnswer(invocation -> invocation.getArguments()[0]);
+ lenient().when(userService.saveUser(any(User.class))).thenAnswer(invocation -> invocation.getArguments()[0]);
}
@Test
@@ -159,10 +159,12 @@ public void shouldCreateAndSaveNewUser() {
}
- @Test(expected = UsernameNotFoundException.class)
+ @Test
public void shouldThrowExceptionIfUserDoesNotExistsInAd() {
- when(userSearch.searchForUser("xxx")).thenThrow(new UsernameNotFoundException(""));
- adService.createAndSaveNewUser("xxx");
+ Assertions.assertThrows(UsernameNotFoundException.class, () -> {
+ when(userSearch.searchForUser("xxx")).thenThrow(new UsernameNotFoundException(""));
+ adService.createAndSaveNewUser("xxx");
+ });
}
@Test
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationFamilyTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationFamilyTest.java
index a38282cf..b285d22b 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationFamilyTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationFamilyTest.java
@@ -1,10 +1,10 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
import no.ssb.klass.testutil.TestUtil;
@@ -12,7 +12,7 @@
public class ClassificationFamilyTest {
private ClassificationFamily subject;
- @Before
+ @BeforeEach
public void setup() {
subject = TestUtil.createClassificationFamily("name");
ClassificationSeries classification = TestUtil.createClassification("classification");
@@ -20,13 +20,13 @@ public void setup() {
}
@Test
- @Ignore("Icons moved to forvaltning module")
+ @Disabled("Icons moved to forvaltning module")
public void getIconPath() {
// when
String result = subject.getIconPath();
// then
- assertTrue("icon path does not exist on classpath", new ClassPathResource(result).exists());
+ assertTrue(new ClassPathResource(result).exists(), "icon path does not exist on classpath");
}
@Test
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationSeriesTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationSeriesTest.java
index 4076e2c1..6a59b522 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationSeriesTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationSeriesTest.java
@@ -1,13 +1,14 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import com.google.common.base.Strings;
@@ -67,7 +68,7 @@ public void getChangeTables() {
}
- @Test(expected = KlassResourceNotFoundException.class)
+ @Test
public void getChangeTableNotFound() {
// given
LocalDate start = TimeUtil.createDate("2014-01-01");
@@ -79,10 +80,10 @@ public void getChangeTableNotFound() {
subject.addClassificationVersion(firstVersion);
subject.addClassificationVersion(secondVersion);
- // when
- subject.getChangeTables(DateRange.create(start, start.plusYears(4)), null);
+ Assertions.assertThrows(KlassResourceNotFoundException.class, () ->
+ subject.getChangeTables(DateRange.create(start, start.plusYears(4)), null)
+ );
- // then expect exception
}
@Test
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVariantTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVariantTest.java
index 6f74e47f..0e518c11 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVariantTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVariantTest.java
@@ -1,8 +1,8 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import no.ssb.klass.core.util.Translatable;
import no.ssb.klass.testutil.TestUtil;
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVersionTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVersionTest.java
index 67108044..51646532 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVersionTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/ClassificationVersionTest.java
@@ -1,13 +1,15 @@
package no.ssb.klass.core.model;
import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import no.ssb.klass.core.util.DateRange;
import no.ssb.klass.core.util.Translatable;
@@ -40,13 +42,14 @@ public void findItem() {
assertEquals(item.getCode(), result.getCode());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void findItemNotFound() {
// given
ClassificationVersion subject = createVersionWithLevels();
// when
- subject.findItem("unknown");
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.findItem("unknown"));
// then expect exception
}
@@ -165,14 +168,15 @@ public void findLevel() {
assertEquals(false, version.hasLevel(3));
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void addLevel() {
// given
ClassificationVersion version = createVersion();
version.addNextLevel();
// when
- version.addLevel(TestUtil.createLevel(1));
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ version.addLevel(TestUtil.createLevel(1)));
// then expect exception
}
@@ -220,7 +224,7 @@ public void addClassificationItem() {
assertEquals(level.getLevelNumber(), classificationItem.getLevel().getLevelNumber());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void addClassificationItemWithParentForFirstLevel() {
// given
ClassificationVersion version = createVersion();
@@ -230,12 +234,13 @@ public void addClassificationItemWithParentForFirstLevel() {
ClassificationItem parent = TestUtil.createClassificationItem("parent", "officialName");
// when
- version.addClassificationItem(classificationItem, level.getLevelNumber(), parent);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ version.addClassificationItem(classificationItem, level.getLevelNumber(), parent));
// then expect exception
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void addClassificationItemWithNoParentForNotFirstLevel() {
// given
ClassificationVersion version = createVersion();
@@ -244,7 +249,8 @@ public void addClassificationItemWithNoParentForNotFirstLevel() {
ClassificationItem classificationItem = TestUtil.createClassificationItem("code", "officialName");
// when
- version.addClassificationItem(classificationItem, 2, null);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ version.addClassificationItem(classificationItem, 2, null));
// then expect exception
}
@@ -296,7 +302,7 @@ public void getNameInPrimaryLanguage() {
assertEquals("Test 2016-11", classificationVersion5.getNameInPrimaryLanguage());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void removeLevelWhenNotEmpty() {
// given
ClassificationVersion version = createVersion();
@@ -306,7 +312,8 @@ public void removeLevelWhenNotEmpty() {
version.addClassificationItem(classificationItem, level.getLevelNumber(), null);
// when
- version.deleteLevel(level);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ version.deleteLevel(level));
// then expect exception
}
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/CorrespondenceTableTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/CorrespondenceTableTest.java
index 089f4319..5f0e4d72 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/CorrespondenceTableTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/CorrespondenceTableTest.java
@@ -1,11 +1,12 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.time.LocalDate;
-import org.junit.Ignore;
-import org.junit.Test;
+import no.ssb.klass.core.util.ClientException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import no.ssb.klass.core.util.DateRange;
import no.ssb.klass.core.util.TimeUtil;
@@ -36,18 +37,20 @@ public void correspondenceTableWithSpecificLevels() {
assertEquals(true, subject.getTargetLevel().isPresent());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void correspondenceTableWithNotExistingSourceLevel() {
// given
- createCorrespondenceTable(NOT_EXISTING_LEVEL, EXISTING_LEVEL);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ createCorrespondenceTable(NOT_EXISTING_LEVEL, EXISTING_LEVEL));
// then expect exception
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void correspondenceTableWithNotExistingTargetLevel() {
// given
- createCorrespondenceTable(EXISTING_LEVEL, NOT_EXISTING_LEVEL);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ createCorrespondenceTable(EXISTING_LEVEL, NOT_EXISTING_LEVEL));
// then expect exception
}
@@ -165,17 +168,12 @@ public void getDateRangeContained() {
* expected exception
*
*/
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void getDateRangeNotOverlaping() {
- // given
final DateRange sourceDateRange = DateRange.create("2010-01-01", "2012-01-01");
final DateRange targetDateRange = DateRange.create("2012-01-01", "2014-01-01");
- CorrespondenceTable subject = createCorrespondenceTable(sourceDateRange, targetDateRange);
-
- // when
- subject.getDateRange();
-
- // then expect exception
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ createCorrespondenceTable(sourceDateRange, targetDateRange));
}
@Test
@@ -191,7 +189,7 @@ public void addChangelog() {
assertEquals(1, subject.getChangelogs().size());
}
- @Test(expected = IllegalStateException.class)
+ @Test
public void addChangelogWhenNotPublished() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
@@ -200,19 +198,21 @@ public void addChangelogWhenNotPublished() {
}
// when
- subject.addChangelog(new Changelog("user", "description"));
+ Assertions.assertThrows(IllegalStateException.class, () ->
+ subject.addChangelog(new Changelog("user", "description")));
// then expect exception
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void addCorrespondenceMapVerifiesNotAlreadyPresent() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
subject.addCorrespondenceMap(createCorrespondenceMap("source", "target"));
// when
- subject.addCorrespondenceMap(createCorrespondenceMap("source", "target"));
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.addCorrespondenceMap(createCorrespondenceMap("source", "target")));
// then expect exception
}
@@ -232,7 +232,7 @@ public void updateCorrespondenceMapSource() {
assertEquals("newSource", correspondenceMap.getSource().get().getCode());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void updateCorrespondenceMapSourceVerifiesNotAlreadyPresent() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
@@ -242,12 +242,13 @@ public void updateCorrespondenceMapSourceVerifiesNotAlreadyPresent() {
ClassificationItem sourceItem = TestUtil.createClassificationItem("source", "source");
// when
- subject.updateCorrespondenceMapSource(correspondenceMap, sourceItem);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.updateCorrespondenceMapSource(correspondenceMap, sourceItem));
// then expect exception
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void updateCorrespondenceMapSourceDoesNotAllowBothSourceAndTargetToBeNull() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
@@ -256,7 +257,8 @@ public void updateCorrespondenceMapSourceDoesNotAllowBothSourceAndTargetToBeNull
subject.addCorrespondenceMap(correspondenceMap);
// when
- subject.updateCorrespondenceMapSource(correspondenceMap, null);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.updateCorrespondenceMapSource(correspondenceMap, null));
// then expect exception
}
@@ -276,7 +278,7 @@ public void updateCorrespondenceMapTarget() {
assertEquals("newTarget", correspondenceMap.getTarget().get().getCode());
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void updateCorrespondenceMapTargetVerifiesNotAlreadyPresent() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
@@ -286,12 +288,13 @@ public void updateCorrespondenceMapTargetVerifiesNotAlreadyPresent() {
ClassificationItem targetItem = TestUtil.createClassificationItem("target", "target");
// when
- subject.updateCorrespondenceMapTarget(correspondenceMap, targetItem);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.updateCorrespondenceMapTarget(correspondenceMap, targetItem));
// then expect exception
}
- @Test(expected = IllegalArgumentException.class)
+ @Test
public void updateCorrespondenceMapTargetDoesNotAllowBothSourceAndTargetToBeNull() {
// given
CorrespondenceTable subject = createCorrespondenceTable();
@@ -300,7 +303,8 @@ public void updateCorrespondenceMapTargetDoesNotAllowBothSourceAndTargetToBeNull
subject.addCorrespondenceMap(correspondenceMap);
// when
- subject.updateCorrespondenceMapTarget(correspondenceMap, null);
+ Assertions.assertThrows(IllegalArgumentException.class, () ->
+ subject.updateCorrespondenceMapTarget(correspondenceMap, null));
// then expect exception
}
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/LanguageTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/LanguageTest.java
index 97761602..37fb7ba7 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/LanguageTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/LanguageTest.java
@@ -1,10 +1,10 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.List;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.Lists;
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriberTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriberTest.java
index 4442d9e3..12a59ea6 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriberTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriberTest.java
@@ -1,11 +1,12 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.net.URL;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import no.ssb.klass.core.util.ClientException;
import no.ssb.klass.testutil.TestUtil;
@@ -20,7 +21,7 @@ public class SubscriberTest {
private ClassificationSeries classification;
- @Before
+ @BeforeEach
public void init() throws Exception {
subject = new Subscriber(EMAIL);
classification = TestUtil.createClassificationWithId(1, NAME);
@@ -37,26 +38,29 @@ public void addSubscription() throws Exception {
assertEquals(Verification.VALID, verification);
}
- @Test(expected = ClientException.class)
- public void addSubscriptionExist() throws Exception {
+ @Test
+ public void addSubscriptionExist() {
// when
ClassificationSeries classification = TestUtil.createClassificationWithId(1, NAME);
- subject.addSubscription(classification, new URL("http://test.url"));
+ Assertions.assertThrows(ClientException.class, () ->
+ subject.addSubscription(classification, new URL("http://test.url")));
// then exception
}
- @Test(expected = NullPointerException.class)
- public void addSubscriptionNull() throws Exception {
+ @Test
+ public void addSubscriptionNull() {
// when
- subject.addSubscription(null, new URL("http://test.url"));
+ Assertions.assertThrows(NullPointerException.class, () ->
+ subject.addSubscription(null, new URL("http://test.url")));
// then exception
}
- @Test(expected = NullPointerException.class)
- public void addEndSubscriptionNull() throws Exception {
+ @Test
+ public void addEndSubscriptionNull() {
// when
- subject.addSubscription(classification, null);
+ Assertions.assertThrows(NullPointerException.class, () ->
+ subject.addSubscription(classification, null));
// then exception
}
@@ -76,24 +80,27 @@ public void getEndSubscriptionUrl() {
assertEquals(END_SUBSCRIPTION_URL, result);
}
- @Test(expected = ClientException.class)
+ @Test
public void removeSubscriptionNotFound() {
// when
- subject.removeSubscription(TestUtil.createClassification(NAME));
+ Assertions.assertThrows(ClientException.class, () ->
+ subject.removeSubscription(TestUtil.createClassification(NAME)));
// then exception
}
- @Test(expected = NullPointerException.class)
+ @Test
public void verifyNull() {
// when
- subject.verify(null);
+ Assertions.assertThrows(NullPointerException.class, () ->
+ subject.verify(null));
// then exception
}
- @Test(expected = ClientException.class)
+ @Test
public void verifyNotFound() {
// when
- subject.verify(TOKEN);
+ Assertions.assertThrows(ClientException.class, () ->
+ subject.verify(TOKEN));
// then exception
}
}
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriptionTest.java b/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriptionTest.java
index 4b738e32..297d1775 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriptionTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/model/SubscriptionTest.java
@@ -1,13 +1,14 @@
package no.ssb.klass.core.model;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.net.URL;
import java.util.Date;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import no.ssb.klass.core.util.ClientException;
import no.ssb.klass.core.util.TimeUtil;
@@ -22,14 +23,14 @@ public class SubscriptionTest {
private Subscription subject;
private UpdateableClockSource clockSource;
- @Before
+ @BeforeEach
public void init() throws Exception {
clockSource = new UpdateableClockSource(new Date().getTime());
TimeUtil.setClockSource(clockSource);
subject = new Subscription(TestUtil.createClassification("name"), new URL("http://test.url"));
}
- @After
+ @AfterEach
public void teardown() {
TimeUtil.revertClockSource();
}
@@ -57,12 +58,12 @@ public void verifyValid() {
assertEquals(Verification.VALID, subject.getVerification());
}
- @Test(expected = ClientException.class)
+ @Test
public void verifyExpired() {
// when
clockSource.updateTimeMillis(TimeUtil.now().getTime() + EXPIRY_TIME_IN_MINS * ONE_MINUTE_IN_MILLISECS + 1);
- subject.verify();
// then exception
+ Assertions.assertThrows(Exception.class, () -> subject.verify());
}
}
diff --git a/klass-shared/src/test/java/no/ssb/klass/core/repository/ClassificationAccessRepositoryTest.java b/klass-shared/src/test/java/no/ssb/klass/core/repository/ClassificationAccessRepositoryTest.java
index b1d6c469..1084064a 100644
--- a/klass-shared/src/test/java/no/ssb/klass/core/repository/ClassificationAccessRepositoryTest.java
+++ b/klass-shared/src/test/java/no/ssb/klass/core/repository/ClassificationAccessRepositoryTest.java
@@ -1,6 +1,6 @@
package no.ssb.klass.core.repository;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
import java.util.Date;
import java.util.List;
@@ -8,9 +8,9 @@
import javax.persistence.EntityManager;
import javax.transaction.Transactional;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
@@ -20,7 +20,7 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
import no.ssb.klass.core.config.ConfigurationProfiles;
import no.ssb.klass.core.model.ClassificationAccessCounter;
@@ -32,7 +32,7 @@
import no.ssb.klass.testutil.IncrementableClockSource;
import no.ssb.klass.testutil.TestUtil;
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
@SpringBootTest
@ActiveProfiles(ConfigurationProfiles.H2_INMEMORY)
@Transactional
@@ -56,7 +56,7 @@ public class ClassificationAccessRepositoryTest {
@Autowired
private EntityManager entityManager;
- @Before
+ @BeforeEach
public void setup() {
clockSource = new IncrementableClockSource(new Date().getTime());
TimeUtil.setClockSource(clockSource);
@@ -77,7 +77,7 @@ public void getClassificationsCountTest() {
createClassificationSeries("Test1");
createClassificationSeries("Test2");
Page