Skip to content

Commit

Permalink
Rettet opp etter kommentarer
Browse files Browse the repository at this point in the history
  • Loading branch information
stigus committed Oct 24, 2023
1 parent c0fec11 commit 29ea95b
Show file tree
Hide file tree
Showing 65 changed files with 67 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import jakarta.xml.bind.JAXBException;
import jakarta.xml.bind.Unmarshaller;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import no.nav.registre.testnorge.xsd.arbeidsforhold.v2_0.EDAGM;

Expand Down Expand Up @@ -80,12 +81,9 @@ public List<Inntekt> toInntekt() {
.toList();
}

@SneakyThrows
public static Opplysningspliktig from(String xml) {
try {
return new Opplysningspliktig(from(xml, unmarshaller));
} catch (Exception e) {
throw new RuntimeException("Klarer ikke a konvertere xmlene til EDAGM", e);
}
return new Opplysningspliktig(from(xml, unmarshaller));
}

private List<Permisjon> getPermisjoner() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
4 changes: 0 additions & 4 deletions apps/brreg-stub/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ dependencies {
implementation 'org.apache.cxf:cxf-rt-ws-security'
implementation 'jakarta.servlet:jakarta.servlet-api'

// implementation 'javax.xml.ws:jaxws-api:2.3.1'
// implementation 'javax:javaee-api:8.0.1'
// implementation 'javax.jws:javax.jws-api:1.1'

implementation 'org.postgresql:postgresql'
implementation 'com.zaxxer:HikariCP'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public VaultEndpoint vaultEndpoint() {
public ClientAuthentication clientAuthentication() {
var token = System.getProperty("spring.cloud.vault.token");
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty("spring.cloud.vault.token"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException(String.format("Påkrevd property '%s' er ikke satt.", TOKEN));
throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", TOKEN));
}
return new TokenAuthentication(System.getProperty(TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public ClientAuthentication clientAuthentication() {
}
var token = System.getProperty(VAULT_TOKEN);
if (isBlank(token)) {
throw new IllegalArgumentException("påkrevd property 'spring.cloud.vault.token' er ikke satt.");
throw new IllegalArgumentException("Påkrevet property 'spring.cloud.vault.token' er ikke satt.");
}
return new TokenAuthentication(System.getProperty(VAULT_TOKEN));
}
Expand Down
Loading

0 comments on commit 29ea95b

Please sign in to comment.