Skip to content

Commit

Permalink
refactor: switch from javax.inject.Inject to jakarta.inject.Inject
Browse files Browse the repository at this point in the history
  • Loading branch information
sitepark-veltrup committed Feb 7, 2024
1 parent 1a5f0bf commit d1673bc
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 19 deletions.
7 changes: 3 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,10 @@
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
<version>2.0.1</version>
</dependency>

<!--
hard decision, see:
https://stackoverflow.com/questions/4963300/which-notnull-java-annotation-should-i-use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ protected Builder(Media media) {
}

public Builder id(String id) {
if (id == null) {
throw new NullPointerException("id is null");
}
Objects.requireNonNull(id, "id is null");
this.id = id;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,13 @@ protected Builder(MediaReference media) {
}

public Builder mediaId(String mediaId) {
if (mediaId == null) {
throw new NullPointerException("mediaId is null");
}
Objects.requireNonNull(mediaId, "mediaId is null");
this.mediaId = mediaId;
return this;
}

public Builder usedBy(String usedBy) {
if (usedBy == null) {
throw new NullPointerException("usedBy is null");
}
Objects.requireNonNull(usedBy, "usedBy is null");
this.usedBy = usedBy;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package com.sitepark.ies.mediarepository.core.usecase;

import javax.inject.Inject;

import com.sitepark.ies.mediarepository.core.domain.entity.MediaReference;
import com.sitepark.ies.mediarepository.core.port.MediaRepository;

import jakarta.inject.Inject;

/**
* Adds a reference to the medium.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
import java.util.List;
import java.util.stream.Collectors;

import javax.inject.Inject;

import com.sitepark.ies.mediarepository.core.domain.entity.MediaReference;
import com.sitepark.ies.mediarepository.core.domain.entity.MediaReferenceType;
import com.sitepark.ies.mediarepository.core.port.MediaRepository;

import jakarta.inject.Inject;

/**
* Removes a medium via its reference. If this is the only or last reference
* of the medium, the medium is deleted. Otherwise, only the reference is
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.sitepark.ies.mediarepository.core.usecase;

import javax.inject.Inject;

import com.sitepark.ies.mediarepository.core.domain.exception.AccessDeniedException;
import com.sitepark.ies.mediarepository.core.port.AccessControl;
import com.sitepark.ies.mediarepository.core.port.MediaRepository;

import jakarta.inject.Inject;

/**
* Removes a medium
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports com.sitepark.ies.mediarepository.core.domain.exception;
exports com.sitepark.ies.mediarepository.core.port;
exports com.sitepark.ies.mediarepository.core.usecase;
requires javax.inject;
requires jakarta.inject;
requires org.eclipse.jdt.annotation;
requires com.github.spotbugs.annotations;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import nl.jqno.equalsverifier.EqualsVerifier;

@SuppressWarnings("PMD.AvoidDuplicateLiterals")
@SuppressFBWarnings("NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS")
class MediaReferenceTest {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import com.sitepark.ies.mediarepository.core.domain.entity.MediaReferenceType;
import com.sitepark.ies.mediarepository.core.port.MediaRepository;

@SuppressWarnings("PMD.AvoidDuplicateLiterals")
class RemoveByReferenceTest {

@Test
Expand Down

0 comments on commit d1673bc

Please sign in to comment.