Skip to content

Commit 6acdbec

Browse files
NP-3239 Remove 'Runtime' part from exception names.
1 parent 1099e41 commit 6acdbec

10 files changed

+37
-40
lines changed

cristin-import/src/main/java/no/unit/nva/cristin/mapper/AbstractPublicationInstanceBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.unit.nva.cristin.mapper;
22

3-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryRuntimeException;
3+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryException;
44
import no.unit.nva.model.instancetypes.PublicationInstance;
55
import no.unit.nva.model.pages.Pages;
66
import nva.commons.core.JacocoGenerated;
@@ -22,8 +22,8 @@ public AbstractPublicationInstanceBuilder(CristinObject cristinObject) {
2222
public abstract PublicationInstance<? extends Pages> build();
2323

2424
@JacocoGenerated
25-
public UnsupportedSecondaryCategoryRuntimeException unknownSecondaryCategory() {
26-
return new UnsupportedSecondaryCategoryRuntimeException(ERROR_PARSING_SECONDARY_CATEGORY);
25+
public UnsupportedSecondaryCategoryException unknownSecondaryCategory() {
26+
return new UnsupportedSecondaryCategoryException(ERROR_PARSING_SECONDARY_CATEGORY);
2727
}
2828

2929
@JacocoGenerated

cristin-import/src/main/java/no/unit/nva/cristin/mapper/CristinContributorRoleCode.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonValue;
5-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedRoleRuntimeException;
5+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedRoleException;
66

77
import java.util.Arrays;
88

@@ -25,7 +25,7 @@ public static CristinContributorRoleCode fromString(String roleCode) {
2525
return Arrays.stream(CristinContributorRoleCode.values())
2626
.filter(role -> role.getStringValue().equalsIgnoreCase(roleCode))
2727
.findAny()
28-
.orElseThrow(() -> new UnsupportedRoleRuntimeException(UNKNOWN_ROLE_ERROR + roleCode));
28+
.orElseThrow(() -> new UnsupportedRoleException(UNKNOWN_ROLE_ERROR + roleCode));
2929
}
3030

3131
@JsonValue

cristin-import/src/main/java/no/unit/nva/cristin/mapper/PublicationInstanceBuilderImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import static no.unit.nva.cristin.mapper.CristinMainCategory.isReport;
88
import java.util.Objects;
99

10-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedMainCategoryRuntimeException;
11-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryRuntimeException;
10+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedMainCategoryException;
11+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryException;
1212
import no.unit.nva.model.instancetypes.PublicationInstance;
1313
import no.unit.nva.model.pages.Pages;
1414

@@ -39,9 +39,9 @@ public PublicationInstance<? extends Pages> build() {
3939
} else if (isEvent(cristinObject)) {
4040
return new EventBuilder(cristinObject).build();
4141
} else if (cristinObject.getMainCategory().isUnknownCategory()) {
42-
throw new UnsupportedMainCategoryRuntimeException(ERROR_PARSING_MAIN_CATEGORY);
42+
throw new UnsupportedMainCategoryException(ERROR_PARSING_MAIN_CATEGORY);
4343
} else if (cristinObject.getSecondaryCategory().isUnknownCategory()) {
44-
throw new UnsupportedSecondaryCategoryRuntimeException(ERROR_PARSING_SECONDARY_CATEGORY);
44+
throw new UnsupportedSecondaryCategoryException(ERROR_PARSING_SECONDARY_CATEGORY);
4545
}
4646
throw new RuntimeException(ERROR_PARSING_MAIN_OR_SECONDARY_CATEGORIES);
4747
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package no.unit.nva.cristin.mapper.nva.exceptions;
2+
3+
public class UnsupportedMainCategoryException extends RuntimeException {
4+
5+
public UnsupportedMainCategoryException(String message) {
6+
super(message);
7+
}
8+
}

cristin-import/src/main/java/no/unit/nva/cristin/mapper/nva/exceptions/UnsupportedMainCategoryRuntimeException.java

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package no.unit.nva.cristin.mapper.nva.exceptions;
2+
3+
public class UnsupportedRoleException extends RuntimeException {
4+
5+
public UnsupportedRoleException(String message) {
6+
super(message);
7+
}
8+
}

cristin-import/src/main/java/no/unit/nva/cristin/mapper/nva/exceptions/UnsupportedRoleRuntimeException.java

Lines changed: 0 additions & 8 deletions
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package no.unit.nva.cristin.mapper.nva.exceptions;
2+
3+
public class UnsupportedSecondaryCategoryException extends RuntimeException {
4+
5+
public UnsupportedSecondaryCategoryException(String message) {
6+
super(message);
7+
}
8+
}

cristin-import/src/main/java/no/unit/nva/cristin/mapper/nva/exceptions/UnsupportedSecondaryCategoryRuntimeException.java

Lines changed: 0 additions & 8 deletions
This file was deleted.

cristin-import/src/test/java/no/unit/nva/cristin/lambda/CristinEntryEventConsumerTest.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,11 @@
4747
import no.unit.nva.cristin.mapper.PublicationInstanceBuilderImpl;
4848
import no.unit.nva.cristin.mapper.nva.exceptions.InvalidIsbnRuntimeException;
4949
import no.unit.nva.cristin.mapper.nva.exceptions.InvalidIssnRuntimeException;
50-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedMainCategoryRuntimeException;
51-
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryRuntimeException;
50+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedMainCategoryException;
51+
import no.unit.nva.cristin.mapper.nva.exceptions.UnsupportedSecondaryCategoryException;
5252
import no.unit.nva.events.models.AwsEventBridgeEvent;
5353
import no.unit.nva.model.Publication;
5454
import no.unit.nva.model.PublicationStatus;
55-
import no.unit.nva.model.exceptions.InvalidIsbnException;
56-
import no.unit.nva.model.exceptions.InvalidIssnException;
57-
import no.unit.nva.model.exceptions.InvalidUnconfirmedSeriesException;
5855
import no.unit.nva.publication.s3imports.FileContentsEvent;
5956
import no.unit.nva.publication.s3imports.ImportResult;
6057
import no.unit.nva.publication.s3imports.UriWrapper;
@@ -213,7 +210,7 @@ public void handlerThrowsExceptionWhenMainCategoryTypeIsNotKnown() throws JsonPr
213210
RuntimeException exception = assertThrows(RuntimeException.class, action);
214211

215212
Throwable cause = exception.getCause();
216-
assertThat(cause, is(instanceOf(UnsupportedMainCategoryRuntimeException.class)));
213+
assertThat(cause, is(instanceOf(UnsupportedMainCategoryException.class)));
217214
assertThat(cause.getMessage(), is(equalTo(PublicationInstanceBuilderImpl.ERROR_PARSING_MAIN_CATEGORY)));
218215
}
219216

@@ -270,7 +267,7 @@ public void handlerThrowsExceptionWhenSecondaryCategoryTypeIsNotKnown() throws J
270267
RuntimeException exception = assertThrows(RuntimeException.class, action);
271268

272269
Throwable cause = exception.getCause();
273-
assertThat(cause, is(instanceOf(UnsupportedSecondaryCategoryRuntimeException.class)));
270+
assertThat(cause, is(instanceOf(UnsupportedSecondaryCategoryException.class)));
274271
assertThat(cause.getMessage(), containsString(PublicationInstanceBuilderImpl.ERROR_PARSING_SECONDARY_CATEGORY));
275272

276273
}

0 commit comments

Comments
 (0)