Skip to content

Commit 631dc62

Browse files
author
Michael Johansen
authored
TFP-563 FP-FELLES: Gjøre repoet klar for bygging og distribusjon utenfor (#77)
1 parent 24950c0 commit 631dc62

File tree

35 files changed

+556
-318
lines changed

35 files changed

+556
-318
lines changed

‎.circleci/config.yml

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
version: 2.1
2+
jobs:
3+
build:
4+
docker:
5+
- image: circleci/openjdk:latest
6+
- image: circleci/postgres:latest
7+
environment:
8+
POSTGRES_USER: fp_unit
9+
POSTGRES_DB: fp_unit
10+
POSTGRES_PASSWORD: fp_unit
11+
steps:
12+
- checkout
13+
- restore_cache:
14+
name: Restore cached dependencies
15+
keys:
16+
- maven3-{{ checksum "pom.xml" }}
17+
- run:
18+
name: Build (and run tests)
19+
command: mvn clean install
20+
- save_cache:
21+
name: Cache Maven dependencies
22+
key: maven3-{{ checksum "pom.xml" }}
23+
paths:
24+
- ~/.m2
25+
26+
deploy:
27+
docker:
28+
- image: circleci/openjdk:latest
29+
steps:
30+
- checkout
31+
- restore_cache:
32+
name: Restore cached dependencies
33+
keys:
34+
- maven3-{{ checksum "pom.xml" }}
35+
#- run:
36+
# name: Import gpg key
37+
# command: echo $GPG_KEY_BASE64 | base64 --decode | gpg --yes --batch --import
38+
- run:
39+
name: "Setting version"
40+
command: |
41+
sudo apt-get install libxml2-utils
42+
export GIT_COMMIT_HASH=$(git log -n 1 --pretty=format:'%h')
43+
export GIT_COMMIT_DATE=$(git log -1 --pretty='%ad' --date=format:'%Y%m%d%H%M%S')
44+
export REVISION=$(xmllint --xpath '/*[local-name()="project"]//*[local-name()="revision"]/text()' pom.xml)
45+
export VERSION=${REVISION}_${GIT_COMMIT_DATE}_${GIT_COMMIT_HASH}
46+
echo "Setting version $VERSION"
47+
mvn versions:set -DnewVersion="$VERSION"
48+
mvn versions:commit
49+
- run:
50+
name: Deploy to Github Package Registry
51+
command: "mvn --settings .circleci/maven-settings.xml deploy -PpublishGithub -DskipTests=true"
52+
53+
54+
workflows:
55+
version: 2
56+
build-and-deploy:
57+
jobs:
58+
- build
59+
# - deploy:
60+
# context: familie-ci
61+
# requires:
62+
# - build
63+
# filters:
64+
# branches:
65+
# only: feature/TFP-563

‎.circleci/maven-settings.xml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
4+
<activeProfiles>
5+
<activeProfile>github</activeProfile>
6+
</activeProfiles>
7+
8+
<profiles>
9+
<profile>
10+
<id>github</id>
11+
<repositories>
12+
<repository>
13+
<id>central</id>
14+
<url>https://repo1.maven.org/maven2</url>
15+
<releases><enabled>true</enabled></releases>
16+
<snapshots><enabled>true</enabled></snapshots>
17+
</repository>
18+
<repository>
19+
<id>github</id>
20+
<name>GitHub navikt Apache Maven Packages</name>
21+
<url>https://maven.pkg.github.com/navikt</url>
22+
</repository>
23+
</repositories>
24+
</profile>
25+
</profiles>
26+
<servers>
27+
<server>
28+
<id>github</id>
29+
<username>${env.GITHUB_USERNAME}</username>
30+
<password>${env.GITHUB_PASSWORD}</password>
31+
</server>
32+
</servers>
33+
</settings>

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ keystore.jks
3636
truststore.jts
3737
truststore.jks
3838
.DS_Store
39+
.env

‎README.md

+9
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
11
# Felles kode / bibliotek for foredrepenger området
2+
3+
4+
5+
## Postgres
6+
I test og utvikling bruker vi postgres. For å enkelt sette opp dette slik at det fungerer med unit-tests:
7+
```
8+
docker rm -f fp-postgres
9+
docker run --rm --name fp-postgres -e POSTGRES_USER=fp_unit -e POSTGRES_PASSWORD=fp_unit -e POSTGRES_DB=fp_unit -d -p 5432:5432 postgres:alpine
10+
```

‎felles/pom.xml

+7-28
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<resteasy.version>3.6.1.SP2</resteasy.version>
3030
<slf4j.version>1.7.26</slf4j.version>
3131
<swagger.version>1.5.13</swagger.version>
32-
<doksys.dokumentproduksjon.version>2.1.8</doksys.dokumentproduksjon.version>
32+
<doksys.dokumentproduksjon.version>1.2019.08.12-12.12-4258f3dded02</doksys.dokumentproduksjon.version>
3333

3434
</properties>
3535

@@ -144,22 +144,6 @@
144144

145145

146146
<!-- NAV interne 3djepart avhengigheter til kontrakter og bibliotek -->
147-
<dependency>
148-
<groupId>no.nav.abac.policies</groupId>
149-
<artifactId>abac-foreldrepenger-policies-alfa</artifactId>
150-
<version>4.5.0</version>
151-
</dependency>
152-
<dependency>
153-
<groupId>no.nav.abac.policies</groupId>
154-
<artifactId>abac-common-attributes-alfa</artifactId>
155-
<version>4.0.8</version>
156-
</dependency>
157-
<dependency>
158-
<groupId>no.nav.abac.policies</groupId>
159-
<artifactId>abac-arkiv-policies-alfa</artifactId>
160-
<version>4.6.2</version>
161-
<classifier>attributes</classifier>
162-
</dependency>
163147
<dependency>
164148
<groupId>no.nav.tjenestespesifikasjoner</groupId>
165149
<artifactId>nav-kodeverk-v3-tjenestespesifikasjon</artifactId>
@@ -171,10 +155,9 @@
171155
<version>${tjenestespesifikasjoner.version}</version>
172156
</dependency>
173157
<dependency>
174-
<groupId>no.nav.tjenester.fim</groupId>
175-
<artifactId>nav-fim-dokumentproduksjon-v2-tjenestespesifikasjon</artifactId>
158+
<groupId>no.nav.tjenestespesifikasjoner</groupId>
159+
<artifactId>dokumentproduksjon-v2-tjenestespesifikasjon</artifactId>
176160
<version>${doksys.dokumentproduksjon.version}</version>
177-
<classifier>jaxws</classifier>
178161
</dependency>
179162
<dependency>
180163
<groupId>no.nav.tjenestespesifikasjoner</groupId>
@@ -290,15 +273,11 @@
290273

291274
<!-- Database avhengigheter -->
292275
<dependency>
293-
<groupId>com.oracle</groupId>
294-
<artifactId>ojdbc8</artifactId>
295-
<version>12.2.0.1</version>
276+
<groupId>org.postgresql</groupId>
277+
<artifactId>postgresql</artifactId>
278+
<version>42.2.5</version>
296279
</dependency>
297-
<!--<dependency>
298-
<groupId>org.postgresql</groupId>
299-
<artifactId>postgresql</artifactId>
300-
<version>42.2.5</version>
301-
</dependency>-->
280+
302281
<dependency>
303282
<groupId>com.zaxxer</groupId>
304283
<artifactId>HikariCP</artifactId>

‎felles/sikkerhet/sikkerhet/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -99,20 +99,6 @@
9999
<artifactId>picketbox</artifactId>
100100
</dependency>
101101

102-
<!-- for PDP/ABAC -->
103-
<dependency>
104-
<groupId>no.nav.abac.policies</groupId>
105-
<artifactId>abac-foreldrepenger-policies-alfa</artifactId>
106-
</dependency>
107-
<dependency>
108-
<groupId>no.nav.abac.policies</groupId>
109-
<artifactId>abac-common-attributes-alfa</artifactId>
110-
</dependency>
111-
<dependency>
112-
<groupId>no.nav.abac.policies</groupId>
113-
<artifactId>abac-arkiv-policies-alfa</artifactId>
114-
<classifier>attributes</classifier>
115-
</dependency>
116102
<dependency>
117103
<groupId>javax.activation</groupId>
118104
<artifactId>javax.activation-api</artifactId>

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ArkivAttributter.java

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package no.nav.abac.xacml;
2+
3+
public class ArkivAttributter {
4+
5+
6+
public static final String RESOURCE_ARKIV_DOKUMENT = "no.nav.abac.attributter.resource.arkiv.dokument";
7+
public static final String RESOURCE_ARKIV_GSAK_SAKSID = "no.nav.abac.attributter.resource.arkiv.gsak_saksid";
8+
public static final String RESOURCE_ARKIV_JOURNALPOST = "no.nav.abac.attributter.resource.arkiv.journalpost";
9+
public static final String RESOURCE_ARKIV_PENSJON_SAKSID = "no.nav.abac.attributter.resource.arkiv.pensjon_saksid";
10+
public static final String RESOURCE_ARKIV_SAK = "no.nav.abac.attributter.resource.arkiv.sak";
11+
12+
}

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/CommonAttributter.java

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
package no.nav.abac.xacml;
2+
3+
public class CommonAttributter {
4+
public static final String ADVICES_ACTION_SPORBARHETSLOGG = "no.nav.abac.advices.action.sporbarhetslogg";
5+
public static final String ADVICES_PING_RESPONSE = "no.nav.abac.advices.ping.response";
6+
public static final String ADVICES_REASON_DENY_INFO = "no.nav.abac.advices.reason.deny_info";
7+
public static final String ADVICES_REASON_DENY_REASON = "no.nav.abac.advices.reason.deny_reason";
8+
public static final String ADVICEOROBLIGATION_CAUSE = "no.nav.abac.attributter.adviceorobligation.cause";
9+
public static final String ADVICEOROBLIGATION_DENY_POLICY = "no.nav.abac.attributter.adviceorobligation.deny_policy";
10+
public static final String ADVICEOROBLIGATION_DENY_RULE = "no.nav.abac.attributter.adviceorobligation.deny_rule";
11+
public static final String ADVICEOROBLIGATION_FRITEKST = "no.nav.abac.attributter.adviceorobligation.fritekst";
12+
public static final String ENVIRONMENT_FELLES_CONSUMER_OIDC_TOKEN_BODY = "no.nav.abac.attributter.environment.felles.consumer_oidc_token_body";
13+
public static final String ENVIRONMENT_FELLES_MILJOE = "no.nav.abac.attributter.environment.felles.miljoe";
14+
public static final String ENVIRONMENT_FELLES_OIDC_TOKEN_BODY = "no.nav.abac.attributter.environment.felles.oidc_token_body";
15+
public static final String ENVIRONMENT_FELLES_PEP_ID = "no.nav.abac.attributter.environment.felles.pep_id";
16+
public static final String ENVIRONMENT_FELLES_SAML_TOKEN = "no.nav.abac.attributter.environment.felles.saml_token";
17+
public static final String ENVIRONMENT_FELLES_TJENESTENAVN = "no.nav.abac.attributter.environment.felles.tjenestenavn";
18+
public static final String RESOURCE_FELLES_DOMENE = "no.nav.abac.attributter.resource.felles.domene";
19+
public static final String RESOURCE_FELLES_ENHET = "no.nav.abac.attributter.resource.felles.enhet";
20+
public static final String RESOURCE_FELLES_PERSON = "no.nav.abac.attributter.resource.felles.person";
21+
public static final String RESOURCE_FELLES_PERSON_AKTOERID_RESOURCE = "no.nav.abac.attributter.resource.felles.person.aktoerId_resource";
22+
public static final String RESOURCE_FELLES_PERSON_EGEN_ANSATT = "no.nav.abac.attributter.resource.felles.person.egen_ansatt";
23+
public static final String RESOURCE_FELLES_PERSON_FNR = "no.nav.abac.attributter.resource.felles.person.fnr";
24+
public static final String RESOURCE_FELLES_PERSON_GEOGRAFISK_TILKNYTNING = "no.nav.abac.attributter.resource.felles.person.geografisk_tilknytning";
25+
public static final String RESOURCE_FELLES_PERSON_KONTAKTINFORMASJON = "no.nav.abac.attributter.resource.felles.person.kontaktinformasjon";
26+
public static final String RESOURCE_FELLES_PERSON_NAV_ENHET_ID = "no.nav.abac.attributter.resource.felles.person.nav_enhet_id";
27+
public static final String RESOURCE_FELLES_PERSON_NAVN = "no.nav.abac.attributter.resource.felles.person.navn";
28+
public static final String RESOURCE_FELLES_PERSON_REGIONAL_ENHET = "no.nav.abac.attributter.resource.felles.person.regional_enhet";
29+
public static final String RESOURCE_FELLES_PERSON_RELASJON = "no.nav.abac.attributter.resource.felles.person.relasjon";
30+
public static final String RESOURCE_FELLES_PERSON_RELASJONER = "no.nav.abac.attributter.resource.felles.person.relasjoner";
31+
public static final String RESOURCE_FELLES_PERSON_SPESREG = "no.nav.abac.attributter.resource.felles.person.spesreg";
32+
public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_EGEN_ANSATT = "no.nav.abac.attributter.resource.felles.person.tilknyttet_egen_ansatt";
33+
public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_FNR = "no.nav.abac.attributter.resource.felles.person.tilknyttet_fnr";
34+
public static final String RESOURCE_FELLES_PERSON_TILKNYTTET_SPESREG = "no.nav.abac.attributter.resource.felles.person.tilknyttet_spesreg";
35+
public static final String RESOURCE_FELLES_RESOURCE_TYPE = "no.nav.abac.attributter.resource.felles.resource_type";
36+
public static final String RESOURCE_FELLES_TEMA = "no.nav.abac.attributter.resource.felles.tema";
37+
public static final String SUBJECT_FELLES_AKTOERID_SUBJECT = "no.nav.abac.attributter.subject.felles.aktoerId_subject";
38+
public static final String SUBJECT_FELLES_ALDER = "no.nav.abac.attributter.subject.felles.alder";
39+
public static final String SUBJECT_FELLES_ALLE_TEMA = "no.nav.abac.attributter.subject.felles.alle_tema";
40+
public static final String SUBJECT_FELLES_AUTHENTICATIONLEVEL = "no.nav.abac.attributter.subject.felles.authenticationLevel";
41+
public static final String SUBJECT_FELLES_CONSUMERID = "no.nav.abac.attributter.subject.felles.consumerId";
42+
public static final String SUBJECT_FELLES_CONSUMERID_ROLLE = "no.nav.abac.attributter.subject.felles.consumerId_rolle";
43+
public static final String SUBJECT_FELLES_ENHETIDLISTE = "no.nav.abac.attributter.subject.felles.enhetidliste";
44+
public static final String SUBJECT_FELLES_ER_LEVENDE = "no.nav.abac.attributter.subject.felles.er_levende";
45+
public static final String SUBJECT_FELLES_HAR_TILGANG_EGEN_ANSATT = "no.nav.abac.attributter.subject.felles.har_tilgang_egen_ansatt";
46+
public static final String SUBJECT_FELLES_HAR_TILGANG_KODE_6 = "no.nav.abac.attributter.subject.felles.har_tilgang_kode_6";
47+
public static final String SUBJECT_FELLES_HAR_TILGANG_KODE_7 = "no.nav.abac.attributter.subject.felles.har_tilgang_kode_7";
48+
public static final String SUBJECT_FELLES_INDIREKTE_GRUPPER = "no.nav.abac.attributter.subject.felles.indirekte_grupper";
49+
public static final String SUBJECT_FELLES_REGIONIDLISTE = "no.nav.abac.attributter.subject.felles.regionidliste";
50+
public static final String SUBJECT_FELLES_SUBJECTTYPE = "no.nav.abac.attributter.subject.felles.subjectType";
51+
public static final String SUBJECT_FELLES_TEMA_FOR_ENHET = "no.nav.abac.attributter.subject.felles.tema_for_enhet";
52+
public static final String XACML_1_0_ACTION_ACTION_ID = "urn:oasis:names:tc:xacml:1.0:action:action-id";
53+
public static final String XACML_1_0_ACTION_IMPLIED_ACTION = "urn:oasis:names:tc:xacml:1.0:action:implied-action";
54+
public static final String XACML_1_0_ENVIRONMENT_CURRENT_DATE = "urn:oasis:names:tc:xacml:1.0:environment:current-date";
55+
public static final String XACML_1_0_ENVIRONMENT_CURRENT_DATETIME = "urn:oasis:names:tc:xacml:1.0:environment:current-dateTime";
56+
public static final String XACML_1_0_ENVIRONMENT_CURRENT_TIME = "urn:oasis:names:tc:xacml:1.0:environment:current-time";
57+
public static final String XACML_1_0_RESOURCE_RESOURCE_ID = "urn:oasis:names:tc:xacml:1.0:resource:resource-id";
58+
public static final String XACML_1_0_SUBJECT_AUTHENTICATION_METHOD = "urn:oasis:names:tc:xacml:1.0:subject:authentication-method";
59+
public static final String XACML_1_0_SUBJECT_AUTHENTICATION_TIME = "urn:oasis:names:tc:xacml:1.0:subject:authentication-time";
60+
public static final String XACML_1_0_SUBJECT_KEY_INFO = "urn:oasis:names:tc:xacml:1.0:subject:key-info";
61+
public static final String XACML_1_0_SUBJECT_REQUEST_TIME = "urn:oasis:names:tc:xacml:1.0:subject:request-time";
62+
public static final String XACML_1_0_SUBJECT_SESSION_START_TIME = "urn:oasis:names:tc:xacml:1.0:subject:session-start-time";
63+
public static final String XACML_1_0_SUBJECT_SUBJECT_ID = "urn:oasis:names:tc:xacml:1.0:subject:subject-id";
64+
public static final String XACML_1_0_SUBJECT_SUBJECT_ID_QUALIFIER = "urn:oasis:names:tc:xacml:1.0:subject:subject-id-qualifier";
65+
public static final String XACML_2_0_RESOURCE_TARGET_NAMESPACE = "urn:oasis:names:tc:xacml:2.0:resource:target-namespace";
66+
public static final String XACML_2_0_SUBJECT_ROLE = "urn:oasis:names:tc:xacml:2.0:subject:role";
67+
public static final String XACML_3_0_SUBJECT_AUTHN_LOCALITY_DNS_NAME = "urn:oasis:names:tc:xacml:3.0:subject:authn-locality:dns-name";
68+
public static final String XACML_3_0_SUBJECT_AUTHN_LOCALITY_IP_ADDRESS = "urn:oasis:names:tc:xacml:3.0:subject:authn-locality:ip-address";
69+
70+
public CommonAttributter() {
71+
}
72+
}

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/abac/xacml/ForeldrepengerAttributter.java

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package no.nav.abac.xacml;
2+
3+
public class ForeldrepengerAttributter {
4+
public static final String FORELDREPENGER_FP_SAKSID = "no.nav.abac.attributter.foreldrepenger.fp_saksid";
5+
public static final String FORELDREPENGER_OPPGAVEKO = "no.nav.abac.attributter.foreldrepenger.oppgaveko";
6+
public static final String FORELDREPENGER_OPPGAVESTYRING = "no.nav.abac.attributter.foreldrepenger.oppgavestyring";
7+
public static final String FORELDREPENGER_OPPGAVESTYRING_AVDELINGSENHET = "no.nav.abac.attributter.foreldrepenger.oppgavestyring.avdelingsenhet";
8+
public static final String FORELDREPENGER_RISIKOKLASSIFISERING = "no.nav.abac.attributter.foreldrepenger.risikoklassifisering";
9+
public static final String FORELDREPENGER_SAKLISTE = "no.nav.abac.attributter.foreldrepenger.sakliste";
10+
public static final String RESOURCE_FORELDREPENGER_ALENEOMSORG = "no.nav.abac.attributter.resource.foreldrepenger.aleneomsorg";
11+
public static final String RESOURCE_FORELDREPENGER_ANNEN_PART = "no.nav.abac.attributter.resource.foreldrepenger.annen_part";
12+
public static final String RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE = "no.nav.abac.attributter.resource.foreldrepenger.sak.aksjonspunkt_type";
13+
public static final String RESOURCE_FORELDREPENGER_SAK_ANSVARLIG_SAKSBEHANDLER = "no.nav.abac.attributter.resource.foreldrepenger.sak.ansvarlig_saksbehandler";
14+
public static final String RESOURCE_FORELDREPENGER_SAK_BEHANDLINGSSTATUS = "no.nav.abac.attributter.resource.foreldrepenger.sak.behandlingsstatus";
15+
public static final String RESOURCE_FORELDREPENGER_SAK_SAKSSTATUS = "no.nav.abac.attributter.resource.foreldrepenger.sak.saksstatus";
16+
public static final String RESOURCE_FORELDREPENGER_UTTAKSPLAN = "no.nav.abac.attributter.resource.foreldrepenger.uttaksplan";
17+
18+
public ForeldrepengerAttributter() {
19+
}
20+
}

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/AbacSporingslogg.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
import java.util.List;
66
import java.util.Optional;
77

8+
import no.nav.abac.xacml.CommonAttributter;
89
import org.slf4j.Logger;
910

10-
import no.nav.abac.common.xacml.CommonAttributter;
11-
import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
11+
12+
import no.nav.abac.xacml.ForeldrepengerAttributter;
1213
import no.nav.vedtak.log.sporingslogg.Sporingsdata;
1314
import no.nav.vedtak.log.sporingslogg.SporingsloggId;
1415
import no.nav.vedtak.log.sporingslogg.StandardSporingsloggId;

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/PepImpl.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import javax.enterprise.context.RequestScoped;
1111
import javax.inject.Inject;
1212

13-
import no.nav.abac.common.xacml.CommonAttributter;
14-
import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
13+
import no.nav.abac.xacml.CommonAttributter;
14+
import no.nav.abac.xacml.ForeldrepengerAttributter;
1515
import no.nav.vedtak.konfig.KonfigVerdi;
1616
import no.nav.vedtak.sikkerhet.context.SubjectHandler;
1717

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/abac/Tilgangsbeslutning.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import java.util.List;
66

7-
import no.nav.abac.common.xacml.CommonAttributter;
8-
import no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter;
7+
import no.nav.abac.xacml.CommonAttributter;
8+
import no.nav.abac.xacml.ForeldrepengerAttributter;
99

1010
public final class Tilgangsbeslutning {
1111
private AbacResultat beslutningKode;

‎felles/sikkerhet/sikkerhet/src/main/java/no/nav/vedtak/sikkerhet/pdp/PdpKlientImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.slf4j.Logger;
1212
import org.slf4j.LoggerFactory;
1313

14-
import no.nav.abac.common.xacml.CommonAttributter;
14+
import no.nav.abac.xacml.CommonAttributter;
1515
import no.nav.vedtak.konfig.KonfigVerdi;
1616
import no.nav.vedtak.log.util.LoggerUtils;
1717
import no.nav.vedtak.sikkerhet.abac.AbacIdToken;

‎felles/sikkerhet/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/AbacSporingsloggTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package no.nav.vedtak.sikkerhet.abac;
22

3-
import static no.nav.abac.foreldrepenger.xacml.ForeldrepengerAttributter.RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE;
3+
import static no.nav.abac.xacml.ForeldrepengerAttributter.RESOURCE_FORELDREPENGER_SAK_AKSJONSPUNKT_TYPE;
44
import static org.assertj.core.api.Assertions.assertThat;
55

66
import java.util.Arrays;
@@ -10,7 +10,7 @@
1010
import org.junit.Rule;
1111
import org.junit.Test;
1212

13-
import no.nav.abac.common.xacml.CommonAttributter;
13+
import no.nav.abac.xacml.CommonAttributter;
1414
import no.nav.modig.core.test.LogSniffer;
1515

1616
public class AbacSporingsloggTest {

‎felles/sikkerhet/sikkerhet/src/test/java/no/nav/vedtak/sikkerhet/abac/BeskyttetRessursInterceptorTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import org.junit.Rule;
1515
import org.junit.Test;
1616

17-
import no.nav.abac.common.xacml.CommonAttributter;
17+
import no.nav.abac.xacml.CommonAttributter;
1818
import no.nav.modig.core.test.LogSniffer;
1919
import no.nav.vedtak.exception.ManglerTilgangException;
2020
import no.nav.vedtak.sikkerhet.InnloggetSubject;

0 commit comments

Comments
 (0)