Updated project structure (!9)

.envrc.template

+##
+# Needed to run the service
+##
+export LOG_PREFIX=
+export PWS_HOSTNAME=
+
+##
+# Needed to run the integration tests
+##
+export INTEGRATION_TESTER=
+export HOST_URL=
+export ENTITLEMENT_URL=

.fossa.yml

+# Generated by FOSSA CLI (https://github.com/fossas/fossa-cli)
+# Visit https://fossa.com to learn more
+
+version: 2
+cli:
+  server: https://app.fossa.com
+  fetcher: custom
+  project: pws
+analyze:
+  modules:
+    - name: pws-service
+      type: mvn
+      target: pom.xml
+      path: .
+    - name: pws-core
+      type: mvn
+      target: pws-core/pom.xml
+      path: .
+    - name: pws-aws
+      type: mvn
+      target: provider/pws-aws/pom.xml
+      path: .
\ No newline at end of file

.gitlab/merge_request_templates/default.md

+## All Submissions:
+-------------------------------------
+* [YES/NO] I have added an explanation of what changes in this merge do and why we should include it?
+* [YES/NO] I have updated the documentation accordingly.
+* [YES/NO/NA] I have added tests to cover my changes.
+* [YES/NO/NA] All new and existing tests passed.
+* [YES/NO/NA] My code follows the code style of this project.
+* [YES/NO/NA] I ran lint checks locally prior to submission.
+
+## What is the current behavior?
+-------------------------------------
+<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
+
+Issue: Remember to link the workitem to this pull request.
+
+
+## What is the new behavior?
+-------------------------------------
+<!-- Please describe the behavior or changes that are being added by this PR. -->
+
+-
+-
+-
+
+## Does this introduce a breaking change?
+-------------------------------------
+- [YES/NO]
+
+<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. -->
+
+## Any relevant logs, error output, etc?
+-------------------------------------
+(If it’s long, please paste to https://ghostbin.com/ and insert the link here.)
+
+
+## Other information
+-------------------------------------
+<!-- Any other information that is important to this PR such as screenshots of how the component looks before and after the change. -->

.mvn/wrapper/MavenWrapperDownloader.java

+// Copyright 2017-2019, Schlumberger
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip

pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>org.opengroup.osdu</groupId>
@@ -40,9 +42,11 @@
     <maven.compiler.source>17</maven.compiler.source>
     <docker.image.prefix>opendes</docker.image.prefix>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <os-core-common.version>0.25.0</os-core-common.version>
-    <openapi.version>1.6.14</openapi.version>
-    <spring.version>2.17.1</spring.version>
+    <spring-boot.version>3.2.2</spring-boot.version>
+    <spring-webmvc.version>6.1.3</spring-webmvc.version>
+    <slf4j.version>2.0.11</slf4j.version>
+    <spring-boot-maven-plugin.version>2.7.4</spring-boot-maven-plugin.version>
+    <git-commit-id-plugin.version>4.0.5</git-commit-id-plugin.version>
   </properties>
 
   <dependencyManagement>
@@ -50,26 +54,28 @@
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>${spring.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.opengroup.osdu</groupId>
-        <artifactId>os-core-common</artifactId>
-        <version>${os-core-common.version}</version>
+        <version>${spring-boot.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring-webmvc.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-api</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.springdoc</groupId>
-      <artifactId>springdoc-openapi-ui</artifactId>
-      <version>${openapi.version}</version>
-    </dependency>
-  </dependencies>
-
   <repositories>
     <repository>
       <id>${repo.releases.id}</id>
@@ -83,7 +89,7 @@
         <plugin>
           <groupId>org.springframework.boot</groupId>
           <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>2.7.4</version>
+          <version>${spring-boot-maven-plugin.version}</version>
           <executions>
             <execution>
               <id>build-info</id>
@@ -100,7 +106,7 @@
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
-        <version>4.0.5</version>
+        <version>${git-commit-id-plugin.version}</version>
         <executions>
           <execution>
             <goals>

provider/pws-aws/.env.template

+##### Sample pws-service .env file ###########################################################
+#
+# Basic use: duplicate this file, and make sure the new copy is also in the root of the AWS
+# 'provider' folder, and name it `.env`. Note that on macOS, by default, files starting with
+# are considered hidden system files, and are not displayed by default in Finder or the file
+# selector (which you will need to use when adding the environment file(s) to the run
+# configuration(s). While you can change a setting to show hidden files and folders by
+# default, there is also a keyboard shortcut to quickly toggle between hide/show. With either
+# Finder as the active application ("Finder" appears next to the Apple logo in the Menu Bar),
+# press: command + shift + . (period). You can store configurations for multiple environments
+# by adding more duplicates following a naming scheme of your choosing, for example:
+# `staging.env`, `uat.env`, or `local.env`.
+#
+# This requires installing a plugin to your IDE that allows you to use a .env
+# file in your repository folder (does NOT get checked into source control;
+# only the sample environment configuration (sample.env) should be committed.
+#
+# Download links for .env file plugins:
+# IntelliJ - https://github.com/Ashald/EnvFile
+
+##### Authentication / Secrets #####
+# Replace placeholder text with your own AWS secret access keys
+# and rename to `.env` - do NOT check-in .env with your credentials! Leave it in .gitignore
+AWS_ACCESS_KEY_ID=<YOUR_ACCESS_KEY_ID>
+AWS_SECRET_KEY=<YOUR_SECRET_KEY>
+
+##### URLs/Ports - these values are most likely to change between environments #############
+APPLICATION_PORT=8080
+
+##### Other environment variables ##########################################################
+ENVIRONMENT=dev
+AWS_REGION=us-east-1
+LOG_LEVEL=DEBUG
+SSM_ENABLED=True
+
+##### Integration test-specific - these are only used for integration tests, not the app ###
+AWS_COGNITO_CLIENT_ID=<YOUR_COGNITO_CLIENT_ID>
+AWS_COGNITO_AUTH_FLOW=USER_PASSWORD_AUTH
+AWS_COGNITO_AUTH_PARAMS_USER=<YOUR_AUTHORIZED_USER>
+AWS_COGNITO_AUTH_PARAMS_USER_NO_ACCESS=test-user-without-access@testing.com
+AWS_COGNITO_AUTH_PARAMS_PASSWORD=<YOUR_AUTHORIZED_USER_PASSWORD>
+AWS_S3_ENDPOINT=s3.us-east-1.amazonaws.com
+AWS_S3_REGION=us-east-1
+DYNAMO_DB_REGION=us-east-1
+DYNAMO_DB_ENDPOINT=dynamodb.us-east-1.amazonaws.com
+HOST_URL=<YOUR_API_URL>/api/legal/v1/
+S3_LEGAL_CONFIG_BUCKET=<YOUR_S3_BUCKET_NAME>
+LEGAL_QUEUE=<YOUR_LEGAL_QUEUE_URL>
+MY_TENANT=opendes
+SKIP_HTTP_TESTS=true
+TABLE_PREFIX=<YOUR_TABLE_PREFIX>
\ No newline at end of file

provider/pws-aws/lombok.config

+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
\ No newline at end of file

provider/pws-aws/pom.xml

@@ -10,14 +10,6 @@
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
-
-<!--  <parent>-->
-<!--    <groupId>org.opengroup.osdu</groupId>-->
-<!--    <artifactId>pws-service</artifactId>-->
-<!--    <version>0.1.0-SNAPSHOT</version>-->
-<!--&lt;!&ndash;    <relativePath>../../pom.xml</relativePath>&ndash;&gt;-->
-<!--  </parent>-->
-
   <artifactId>pws-aws</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
@@ -25,9 +17,9 @@
   <name>pws-aws</name>
   <description>Project and Workflow service AWS module</description>
 
-  <properties/>
-
-  <dependencyManagement/>
+  <properties>
+    <os-core-lib-aws.version>0.26.0-rc2</os-core-lib-aws.version>
+  </properties>
 
   <dependencies>
     <dependency>
@@ -35,6 +27,17 @@
       <artifactId>pws-core</artifactId>
       <version>0.1.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opengroup.osdu.core.aws</groupId>
+      <artifactId>os-core-lib-aws</artifactId>
+      <version>${os-core-lib-aws.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
   </dependencies>
 
   <build>
@@ -42,7 +45,7 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>2.7.4</version>
+        <version>${spring-boot-maven-plugin.version}</version>
         <configuration>
           <profiles>
             <profile>
@@ -70,7 +73,7 @@
             <configuration>
               <classifier>spring-boot</classifier>
               <mainClass>
-                org.opengroup.osdu.storage.provider.gcp.StorageApplicationGCP
+                org.opengroup.osdu.pws.AwsPwsApplication
               </mainClass>
             </configuration>
           </execution>

provider/pws-aws/src/main/java/org/opengroup/osdu/pws/api/HealthCheckApi.java

+package org.opengroup.osdu.pws.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.security.PermitAll;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/_ah")
+@Tag(name = "health", description = "Health related endpoints")
+public interface HealthCheckApi {
+    @Operation(summary = "${healthCheckApi.livenessCheck.summary}",
+            description = "${healthCheckApi.livenessCheck.description}", tags = {"health"})
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Legal service is alive", content = {@Content(schema = @Schema(implementation = String.class))})
+    })
+    @PermitAll
+    @GetMapping("/liveness_check")
+    ResponseEntity<String> livenessCheck();
+
+    @Operation(summary = "${healthCheckApi.readinessCheck.summary}",
+            description = "${healthCheckApi.readinessCheck.description}", tags = {"health"})
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Legal service is ready", content = {@Content(schema = @Schema(implementation = String.class))})
+    })
+    @PermitAll
+    @GetMapping("/readiness_check")
+    ResponseEntity<String> readinessCheck();
+}

provider/pws-aws/src/main/java/org/opengroup/osdu/pws/api/InfoApi.java

+package org.opengroup.osdu.pws.api;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.io.IOException;
+import org.opengroup.osdu.core.common.model.info.VersionInfo;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping
+@Tag(name = "info", description = "Version info endpoint")
+public interface InfoApi {
+    @Operation(summary = "${infoApi.info.summary}", description = "${infoApi.info.description}", tags = {"info"})
+    @ApiResponses(value = {
+            @ApiResponse(responseCode = "200", description = "Version info.", content = {@Content(schema = @Schema(implementation = VersionInfo.class))})
+    })
+    @GetMapping(value = "/info", produces = MediaType.APPLICATION_JSON_VALUE)
+    VersionInfo info() throws IOException;
+}

provider/pws-aws/src/main/resources/application-local.properties

+logging.level.org.springframework.web=${LOG_LEVEL:DEBUG}
\ No newline at end of file

provider/pws-aws/src/main/resources/application.properties

+LOG_PREFIX=pws
+
+server.servlet.contextPath=/api/pws/v1/
+logging.level.org.springframework.web=${LOG_LEVEL:INFO}
+server.port=${APPLICATION_PORT:8080}
\ No newline at end of file

provider/pws-aws/src/test/java/org/opengroup/osdu/pws/DummyTest.java

+package org.opengroup.osdu.pws;
+
+public class DummyTest {
+
+}

pws-core/lombok.config

+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true

pws-core/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -16,15 +18,13 @@
   <description>Project and Workflow service core module</description>
 
   <properties>
-    <spring-webmvc.version>5.3.22</spring-webmvc.version>
+    <springdoc-openapi-starter.version>2.3.0</springdoc-openapi-starter.version>
+    <lombok.version>1.18.30</lombok.version>
+    <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-webmvc</artifactId>
-      <version>${spring-webmvc.version}</version>
-    </dependency>
+    <!-- Spring dependencies -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-actuator</artifactId>
@@ -38,26 +38,34 @@
       <artifactId>spring-boot-starter-security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-validation</artifactId>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <version>${spring-webmvc.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.springdoc</groupId>
+      <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+      <version>${springdoc-openapi-starter.version}</version>
     </dependency>
+    <!-- PWS service common dependencies -->
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
       <optional>true</optional>
+      <version>${lombok.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.yaml</groupId>
-      <artifactId>snakeyaml</artifactId>
-      <version>2.0</version>
-    </dependency>
-
     <!-- Test Dependencies -->
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Temporary dependency. Delete after os-core-common migration to spring boot 3 -->
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -65,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>${maven-surefire-plugin.version}</version>
         <goals>
           <goal>test</goal>
         </goals>

pws-core/src/main/java/org/opengroup/osdu/pws/swagger/SwaggerConfiguration.java

+package org.opengroup.osdu.pws.swagger;
+
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.media.StringSchema;
+import io.swagger.v3.oas.models.parameters.Parameter;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.oas.models.tags.Tag;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.springdoc.core.customizers.OperationCustomizer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+@Configuration
+@Profile("!noswagger")
+public class SwaggerConfiguration {
+
+    @Autowired
+    private SwaggerConfigurationProperties swaggerConfigurationProperties;
+
+    @Bean
+    public OpenAPI customOpenAPI() {
+
+        SecurityScheme securityScheme = new SecurityScheme()
+                .type(SecurityScheme.Type.HTTP)
+                .scheme("bearer")
+                .bearerFormat("Authorization")
+                .in(SecurityScheme.In.HEADER)
+                .name("Authorization");
+        final String securitySchemeName = "Authorization";
+        SecurityRequirement securityRequirement = new SecurityRequirement().addList(securitySchemeName);
+        Components components = new Components().addSecuritySchemes(securitySchemeName, securityScheme);
+
+        OpenAPI openAPI = new OpenAPI()
+                .addSecurityItem(securityRequirement)
+                .components(components)
+                .info(apiInfo())
+                .tags(tags());
+
+        if(swaggerConfigurationProperties.isApiServerFullUrlEnabled())
+            return openAPI;
+        return openAPI
+                .servers(Arrays.asList(new Server().url(swaggerConfigurationProperties.getApiServerUrl())));
+    }
+
+    private List<Tag> tags() {
+        List<Tag> tags = new ArrayList<>();
+        tags.add(new Tag().name("pws").description("PWS related endpoints"));
+        tags.add(new Tag().name("pws-status-job").description("PWS status Job related endpoints"));
+        tags.add(new Tag().name("health").description("Health related endpoints"));
+        tags.add(new Tag().name("info").description("Version info endpoint"));
+        return tags;
+    }
+
+    private Info apiInfo() {
+        return new Info()
+            .title(swaggerConfigurationProperties.getApiTitle())
+            .description(swaggerConfigurationProperties.getApiDescription())
+            .version(swaggerConfigurationProperties.getApiVersion())
+            .license(new License().name(swaggerConfigurationProperties.getApiLicenseName())
+                .url(swaggerConfigurationProperties.getApiLicenseUrl()))
+            .contact(new Contact().name(swaggerConfigurationProperties.getApiContactName())
+                .email(swaggerConfigurationProperties.getApiContactEmail()));
+    }
+
+    @Bean
+    public OperationCustomizer operationCustomizer() {
+        return (operation, handlerMethod) -> {
+            Parameter dataPartitionId = new Parameter()
+                    .name("data-partition-id")
+                    .description("Tenant Id")
+                    .in("header")
+                    .required(true)
+                    .schema(new StringSchema());
+            return operation.addParametersItem(dataPartitionId);
+        };
+    }
+}
\ No newline at end of file

pws-core/src/main/java/org/opengroup/osdu/pws/swagger/SwaggerConfigurationProperties.java

+package org.opengroup.osdu.pws.swagger;
+
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "swagger")
+public class SwaggerConfigurationProperties {
+
+    private String apiTitle;
+    private String apiDescription;
+    private String apiVersion;
+    private String apiContactName;
+    private String apiContactEmail;
+    private String apiLicenseName;
+    private String apiLicenseUrl;
+    private String apiServerUrl;
+    private boolean apiServerFullUrlEnabled;
+
+}
\ No newline at end of file