fixup api-docs (#121)

* fixup api-docs

now contain the correct paths

* add unit test

Author: skykanin

.gitignore

@@ -17,3 +17,6 @@ private/
 http-client.private.env.json
 # Environment files should not be checked into git
 *.env.json
+
+.direnv/
+.envrc

Makefile

@@ -10,7 +10,7 @@ build-all: build-mvn build-docker ## Build all and create docker image
 
 .PHONY: build-mvn
 build-mvn: ## Build project and install to you local maven repo
-	./mvnw clean install -P ssb-bip
+	mvn clean install -Dmaven.test.skip
 
 .PHONY: build-docker
 build-docker: ## Build dev docker image
@@ -32,7 +32,7 @@ run-local: validate-local-config
 
 .PHONY: release-dryrun
 release-dryrun: ## Simulate a release in order to detect any issues
-	./mvnw release:prepare release:perform -Darguments="-Dmaven.deploy.skip=true" -DdryRun=true
+	mvn release:prepare release:perform -Darguments="-Dmaven.deploy.skip=true" -DdryRun=true
 
 .PHONY: release
 release: ## Release a new version. Update POMs and tag the new version in git

conf/application-local.yml

@@ -2,6 +2,7 @@ micronaut:
   application:
     name: my-pseudo-service
   server:
+    host: 127.0.0.1
     port: 10210
     cors:
       enabled: true

flake.lock

@@ -0,0 +1,27 @@
+{
+  description = "Dapla pseudo service";
+
+  inputs = {
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  };
+
+  outputs = inputs @ {flake-parts, ...}:
+    flake-parts.lib.mkFlake {inherit inputs;} {
+      systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"];
+      perSystem = {
+        config,
+        self',
+        inputs',
+        pkgs,
+        system,
+        ...
+      }: {
+        devShells.default = pkgs.mkShell {
+          name = "dapla-pseudo-service";
+          packages = with pkgs; [gnumake maven openjdk];
+        };
+        formatter = pkgs.alejandra;
+      };
+    };
+}

flake.nix

@@ -1,7 +1,9 @@
-micronaut.openapi.views.spec = mapping.path=/,\
+micronaut.openapi.views.spec = \
+  mapping.path=/api-docs/,\
   swagger-ui.enabled=true,\
+  swagger-ui.js.url=/api-docs/swagger-ui/res/,\
   redoc.enabled=true,\
   redoc.description=blah,\
-  openapi-explorer.enabled=true,\
-  rapidoc.enabled=true
-micronaut.openapi.server.context.path=/api-docs
+  redoc.js.url=/api-docs/redoc/res/,\
+  rapidoc.enabled=true,\
+  rapidoc.js.url=/api-docs/rapidoc/res/,

openapi.properties

@@ -18,7 +18,11 @@
                 title = "Dapla Pseudo Service",
                 version = "1.0",
                 description = "Endpoints that support pseudonymization and depseudonymization of data and datasets",
-                contact = @Contact(url = "https://statistics-norway.atlassian.net/wiki/spaces/PSEUDO", name = "Team Skyinfrastruktur", email = "team-skyinfrastruktur@ssb.no")
+                contact = @Contact(
+                        url = "https://statistics-norway.atlassian.net/wiki/spaces/PSEUDO",
+                        name = "Team Statistikktjenester",
+                        email = "team-statistikktjenester@ssb.no"
+                )
         ),
         security = @SecurityRequirement(name = "Keycloak token"),
         servers = {

src/main/java/no/ssb/dlp/pseudo/service/Application.java

@@ -0,0 +1,16 @@
+package no.ssb.dlp.pseudo.service.docs;
+
+import io.micronaut.core.io.ResourceLoader;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+@MicronautTest(startApplication = false)
+class OpenApiGeneratedTest {
+
+    @Test
+    void buildGeneratesOpenApi(ResourceLoader resourceLoader) {
+        assertTrue(resourceLoader.getResource("META-INF/swagger/dapla-pseudo-service-1.0.yml").isPresent());
+    }
+}