From 021adcb8479788f9f7cc2d3fe13a1f1ab4c7a0e7 Mon Sep 17 00:00:00 2001 From: Inga Date: Fri, 6 Dec 2024 14:36:48 +0100 Subject: [PATCH 1/5] =?UTF-8?q?POFIM-102:=20Unng=C3=A5=20NPE=20(#1548)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/no/nav/dokarkiv/JournalpostMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java b/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java index 8180556f9..920e140d2 100644 --- a/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java +++ b/mocks/journalpost-mock/src/main/java/no/nav/dokarkiv/JournalpostMapper.java @@ -56,7 +56,7 @@ public JournalpostModell tilModell(OpprettJournalpostRequest journalpostRequest) } private boolean erKnyttetTilSak(Sak sak) { - return sak != null & sak.getFagsakId() != null; + return sak != null && sak.getFagsakId() != null; } private List tilDokumentModeller(List dokumenter) { From 48b179b05133d1542c35216c354a1ca04675f986 Mon Sep 17 00:00:00 2001 From: Jens-Otto Larsen <46576810+jolarsen@users.noreply.github.com> Date: Sun, 8 Dec 2024 21:47:44 +0100 Subject: [PATCH 2/5] Bugfix: Slett ubrukt record som lager Win-konflikt (#1549) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows takler ikke både NAVAnsatt og NavAnsatt i samme package --- .../foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java diff --git a/model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java b/model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java deleted file mode 100644 index 4ef1bc67e..000000000 --- a/model/src/main/java/no/nav/foreldrepenger/vtp/testmodell/ansatt/NAVAnsatt.java +++ /dev/null @@ -1,9 +0,0 @@ -package no.nav.foreldrepenger.vtp.testmodell.ansatt; - -import java.util.List; -import java.util.UUID; - -public record NAVAnsatt(String ident, UUID oid, String displayName, String givenName, String surname, String email, - String streetAddress, List groups, List enheter, List vtpgrupper) { - public record NAVGroup(UUID oid, String name) {} -} From 9147b1d38004ffccf10f3d7797e191ced939c21f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 19:35:06 +0100 Subject: [PATCH 3/5] Bump no.nav.foreldrepenger.kontrakter:fp-ws-proxy-v1 from 9.1.22 to 9.2.1 in the interne-deps group across 1 directory (#1551) Bump no.nav.foreldrepenger.kontrakter:fp-ws-proxy-v1 Bumps the interne-deps group with 1 update in the / directory: [no.nav.foreldrepenger.kontrakter:fp-ws-proxy-v1](https://github.com/navikt/fp-kontrakter). Updates `no.nav.foreldrepenger.kontrakter:fp-ws-proxy-v1` from 9.1.22 to 9.2.1 - [Release notes](https://github.com/navikt/fp-kontrakter/releases) - [Commits](https://github.com/navikt/fp-kontrakter/compare/9.1.22...9.2.1) --- updated-dependencies: - dependency-name: no.nav.foreldrepenger.kontrakter:fp-ws-proxy-v1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: interne-deps ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11d1cb99d..893d95f0b 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ navikt_vtp - 9.1.22 + 9.2.1 3.0.64 From 4e018e9a4d93aa0af96549946267b1982602a9d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 15 Dec 2024 20:02:39 +0100 Subject: [PATCH 4/5] Bump the prod-deps group across 1 directory with 8 updates (#1552) Bumps the prod-deps group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [com.fasterxml.jackson:jackson-bom](https://github.com/FasterXML/jackson-bom) | `2.18.1` | `2.18.2` | | [org.eclipse.jetty.ee10:jetty-ee10-bom](https://github.com/jetty/jetty.project) | `12.0.15` | `12.0.16` | | io.swagger.core.v3:swagger-jaxrs2-jakarta | `2.2.26` | `2.2.27` | | io.swagger.core.v3:swagger-annotations-jakarta | `2.2.26` | `2.2.27` | | io.swagger.core.v3:swagger-core-jakarta | `2.2.26` | `2.2.27` | | [io.confluent:kafka-avro-serializer](https://github.com/confluentinc/schema-registry) | `7.7.1` | `7.8.0` | | [com.unboundid:unboundid-ldapsdk](https://github.com/pingidentity/ldapsdk) | `7.0.1` | `7.0.2` | | [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) | `1.15.10` | `1.15.11` | Updates `com.fasterxml.jackson:jackson-bom` from 2.18.1 to 2.18.2 - [Commits](https://github.com/FasterXML/jackson-bom/compare/jackson-bom-2.18.1...jackson-bom-2.18.2) Updates `org.eclipse.jetty.ee10:jetty-ee10-bom` from 12.0.15 to 12.0.16 - [Release notes](https://github.com/jetty/jetty.project/releases) - [Commits](https://github.com/jetty/jetty.project/compare/jetty-12.0.15...jetty-12.0.16) Updates `io.swagger.core.v3:swagger-jaxrs2-jakarta` from 2.2.26 to 2.2.27 Updates `io.swagger.core.v3:swagger-annotations-jakarta` from 2.2.26 to 2.2.27 Updates `io.swagger.core.v3:swagger-core-jakarta` from 2.2.26 to 2.2.27 Updates `io.swagger.core.v3:swagger-annotations-jakarta` from 2.2.26 to 2.2.27 Updates `io.swagger.core.v3:swagger-core-jakarta` from 2.2.26 to 2.2.27 Updates `io.confluent:kafka-avro-serializer` from 7.7.1 to 7.8.0 - [Commits](https://github.com/confluentinc/schema-registry/compare/v7.7.1...v7.8.0) Updates `com.unboundid:unboundid-ldapsdk` from 7.0.1 to 7.0.2 - [Release notes](https://github.com/pingidentity/ldapsdk/releases) - [Changelog](https://github.com/pingidentity/ldapsdk/blob/master/docs/release-notes.html) - [Commits](https://github.com/pingidentity/ldapsdk/compare/7.0.1...7.0.2) Updates `net.bytebuddy:byte-buddy` from 1.15.10 to 1.15.11 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.15.10...byte-buddy-1.15.11) --- updated-dependencies: - dependency-name: com.fasterxml.jackson:jackson-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: org.eclipse.jetty.ee10:jetty-ee10-bom dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.swagger.core.v3:swagger-jaxrs2-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.swagger.core.v3:swagger-annotations-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.swagger.core.v3:swagger-core-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.swagger.core.v3:swagger-annotations-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.swagger.core.v3:swagger-core-jakarta dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: io.confluent:kafka-avro-serializer dependency-type: direct:production update-type: version-update:semver-minor dependency-group: prod-deps - dependency-name: com.unboundid:unboundid-ldapsdk dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch dependency-group: prod-deps ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jens-Otto Larsen <46576810+jolarsen@users.noreply.github.com> --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 893d95f0b..a93ccbccb 100644 --- a/pom.xml +++ b/pom.xml @@ -54,11 +54,11 @@ 10.0.0 8.0 - 12.0.15 + 12.0.16 3.1.9 2.0.16 1.5.12 - 2.2.26 + 2.2.27 5.14.2 @@ -89,7 +89,7 @@ com.fasterxml.jackson jackson-bom - 2.18.1 + 2.18.2 import pom @@ -184,7 +184,7 @@ io.confluent kafka-avro-serializer - 7.7.1 + 7.8.0 org.apache.zookeeper @@ -206,7 +206,7 @@ com.unboundid unboundid-ldapsdk - 7.0.1 + 7.0.2 @@ -424,7 +424,7 @@ net.bytebuddy byte-buddy - 1.15.10 + 1.15.11 From a40c06cbdb68f4e29ec1fc8cf41498e1bc3e5bb8 Mon Sep 17 00:00:00 2001 From: Inga Date: Tue, 17 Dec 2024 13:30:39 +0100 Subject: [PATCH 5/5] =?UTF-8?q?POFIM-102:=20M=C3=A5=20ogs=C3=A5=20mocke=20?= =?UTF-8?q?oppgaveUtgaatt=20for=20=C3=A5=20unng=C3=A5=20feilmeldinger=20i?= =?UTF-8?q?=20loggene=20til=20VTP=20og=20K9-Inntektsmelding=20under=20kj?= =?UTF-8?q?=C3=B8ring=20av=20verdikjedetest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java b/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java index df29d06cd..d8f35eb7b 100644 --- a/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java +++ b/mocks/fager-mock/src/main/java/no/nav/fager/FagerMock.java @@ -2,6 +2,7 @@ import static jakarta.ws.rs.core.HttpHeaders.AUTHORIZATION; +import java.util.Collections; import java.util.Map; import no.nav.foreldrepenger.vtp.testmodell.repo.ArbeidsgiverPortalRepository; @@ -91,8 +92,11 @@ public Map graphQLRequest(@HeaderParam(AUTHORIZATION) String aut LOG.info("FAGER: hardDeleteSak operation"); var executionResult = graphqlTjeneste.sak(request); return executionResult.toSpecification(); + } else if ("oppgaveUtgaatt".equals(operationName)) { + LOG.info("FAGER: oppgaveUtgaat operation"); + return Collections.emptyMap(); } - throw new NotImplementedException("Operasjon er ikke implementert:" + operationName); + throw new NotImplementedException("Operasjon er ikke implementert :" + operationName); } private String sanitizeInput(String input) {