Skip to content

Dev/add functionality #21

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.

Sign up for GitHub

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

Open
vasharapov wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Dev/add functionality #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d1a4fc7
Added functionality
vasharapov Aug 10, 2023
e4e5ed7
Adding license findings via GitHub Actions
actions-user Aug 10, 2023
53df00d
Reset
vasharapov Aug 11, 2023
d80eeca
Adding license findings via GitHub Actions
actions-user Aug 11, 2023
12eb715
Added functionality
vasharapov Aug 11, 2023
ced9030
Added functionality
vasharapov Aug 11, 2023
203c8ba
Added functionality
vasharapov Aug 11, 2023
e144310
Adding license findings via GitHub Actions
actions-user Aug 14, 2023
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
67 changes: 67 additions & 0 deletions .snippet-licenses/src_main_c_analyze-blame-snippet-analysys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
{
"snippetMatches": {
"RECIPROCAL": [
{
"projectName": "systemd",
"releaseVersion": "251-rc2",
"licenseDefinition": {
"name": "GNU General Public License v2.0 only",
"spdxId": "GPL-2.0",
"ownership": "OPEN_SOURCE",
"licenseDisplayName": "GNU General Public License v2.0 only"
},
"matchedFilePath": "/systemd-e654d4316c19bb09c397d0a36c7692b4a1944887/src/analyze/analyze-blame.c",
"regions": {
"sourceStartLines": [
1
],
"sourceEndLines": [
60
],
"matchedStartLines": [
1
],
"matchedEndLines": [
56
]
}
}
],
"WEAK_RECIPROCAL": [
{
"projectName": "systemd",
"releaseVersion": "251~rc1",
"licenseDefinition": {
"name": "GNU Lesser General Public License v2.1 or later",
"spdxId": "LGPL-2.1+",
"ownership": "OPEN_SOURCE",
"licenseDisplayName": "GNU Lesser General Public License v2.1 or later"
},
"matchedFilePath": "/systemd-251~rc1/src/analyze/analyze-blame.c",
"regions": {
"sourceStartLines": [
1
],
"sourceEndLines": [
60
],
"matchedStartLines": [
1
],
"matchedEndLines": [
56
]
}
}
]
},
"_meta": {
"href": "https://snippet-matching-service.saas-staging.blackduck.com/api/snippet-matching",
"links": [
{
"rel": "licenses-description",
"href": "https://www.synopsys.com/glossary/what-are-open-source-licenses.html"
}
]
}
}
90 changes: 90 additions & 0 deletions .snippet-licenses/src_main_java_ReactorBdioDocument-snippet-analysys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
{
"snippetMatches": {
"PERMISSIVE": [
{
"projectName": "blackducksoftware/bdio",
"releaseVersion": "3.0.0-beta.15",
"licenseDefinition": {
"name": "Apache License 2.0",
"spdxId": "Apache-2.0",
"ownership": "OPEN_SOURCE",
"licenseDisplayName": "Apache License 2.0"
},
"matchedFilePath": "/bdio-904f601dc79971c048fdd69539b4c9c3ec51994b/bdio-reactor/src/main/java/com/blackducksoftware/bdio2/reactor/ReactorBdioDocument.java",
"regions": {
"sourceStartLines": [
1
],
"sourceEndLines": [
57
],
"matchedStartLines": [
16
],
"matchedEndLines": [
77
]
}
},
{
"projectName": "blackducksoftware/bdio",
"releaseVersion": "3.0.0-beta.2",
"licenseDefinition": {
"name": "Apache License 2.0",
"spdxId": "Apache-2.0",
"ownership": "OPEN_SOURCE",
"licenseDisplayName": "Apache License 2.0"
},
"matchedFilePath": "/bdio-6aab230f0f00bcb793fd5fe46690af686fb08683/bdio-reactor/src/main/java/com/blackducksoftware/bdio2/reactor/ReactorBdioDocument.java",
"regions": {
"sourceStartLines": [
1
],
"sourceEndLines": [
57
],
"matchedStartLines": [
16
],
"matchedEndLines": [
77
]
}
},
{
"projectName": "blackducksoftware/bdio",
"releaseVersion": "3.0.0-beta.42",
"licenseDefinition": {
"name": "Apache License 2.0",
"spdxId": "Apache-2.0",
"ownership": "OPEN_SOURCE",
"licenseDisplayName": "Apache License 2.0"
},
"matchedFilePath": "/bdio-c04c78cdab6572729f90046169fa0a2e83e12dca/bdio-reactor/src/main/java/com/blackducksoftware/bdio2/reactor/ReactorBdioDocument.java",
"regions": {
"sourceStartLines": [
1
],
"sourceEndLines": [
57
],
"matchedStartLines": [
16
],
"matchedEndLines": [
77
]
}
}
]
},
"_meta": {
"href": "https://snippet-matching-service.saas-staging.blackduck.com/api/snippet-matching",
"links": [
{
"rel": "licenses-description",
"href": "https://www.synopsys.com/glossary/what-are-open-source-licenses.html"
}
]
}
}
4 changes: 4 additions & 0 deletions src/main/c/analyze-blame.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ int verb_blame(int argc, char *argv[], void *userdata) {
if (r < 0)
return r;

r = table_set_summary(table, 0, true);
if (r < 0)
return r;

for (UnitTimes *u = times; u->has_data; u++) {
if (u->time <= 0)
continue;
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/ReactorBdioDocument.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,19 @@ public Flux<BdioMetadata> metadata(Publisher<Object> inputs) {
.reduce(new BdioMetadata(), BdioMetadata::merge)
.flux();
}

@Override
public Flux<Map<String, Object>> frame(Object frame) {
return identity().compose(inputs -> inputs.flatMap(input -> {
try {
// TODO The RxJava implementation has multiple workarounds, why are they not here?
return Flux.just(JsonLdProcessor.frame(input, frame, options));
} catch (JsonLdError e) {
return Flux.error(e);
}
}));
}


}