1
0

fix ArchTest

This commit is contained in:
Michael Hoennig
2025-05-20 17:37:35 +02:00
parent 58096c1510
commit 2c8ddc4250
4 changed files with 18 additions and 3 deletions

View File

@@ -2,6 +2,8 @@ package net.hostsharing.hsadminng.credentials;
import java.util.List; import java.util.List;
import io.micrometer.core.annotation.Timed;
import net.hostsharing.hsadminng.config.NoSecurityRequirement;
import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.context.Context;
import net.hostsharing.hsadminng.credentials.generated.api.v1.api.LoginContextsApi; import net.hostsharing.hsadminng.credentials.generated.api.v1.api.LoginContextsApi;
import net.hostsharing.hsadminng.credentials.generated.api.v1.model.LoginContextResource; import net.hostsharing.hsadminng.credentials.generated.api.v1.model.LoginContextResource;
@@ -11,6 +13,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@NoSecurityRequirement
public class HsCredentialsContextsController implements LoginContextsApi { public class HsCredentialsContextsController implements LoginContextsApi {
@Autowired @Autowired
@@ -23,6 +26,7 @@ public class HsCredentialsContextsController implements LoginContextsApi {
private HsCredentialsContextRbacRepository contextRepo; private HsCredentialsContextRbacRepository contextRepo;
@Override @Override
@Timed("app.credentials.contexts.getListOfLoginContexts")
public ResponseEntity<List<LoginContextResource>> getListOfLoginContexts(final String assumedRoles) { public ResponseEntity<List<LoginContextResource>> getListOfLoginContexts(final String assumedRoles) {
context.assumeRoles(assumedRoles); context.assumeRoles(assumedRoles);

View File

@@ -2,6 +2,9 @@ package net.hostsharing.hsadminng.credentials;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import io.micrometer.core.annotation.Timed;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import net.hostsharing.hsadminng.context.Context; import net.hostsharing.hsadminng.context.Context;
import net.hostsharing.hsadminng.credentials.generated.api.v1.api.LoginCredentialsApi; import net.hostsharing.hsadminng.credentials.generated.api.v1.api.LoginCredentialsApi;
import net.hostsharing.hsadminng.credentials.generated.api.v1.model.LoginCredentialsInsertResource; import net.hostsharing.hsadminng.credentials.generated.api.v1.model.LoginCredentialsInsertResource;
@@ -15,6 +18,7 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@SecurityRequirement(name = "casTicket")
public class HsCredentialsController implements LoginCredentialsApi { public class HsCredentialsController implements LoginCredentialsApi {
@Autowired @Autowired
@@ -33,6 +37,7 @@ public class HsCredentialsController implements LoginCredentialsApi {
private HsCredentialsRepository loginCredentialsRepo; private HsCredentialsRepository loginCredentialsRepo;
@Override @Override
@Timed("app.credentials.credentials.getSingleLoginCredentialsByUuid")
public ResponseEntity<LoginCredentialsResource> getSingleLoginCredentialsByUuid( public ResponseEntity<LoginCredentialsResource> getSingleLoginCredentialsByUuid(
final String assumedRoles, final String assumedRoles,
final UUID loginCredentialsUuid) { final UUID loginCredentialsUuid) {
@@ -44,6 +49,7 @@ public class HsCredentialsController implements LoginCredentialsApi {
} }
@Override @Override
@Timed("app.credentials.credentials.getListOfLoginCredentialsByPersonUuid")
public ResponseEntity<List<LoginCredentialsResource>> getListOfLoginCredentialsByPersonUuid( public ResponseEntity<List<LoginCredentialsResource>> getListOfLoginCredentialsByPersonUuid(
final String assumedRoles, final String assumedRoles,
final UUID personUuid final UUID personUuid
@@ -57,6 +63,7 @@ public class HsCredentialsController implements LoginCredentialsApi {
} }
@Override @Override
@Timed("app.credentials.credentials.postNewLoginCredentials")
public ResponseEntity<LoginCredentialsResource> postNewLoginCredentials( public ResponseEntity<LoginCredentialsResource> postNewLoginCredentials(
final String assumedRoles, final String assumedRoles,
final LoginCredentialsInsertResource body final LoginCredentialsInsertResource body
@@ -70,6 +77,7 @@ public class HsCredentialsController implements LoginCredentialsApi {
} }
@Override @Override
@Timed("app.credentials.credentials.deleteLoginCredentialsByUuid")
public ResponseEntity<Void> deleteLoginCredentialsByUuid(final String assumedRoles, final UUID loginCredentialsUuid) { public ResponseEntity<Void> deleteLoginCredentialsByUuid(final String assumedRoles, final UUID loginCredentialsUuid) {
context.assumeRoles(assumedRoles); context.assumeRoles(assumedRoles);
final var loginCredentialsEntity = em.getReference(HsCredentialsEntity.class, loginCredentialsUuid); final var loginCredentialsEntity = em.getReference(HsCredentialsEntity.class, loginCredentialsUuid);
@@ -78,6 +86,7 @@ public class HsCredentialsController implements LoginCredentialsApi {
} }
@Override @Override
@Timed("app.credentials.credentials.patchLoginCredentials")
public ResponseEntity<LoginCredentialsResource> patchLoginCredentials( public ResponseEntity<LoginCredentialsResource> patchLoginCredentials(
final String assumedRoles, final String assumedRoles,
final UUID loginCredentialsUuid, final UUID loginCredentialsUuid,

View File

@@ -52,6 +52,7 @@ public class ArchitectureTest {
"..credentials", "..credentials",
"..hash", "..hash",
"..lambda", "..lambda",
"..journal",
"..generated..", "..generated..",
"..persistence..", "..persistence..",
"..reflection", "..reflection",
@@ -155,14 +156,14 @@ public class ArchitectureTest {
public static final ArchRule testPackagesRule = classes() public static final ArchRule testPackagesRule = classes()
.that().resideInAPackage("..test.(*)..") .that().resideInAPackage("..test.(*)..")
.should().onlyBeAccessed().byClassesThat() .should().onlyBeAccessed().byClassesThat()
.resideInAnyPackage("..test.(*).."); .resideInAnyPackage("..test.(*)..", "..journal..");
@ArchTest @ArchTest
@SuppressWarnings("unused") @SuppressWarnings("unused")
public static final ArchRule testPackagePackageRule = classes() public static final ArchRule testPackagePackageRule = classes()
.that().resideInAPackage("..test.pac..") .that().resideInAPackage("..test.pac..")
.should().onlyBeAccessed().byClassesThat() .should().onlyBeAccessed().byClassesThat()
.resideInAnyPackage("..test.pac.."); .resideInAnyPackage("..test.pac..", "..journal..");
@ArchTest @ArchTest
@SuppressWarnings("unused") @SuppressWarnings("unused")
@@ -174,6 +175,7 @@ public class ArchitectureTest {
"..hs.office.(*)..", "..hs.office.(*)..",
"..hs.booking.(*)..", "..hs.booking.(*)..",
"..hs.hosting.(*)..", "..hs.hosting.(*)..",
"..credentials..",
"..hs.scenarios", "..hs.scenarios",
"..hs.migration", "..hs.migration",
"..rbacgrant" // TODO.test: just because of RbacGrantsDiagramServiceIntegrationTest "..rbacgrant" // TODO.test: just because of RbacGrantsDiagramServiceIntegrationTest

View File

@@ -11,10 +11,10 @@ import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Import;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.context.bean.override.mockito.MockitoBean;
import org.springframework.transaction.annotation.Transactional;
import jakarta.persistence.PersistenceException; import jakarta.persistence.PersistenceException;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.transaction.Transactional;
import java.util.UUID; import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;