Skip to content

Commit

Permalink
Manglende s i inntektsperiode - var i JsonProperty (#925)
Browse files Browse the repository at this point in the history
  • Loading branch information
jolarsen authored Aug 19, 2021
1 parent 2aa86a5 commit fda5a32
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion felles/util/src/main/java/no/nav/vedtak/util/LRUCache.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
import java.util.Map;

/**
*
*
* Bruk heller Caffeine
* Hvorfor ? Vi driver ikke avansert caching og en plain sak gjør jobben
*
*/
@Deprecated(since = "4.0.x", forRemoval = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
import com.fasterxml.jackson.annotation.JsonAlias;



public record Arbeidsforhold(
@JsonAlias("arbeidsgiverOrgnr") Orgnummer orgnr,
@JsonAlias("inntektForPerioden") Integer inntekt,
Inntektsperiode inntektperiode,
Inntektsperiode inntektsperiode,
Boolean refusjon) {


Expand All @@ -23,7 +22,7 @@ public Integer getInntekt() {

@Deprecated(since = "4.0.x", forRemoval = true)
public Inntektsperiode getInntektperiode() {
return inntektperiode();
return inntektsperiode();
}

@Deprecated(since = "4.0.x", forRemoval = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import java.time.LocalDate;
import java.util.List;

public interface Medlemsskap {
public interface Medlemskap {

List<Medlemskapsunntak> finnMedlemsunntak(String aktørId, LocalDate fom, LocalDate tom) throws Exception;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

@Dependent
@Jersey
public class MedlemsunntakJerseyRestKlient extends AbstractJerseyOidcRestClient implements Medlemsskap {
public class MedlemsunntakJerseyRestKlient extends AbstractJerseyOidcRestClient implements Medlemskap {

private static final String ENDPOINT_KEY = "medl2.rs.url";
private static final String DEFAULT_URI = "https://app.adeo.no/medl2/api/v1/medlemskapsunntak";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

@Deprecated(since = "4.0.x", forRemoval = true)
@ApplicationScoped
public class MedlemsunntakRestKlient implements Medlemsskap {
public class MedlemsunntakRestKlient implements Medlemskap {

private static final String ENDPOINT_KEY = "medl2.rs.url";
private static final String DEFAULT_URI = "https://app.adeo.no/medl2/api/v1/medlemskapsunntak";
Expand Down

0 comments on commit fda5a32

Please sign in to comment.