Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT MERGE test #81

Closed
wants to merge 70 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
5fa90e7
Move the purgeRepository function from the G2Engine API to the G2Diag…
jaeadams Apr 11, 2023
7514fd7
Merge pull request #26 from Senzing/issue-25.jae.1
jaeadams Apr 11, 2023
f9a2f6e
Remove LoadID from the API functions.
jaeadams Apr 13, 2023
c40067b
Merge pull request #28 from Senzing/issue-27.jae.1
jaeadams Apr 13, 2023
3235090
Add a new flag bitmask, for use with the getVirtualEntity functions. …
jaeadams Apr 28, 2023
b6ab44a
Merge pull request #30 from Senzing/issue-29.jae.1
jaeadams Apr 28, 2023
dcfe4ac
Add two new engine flags, from the engine API.
jaeadams May 3, 2023
06f1a62
Add a new control flag for the G2 engine, for getting match-info on e…
jaeadams May 8, 2023
3b69add
Merge branch 'main' into develop-g2v4.0
jaeadams Jul 11, 2023
a9d56bf
Add a new engine control flag for showing network entity links.
jaeadams Jul 11, 2023
72c6669
Merge branch 'main' into develop-g2v4.0
jaeadams Oct 20, 2023
f066ba0
Update the engine flags/bitmasks, and remove the whyEntityBy functions.
jaeadams Dec 29, 2023
84f8018
Add in new/missing engine flag definitions.
jaeadams Jan 7, 2024
494180f
Merge branch 'main' into develop-g2v4.0
jaeadams Feb 27, 2024
351ca45
Update the Java API to reflect recent changes in the C++ engine API.
jaeadams Mar 6, 2024
4f3a4df
Changes to ignore .vscode directory and VSCode .project changes
barrycaceres Mar 20, 2024
0d7d924
Interim commit for v4 (compiles)
barrycaceres Mar 27, 2024
bd9d124
Interim commit for v4 (compiles)
barrycaceres Mar 28, 2024
6e49191
Interim commit with test harness
barrycaceres Apr 3, 2024
4d2ab4e
Completed test harness integration and tests for SzCoreProviderTest a…
barrycaceres Apr 3, 2024
e2c2f38
Added SzProduct implementation with tests
barrycaceres Apr 3, 2024
93ac176
Fixed SDK reference and changed to Provider
barrycaceres Apr 4, 2024
7a3e96e
Removed thread execution pool from core provider
barrycaceres Apr 4, 2024
b17c5d5
Interim commit for SzConfigManager implementation
barrycaceres Apr 5, 2024
8e4f997
Added diagnostic implementation. Added SzReplaceConflictException an…
barrycaceres Apr 5, 2024
a819a48
Renamed SzProvider to SzEnvironment. Removed base SzProvided interface.
barrycaceres Apr 9, 2024
bc5c30b
Added flags logic with tests
barrycaceres Apr 15, 2024
e7f8bd2
Added reinitialize() and getActiveConfigId()
barrycaceres Apr 17, 2024
82b7bb0
Interim commit before trimming SzEngine
barrycaceres Apr 23, 2024
5995c3c
#50 cleanup and add maven build
kernelsam Apr 23, 2024
36bdcfa
#50 test dep submission
kernelsam Apr 23, 2024
03004d0
test
kernelsam Apr 23, 2024
915544d
test
kernelsam Apr 23, 2024
476c357
lint all
kernelsam Apr 24, 2024
b135760
test checkstyle and google java format
kernelsam Apr 24, 2024
6b551d7
testing
kernelsam Apr 24, 2024
247d536
test
kernelsam Apr 24, 2024
bc6c891
Interim commit -- SzEngine interface complete
barrycaceres Apr 24, 2024
5c9ffc2
Interim commit. Compiles with SzCoreEngine implementation
barrycaceres May 4, 2024
dd552a8
ignore line length and left curly
kernelsam May 9, 2024
6bab9b7
Interim commit
barrycaceres May 9, 2024
fe564f4
add jacoco config
kernelsam May 9, 2024
955b315
Merge branch 'caceres-g2v4.0' into 50-skern
kernelsam May 9, 2024
b9ea685
install senzing
kernelsam May 9, 2024
8fb7e4a
switch to string
kernelsam May 9, 2024
3f71379
remove duplicate definition
kernelsam May 9, 2024
0ba14b3
ignore test failures
kernelsam May 9, 2024
1217a17
test
kernelsam May 9, 2024
0e370e0
update permissions
kernelsam May 9, 2024
a7a6c4d
update path
kernelsam May 9, 2024
e89fb95
update path
kernelsam May 9, 2024
ee67cf1
update format
kernelsam May 9, 2024
f163854
switch to xml
kernelsam May 9, 2024
8013346
debug jacoco
kernelsam May 9, 2024
f2a2384
debug jacoco
kernelsam May 9, 2024
649edc4
update data path
kernelsam May 13, 2024
f2aad8c
skip errors for testing
kernelsam May 13, 2024
62a9e60
cleanup
kernelsam May 13, 2024
57e095f
test openclover
kernelsam May 13, 2024
14fc0ef
test ignore
kernelsam May 13, 2024
1d6c109
increase logging, ignore utilites
kernelsam May 13, 2024
76f8adc
test
kernelsam May 13, 2024
9e9b075
formatter test
kernelsam May 13, 2024
5d99c2e
update clover path
kernelsam May 13, 2024
2838b38
debug
kernelsam May 13, 2024
c12b9e7
debug
kernelsam May 13, 2024
d79dc95
add bearer
kernelsam May 13, 2024
2ffdb2b
add platforms, update bearer, cleanup
kernelsam May 14, 2024
7fe0fd6
test
kernelsam May 14, 2024
b1533fd
cleanup
kernelsam May 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/bearer.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

name: bearer

on:
push:

permissions:
contents: read

jobs:
rule_check:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4

- name: Bearer
uses: bearer/bearer-action@v2
58 changes: 58 additions & 0 deletions .github/workflows/maven-darwin.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: maven darwin

on: [pull_request, workflow_dispatch]

permissions:
contents: read
pull-requests: write

jobs:
maven-darwin:
runs-on: macos-latest
strategy:
matrix:
include:
- java-version: "17"
java-distribution: "temurin"
senzingapi-version: "staging-v4"

steps:
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: ${{ matrix.java-distribution }}

- name: install Senzing API
uses: senzing-factory/github-action-install-senzing-api@v3
with:
senzingapi-version: ${{ matrix.senzingapi-version }}

- name: Build with Maven
run: |
mvn clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Pjacoco -Djacoco.haltOnFailure=false -Djacoco.ignoreFailture=true -Dsenzing.support.dir="/opt/senzing/data"

- name: Jacoco Report to PR
id: jacoco
uses: madrapps/[email protected]
with:
paths: ${{ github.workspace }}/target/site/**/*.xml
token: ${{ secrets.GITHUB_TOKEN }}
#min-coverage-overall: 80
#min-coverage-changed-files: 80
title: Code Coverage
update-comment: true
skip-if-no-changes: true
pass-emoji: ':green_circle:'
fail-emoji: ':red_circle:'

- name: Fail PR if overall coverage is less than 80%
if: ${{ steps.jacoco.outputs.coverage-overall < 80.0 }}
uses: actions/github-script@v6
with:
script: |
core.setFailed('Overall coverage is less than 80%!')
26 changes: 26 additions & 0 deletions .github/workflows/maven-dependency-review.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: maven dependency review

on:
pull_request:
branches: [main]

permissions:
contents: read

jobs:
dependency-submission-maven:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- java-version: "17"
java-distribution: "temurin"

steps:
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: 'Dependency Review'
uses: actions/dependency-review-action@v4
62 changes: 62 additions & 0 deletions .github/workflows/maven-linux.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
name: maven linux

on:
push:
branches-ignore: [main]
pull_request:
branches: [main]

permissions:
contents: read
pull-requests: write

jobs:
maven-linux:
runs-on: ubuntu-latest
strategy:
matrix:
include:
- java-version: "17"
java-distribution: "temurin"
senzingapi-runtime-version: "staging-v4"

steps:
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: ${{ matrix.java-distribution }}

- name: install Senzing API
uses: senzing-factory/github-action-install-senzing-api@v3
with:
senzingapi-runtime-version: ${{ matrix.senzingapi-runtime-version }}

- name: Build with Maven
run: |
mvn clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Pcheckstyle,jacoco,spotbugs -Djacoco.haltOnFailure=false -Djacoco.ignoreFailture=true -Dsenzing.support.dir="/opt/senzing/data"

- name: Jacoco Report to PR
id: jacoco
uses: madrapps/[email protected]
with:
paths: ${{ github.workspace }}/target/site/**/*.xml
token: ${{ secrets.GITHUB_TOKEN }}
#min-coverage-overall: 80
#min-coverage-changed-files: 80
title: Code Coverage
update-comment: true
skip-if-no-changes: true
pass-emoji: ':green_circle:'
fail-emoji: ':red_circle:'

- name: Fail PR if overall coverage is less than 80%
if: ${{ steps.jacoco.outputs.coverage-overall < 80.0 }}
uses: actions/github-script@v6
with:
script: |
core.setFailed('Overall coverage is less than 80%!')
58 changes: 58 additions & 0 deletions .github/workflows/maven-windows.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: maven windows

on: [pull_request, workflow_dispatch]

permissions:
contents: read
pull-requests: write

jobs:
maven-windows:
runs-on: windows-latest
strategy:
matrix:
include:
- java-version: "17"
java-distribution: "temurin"
senzingapi-version: "staging-v4"

steps:
- name: checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java-version }}
distribution: ${{ matrix.java-distribution }}

- name: install Senzing API
uses: senzing-factory/github-action-install-senzing-api@v3
with:
senzingapi-version: ${{ matrix.senzingapi-version }}

- name: Build with Maven
run: |
mvn clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -Pjacoco -Djacoco.haltOnFailure=false -Djacoco.ignoreFailture=true -Dsenzing.support.dir="/opt/senzing/data"

- name: Jacoco Report to PR
id: jacoco
uses: madrapps/[email protected]
with:
paths: ${{ github.workspace }}/target/site/**/*.xml
token: ${{ secrets.GITHUB_TOKEN }}
#min-coverage-overall: 80
#min-coverage-changed-files: 80
title: Code Coverage
update-comment: true
skip-if-no-changes: true
pass-emoji: ':green_circle:'
fail-emoji: ':red_circle:'

- name: Fail PR if overall coverage is less than 80%
if: ${{ steps.jacoco.outputs.coverage-overall < 80.0 }}
uses: actions/github-script@v6
with:
script: |
core.setFailed('Overall coverage is less than 80%!')
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,6 @@ target/*
*.iml

.history
.vscode


30 changes: 30 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -1,4 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>g2-sdk-java</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<filteredResources>
<filter>
<id>1710975049678</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
# g2-sdk-java

If you are beginning your journey with
[Senzing](https://senzing.com/),
please start with
[Senzing Quick Start guides](https://docs.senzing.com/quickstart/).
If you are beginning your journey with [Senzing],
please start with [Senzing Quick Start guides].

You are in the
[Senzing Garage](https://github.com/senzing-garage)
You are in the [Senzing Garage]
where projects are "tinkered" on.
Although this GitHub repository may help you understand an approach to using Senzing,
it's not considered to be "production ready" and is not considered to be part of the Senzing product.
Expand All @@ -31,3 +28,7 @@ mvn install

The JAR file will be contained in the `target` directory under the
name `g2.jar`.

[Senzing]: https://senzing.com/
[Senzing Garage]: https://github.com/senzing-garage
[Senzing Quick Start guides]: https://docs.senzing.com/quickstart/
10 changes: 10 additions & 0 deletions checkstyle-suppressions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0"?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.0//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">

<suppressions>
<suppress checks="LeftCurly" files="."/>
<suppress checks="LineLength" files="."/>
</suppressions>
Loading
Loading