Skip to content

Commit

Permalink
remove ictu brand
Browse files Browse the repository at this point in the history
  • Loading branch information
bhuism committed Jan 9, 2025
1 parent 2258f29 commit daaadd0
Show file tree
Hide file tree
Showing 69 changed files with 238 additions and 238 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/maven-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ jobs:
- name: Login to GHCR
uses: docker/login-action@v3
with:
registry: ghcr.io/ictu/pseudoniemenservice
username: ictu
registry: ghcr.io/bhuism/pseudoniemenservice
username: bhuism
password: ${{ secrets.GITHUB_TOKEN }}

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/ictu/pseudoniemenservice
images: ghcr.io/bhuism/pseudoniemenservice

- name: Set up Pack
uses: buildpacks/github-actions/[email protected]
Expand All @@ -64,7 +64,7 @@ jobs:

- name: Build and publish OCI image
run: |
pack build ghcr.io/ictu/pseudoniemenservice \
pack build ghcr.io/bhuism/pseudoniemenservice \
--builder docker.io/paketobuildpacks/builder-jammy-buildpackless-tiny \
--buildpack gcr.io/paketo-buildpacks/java-native-image \
--publish \
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>3.4.1</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>nl.ictu</groupId>
<groupId>nl.appsource</groupId>
<artifactId>pseudoniemenservice</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>pseudoniemenservice</name>
Expand Down Expand Up @@ -82,8 +82,8 @@
<configuration>
<inputSpec>${project.basedir}/src/main/resources/public/v1/openapi.yaml</inputSpec>
<generatorName>spring</generatorName>
<modelPackage>nl.ictu.pseudoniemenservice.generated.server.model</modelPackage>
<apiPackage>nl.ictu.pseudoniemenservice.generated.server.api</apiPackage>
<modelPackage>nl.appsource.pseudoniemenservice.generated.server.model</modelPackage>
<apiPackage>nl.appsource.pseudoniemenservice.generated.server.api</apiPackage>
<generateApiTests>false</generateApiTests>
<generateApiDocumentation>false</generateApiDocumentation>
<generateModelTests>false</generateModelTests>
Expand Down Expand Up @@ -234,13 +234,13 @@
<coverageThreshold>${pit.coverageThreshold}</coverageThreshold>
<mutationThreshold>${pit.mutationThreshold}</mutationThreshold>
<targetClasses>
<param>nl.ictu.*</param>
<param>nl.appsource.*</param>
</targetClasses>
<targetTests>
<param>nl.ictu.*</param>
<param>nl.appsource.*</param>
</targetTests>
<excludedClasses>
<excludedClass>nl.ictu.pseudoniemenservice.generated.*</excludedClass>
<excludedClass>nl.appsource.pseudoniemenservice.generated.*</excludedClass>
</excludedClasses>
<timeoutConstant>5000</timeoutConstant>
<timestampedReports>false</timestampedReports>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nl/ictu/PseudoniemenServiceApplication.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu;
package nl.appsource;

import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import lombok.NoArgsConstructor;
Expand All @@ -10,7 +10,7 @@

@SuppressWarnings({"HideUtilityClassConstructor"})
@SuppressFBWarnings(value = "EI_EXPOSE_STATIC_REP2",
justification = "nl.ictu.PseudoniemenServiceApplication$$SpringCGLIB$$0")
justification = "nl.appsource.PseudoniemenServiceApplication$$SpringCGLIB$$0")
@SpringBootApplication
@NoArgsConstructor
public class PseudoniemenServiceApplication {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package nl.ictu.configuration;
package nl.appsource.configuration;

import jakarta.annotation.PostConstruct;
import lombok.Data;
import lombok.experimental.Accessors;
import nl.ictu.service.exception.IdentifierPrivateKeyException;
import nl.ictu.service.exception.TokenPrivateKeyException;
import nl.appsource.service.exception.IdentifierPrivateKeyException;
import nl.appsource.service.exception.TokenPrivateKeyException;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/nl/ictu/controller/GlobalExceptionHandler.java
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package nl.ictu.controller;
package nl.appsource.controller;

import lombok.extern.slf4j.Slf4j;
import nl.ictu.service.exception.IdentifierPrivateKeyException;
import nl.ictu.service.exception.InvalidOINException;
import nl.ictu.service.exception.InvalidWsIdentifierRequestTypeException;
import nl.ictu.service.exception.InvalidWsIdentifierTokenException;
import nl.ictu.service.exception.TokenPrivateKeyException;
import nl.ictu.service.exception.WsGetTokenProcessingException;
import nl.appsource.service.exception.IdentifierPrivateKeyException;
import nl.appsource.service.exception.InvalidOINException;
import nl.appsource.service.exception.InvalidWsIdentifierRequestTypeException;
import nl.appsource.service.exception.InvalidWsIdentifierTokenException;
import nl.appsource.service.exception.TokenPrivateKeyException;
import nl.appsource.service.exception.WsGetTokenProcessingException;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.ControllerAdvice;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/nl/ictu/controller/IndexController.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.controller;
package nl.appsource.controller;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package nl.ictu.controller.v1;
package nl.appsource.controller.v1;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.pseudoniemenservice.generated.server.api.ExchangeIdentifierApi;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeIdentifierRequest;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeIdentifierResponse;
import nl.ictu.service.ExchangeIdentifierService;
import nl.appsource.pseudoniemenservice.generated.server.api.ExchangeIdentifierApi;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeIdentifierRequest;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeIdentifierResponse;
import nl.appsource.service.ExchangeIdentifierService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/nl/ictu/controller/v1/ExchangeTokenController.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package nl.ictu.controller.v1;
package nl.appsource.controller.v1;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.pseudoniemenservice.generated.server.api.ExchangeTokenApi;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeTokenRequest;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeTokenResponse;
import nl.ictu.service.ExchangeTokenService;
import nl.appsource.pseudoniemenservice.generated.server.api.ExchangeTokenApi;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeTokenRequest;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeTokenResponse;
import nl.appsource.service.ExchangeTokenService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/nl/ictu/controller/v1/GetTokenController.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package nl.ictu.controller.v1;
package nl.appsource.controller.v1;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.pseudoniemenservice.generated.server.api.GetTokenApi;
import nl.ictu.pseudoniemenservice.generated.server.model.WsGetTokenRequest;
import nl.ictu.pseudoniemenservice.generated.server.model.WsGetTokenResponse;
import nl.ictu.service.GetTokenService;
import nl.appsource.pseudoniemenservice.generated.server.api.GetTokenApi;
import nl.appsource.pseudoniemenservice.generated.server.model.WsGetTokenRequest;
import nl.appsource.pseudoniemenservice.generated.server.model.WsGetTokenResponse;
import nl.appsource.service.GetTokenService;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.controller.v1;
package nl.appsource.controller.v1;

import org.springframework.web.bind.annotation.RequestMapping;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/nl/ictu/model/Identifier.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.model;
package nl.appsource.model;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/nl/ictu/model/Token.java
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.model;
package nl.appsource.model;

import lombok.AllArgsConstructor;
import lombok.Builder;
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/nl/ictu/service/ExchangeIdentifierService.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package nl.ictu.service;
package nl.appsource.service;

import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeIdentifierRequest;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeIdentifierResponse;
import nl.ictu.service.exception.InvalidWsIdentifierRequestTypeException;
import nl.ictu.service.map.BsnPseudoMapper;
import nl.ictu.service.map.PseudoBsnMapper;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeIdentifierRequest;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeIdentifierResponse;
import nl.appsource.service.exception.InvalidWsIdentifierRequestTypeException;
import nl.appsource.service.map.BsnPseudoMapper;
import nl.appsource.service.map.PseudoBsnMapper;
import org.springframework.stereotype.Service;

import static nl.ictu.pseudoniemenservice.generated.server.model.WsIdentifierTypes.BSN;
import static nl.ictu.pseudoniemenservice.generated.server.model.WsIdentifierTypes.ORGANISATION_PSEUDO;
import static nl.appsource.pseudoniemenservice.generated.server.model.WsIdentifierTypes.BSN;
import static nl.appsource.pseudoniemenservice.generated.server.model.WsIdentifierTypes.ORGANISATION_PSEUDO;

@RequiredArgsConstructor
@Service
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/nl/ictu/service/ExchangeTokenService.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package nl.ictu.service;
package nl.appsource.service;

import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeTokenRequest;
import nl.ictu.pseudoniemenservice.generated.server.model.WsExchangeTokenResponse;
import nl.ictu.service.crypto.AesGcmCryptographerService;
import nl.ictu.service.crypto.TokenConverter;
import nl.ictu.service.exception.InvalidOINException;
import nl.ictu.service.exception.InvalidWsIdentifierTokenException;
import nl.ictu.service.map.BsnTokenMapper;
import nl.ictu.service.map.OrganisationPseudoTokenMapper;
import nl.ictu.service.validate.OINValidator;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeTokenRequest;
import nl.appsource.pseudoniemenservice.generated.server.model.WsExchangeTokenResponse;
import nl.appsource.service.crypto.AesGcmCryptographerService;
import nl.appsource.service.crypto.TokenConverter;
import nl.appsource.service.exception.InvalidOINException;
import nl.appsource.service.exception.InvalidWsIdentifierTokenException;
import nl.appsource.service.map.BsnTokenMapper;
import nl.appsource.service.map.OrganisationPseudoTokenMapper;
import nl.appsource.service.validate.OINValidator;
import org.springframework.web.bind.annotation.RestController;

@Slf4j
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/nl/ictu/service/GetTokenService.java
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package nl.ictu.service;
package nl.appsource.service;

import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.pseudoniemenservice.generated.server.model.WsGetTokenResponse;
import nl.ictu.pseudoniemenservice.generated.server.model.WsIdentifier;
import nl.ictu.service.exception.WsGetTokenProcessingException;
import nl.ictu.service.map.WsGetTokenResponseMapper;
import nl.ictu.service.map.WsIdentifierOinBsnMapper;
import nl.appsource.pseudoniemenservice.generated.server.model.WsGetTokenResponse;
import nl.appsource.pseudoniemenservice.generated.server.model.WsIdentifier;
import nl.appsource.service.exception.WsGetTokenProcessingException;
import nl.appsource.service.map.WsGetTokenResponseMapper;
import nl.appsource.service.map.WsIdentifierOinBsnMapper;
import org.springframework.stereotype.Service;

@Slf4j
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import javax.crypto.BadPaddingException;
import javax.crypto.IllegalBlockSizeException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import lombok.RequiredArgsConstructor;
import nl.ictu.configuration.PseudoniemenServiceProperties;
import nl.ictu.utils.AesUtility;
import nl.ictu.utils.Base64Wrapper;
import nl.ictu.utils.ByteArrayUtil;
import nl.ictu.utils.MessageDigestWrapper;
import nl.appsource.configuration.PseudoniemenServiceProperties;
import nl.appsource.utils.AesUtility;
import nl.appsource.utils.Base64Wrapper;
import nl.appsource.utils.ByteArrayUtil;
import nl.appsource.utils.MessageDigestWrapper;
import org.springframework.stereotype.Component;

import javax.crypto.BadPaddingException;
Expand All @@ -20,7 +20,7 @@
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;

import static nl.ictu.utils.AesUtility.IV_LENGTH;
import static nl.appsource.utils.AesUtility.IV_LENGTH;

/**
* Advanced Encryption Standard Galois/Counter Mode (AES-GCM).
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import lombok.SneakyThrows;
import nl.ictu.model.Identifier;
import nl.appsource.model.Identifier;
import org.bouncycastle.crypto.InvalidCipherTextException;
import org.bouncycastle.crypto.params.AEADParameters;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import nl.ictu.configuration.PseudoniemenServiceProperties;
import nl.ictu.model.Identifier;
import nl.ictu.utils.AesUtility;
import nl.ictu.utils.Base64Wrapper;
import nl.ictu.utils.MessageDigestWrapper;
import nl.appsource.configuration.PseudoniemenServiceProperties;
import nl.appsource.model.Identifier;
import nl.appsource.utils.AesUtility;
import nl.appsource.utils.Base64Wrapper;
import nl.appsource.utils.MessageDigestWrapper;
import org.bouncycastle.crypto.InvalidCipherTextException;
import org.bouncycastle.crypto.modes.GCMSIVBlockCipher;
import org.bouncycastle.crypto.params.AEADParameters;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nl/ictu/service/crypto/IdentifierConverter.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import nl.ictu.model.Identifier;
import nl.appsource.model.Identifier;
import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
import org.springframework.stereotype.Component;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/nl/ictu/service/crypto/TokenConverter.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package nl.ictu.service.crypto;
package nl.appsource.service.crypto;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import nl.ictu.model.Token;
import nl.appsource.model.Token;
import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
import org.springframework.stereotype.Component;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class IdentifierPrivateKeyException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class InvalidOINException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class InvalidWsIdentifierRequestTypeException extends RuntimeException {
public InvalidWsIdentifierRequestTypeException(final String message) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class InvalidWsIdentifierTokenException extends RuntimeException {
public InvalidWsIdentifierTokenException(final String message) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class TokenPrivateKeyException extends RuntimeException {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package nl.ictu.service.exception;
package nl.appsource.service.exception;

public class WsGetTokenProcessingException extends RuntimeException {
public WsGetTokenProcessingException(final String message) {
Expand Down
Loading

0 comments on commit daaadd0

Please sign in to comment.