master merge resolved merge conflicts

.github/workflows/build-on-pull-request.yml

@@ -2,7 +2,7 @@ name: Build On Pull Request
 on:
   pull_request:
     branches: [ "master","develop" ]
-
+    
 jobs:
   Build:
     runs-on: ubuntu-latest

.gitignore

@@ -52,4 +52,4 @@ mvnw.cmd
 .sts4-cache
 mvnw
 
-src/main/environment/common_local.properties
+src/main/environment/common_local.properties

CODE_OF_CONDUCT.md

@@ -60,9 +60,7 @@ representative at an online or offline event.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[email protected].
-All complaints will be reviewed and investigated promptly and fairly.
+reported to the community leaders responsible for enforcement at [email protected]. All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
 reporter of any incident.

bin/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,30 @@
+# Description
+
+Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.  
+
+# Type of change  
+
+- [ ] Bug fix  
+- [ ] New feature  
+- [ ] Enhancement  
+- [ ] Refactoring  
+- [ ] Documentation  
+- [ ] Other ( please specify )  
+
+# How Has This Been Tested?
+
+Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.
+
+- [ ] Test A
+- [ ] Test B
+
+# Checklist:
+
+- [ ] My code follows the style guidelines of this project
+- [ ] I have performed a self-review of my own code
+- [ ] I have commented my code, particularly in hard-to-understand areas
+- [ ] I have made corresponding changes to the documentation
+- [ ] My changes generate no new warnings
+- [ ] Any dependent changes have been merged and published in downstream modules
+
+

bin/.github/workflows/build-on-pull-request.yml

@@ -0,0 +1,22 @@
+name: Build On Pull Request
+on:
+  pull_request:
+    branches: [ "master","develop" ]
+
+jobs:
+  Build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+
+      - name: Setup JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: 8
+          distribution: 'adopt'
+      - name: Build with Maven
+        run: mvn clean install

bin/.github/workflows/package-prod.yml

@@ -0,0 +1,42 @@
+name: Package-prod
+
+on:
+  push:
+    branches: [ "master"]
+    paths-ignore:
+     - target/**
+     - dist/**
+  pull_request:
+     branches: [ "master" ]
+     paths-ignore:
+     - target/**
+     - dist/**
+
+env:
+  ENV_VAR: prod
+
+jobs:
+  Package-prod:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Create WAR file 
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: HWC-API
+        path: target/hwc-facility-service.war

bin/.github/workflows/package.yml

@@ -0,0 +1,42 @@
+name: Package
+
+on:
+  push:
+    branches: [ "develop"]
+    paths-ignore:
+     - target/**
+     - dist/**
+  pull_request:
+     branches: [ "develop" ]
+     paths-ignore:
+     - target/**
+     - dist/**
+
+env:
+  ENV_VAR: test
+
+jobs:
+  Package-test:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout code 
+      uses: actions/checkout@v2
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: 8
+        distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
+
+    - name: Build WAR file
+      run: mvn -B package --file pom.xml
+
+    - name: Upload WAR file as artifact
+      uses: actions/upload-artifact@v2 
+      with:
+        name: HWC-API
+        path: target/hwc-facility-service.war

bin/.github/workflows/sast.yml

@@ -0,0 +1,51 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+  pull_request:
+    branches: [ "develop" ]
+    paths-ignore:
+     - target/**
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+
+    - name: Setup JDK 8
+      uses: actions/setup-java@v2
+      with:
+          java-version: 8
+          distribution: 'adopt'
+
+    - name: Build with Maven
+      run: mvn clean install
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

bin/.gitignore

@@ -0,0 +1,55 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+/target
+/logs
+
+.factorypath
+
+# dependencies
+/node_modules
+
+# IDEs and editors
+/.idea
+.springBeans
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+/.vscode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+testem.log
+/typings
+
+# e2e
+/e2e/*.js
+/e2e/*.map
+
+# System Files
+.DS_Store
+Thumbs.db
+
+# Additional files to ignore
+mvnw.cmd
+.sts4-cache
+mvnw
+
+src/main/environment/common_local.properties

bin/.java-version

@@ -0,0 +1 @@
+1.8