-
Notifications
You must be signed in to change notification settings - Fork 0
Implement FF Gateway communication #436
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
Open
Matthbo
wants to merge
21
commits into
master
Choose a base branch
from
feat/hazelcast-integration
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
3dd7005
feat: initial working hazelcast integration. localgateway working, ou…
stijnpotters1 25a68a7
fix: improved code to prefinal version
stijnpotters1 5dffdfe
fix: improved hazelcast connection logic
stijnpotters1 56d07dc
fix: improved LocalGateway logic, added tests and improved code more
stijnpotters1 e2b4642
Replace hazelcast implementation with Console-like one
Matthbo ac43c07
Update security
Matthbo 56c0bb0
Make flow and framework detect each other
Matthbo 3cdcd13
Attempt to send message to framework
Matthbo f905469
Move UserContext logic to ClientSession
Matthbo b9e5583
Tests and losing my mind
Matthbo d53d27a
Fix gateway communication and show in frontend
Matthbo 4760c56
Fix issues
Matthbo d3e5fed
copilot feedback & test fixes
Matthbo 9150f6f
Spotless
Matthbo dbb6b20
More test fixes
Matthbo 389934e
Use both central & ff nexus repositories
Matthbo 834709b
chore: update Java version to 25 in CI configurations
philipsens 9dd5e9f
Update dependencies
Matthbo de088bb
Merge branch 'master' into feat/hazelcast-integration
Matthbo 5e81b38
Also update frontend packages
Matthbo 70f1454
Fix linting dependency
Matthbo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,7 @@ on: | |
| branches: [ master ] | ||
|
|
||
| env: | ||
| JAVA_VERSION: 21 | ||
| JAVA_VERSION: 25 | ||
| NODE_VERSION: 23 | ||
| PNPM_VERSION: 10.4.0 | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <component name="ProjectRunConfigurationManager"> | ||
| <configuration default="false" name="Flow Hazelcast Cluster" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker"> | ||
| <deployment type="docker-compose.yml"> | ||
| <settings> | ||
| <option name="removeImagesOnComposeDown" value="LOCAL" /> | ||
| <option name="sourceFilePath" value="flow-framework-compose.yml" /> | ||
| </settings> | ||
| </deployment> | ||
| <method v="2"> | ||
| <option name="Maven.BeforeRunTask" enabled="true" file="$PROJECT_DIR$/pom.xml" goal="package" /> | ||
| </method> | ||
| </configuration> | ||
| </component> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| <Configuration> | ||
| <adapter name="HelloWorld"> | ||
| <receiver name="HelloWorld"> | ||
| <!-- This listener is used when the API is called as specified in OpenAPI 3.0 at the Webservices page --> | ||
| <listener | ||
| name="HelloWorld" | ||
| className="org.frankframework.http.rest.ApiListener" | ||
| uriPattern="hello-world" | ||
| allowAllParams="false" | ||
| /> | ||
| </receiver> | ||
| <receiver name="HelloWorld"> | ||
| <!-- This listener is used by the scheduler and IbisLocalSender in adapter HelloWorlds --> | ||
| <listener | ||
| name="HelloWorld" | ||
| className="org.frankframework.receivers.JavaListener" | ||
| /> | ||
| </receiver> | ||
| <pipeline firstPipe="HelloWorld"> | ||
| <exits> | ||
| <exit name="EXIT" state="success"/> | ||
| </exits> | ||
| <pipe | ||
| name="HelloWorld" | ||
| className="org.frankframework.pipes.EchoPipe" | ||
| getInputFromFixedValue="Hello World" | ||
| > | ||
| <forward name="success" path="EXIT"/> | ||
| </pipe> | ||
| </pipeline> | ||
| </adapter> | ||
| </Configuration> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| jdbc: | ||
| - name: "frank2flowinstance" | ||
| type: "org.h2.jdbcx.JdbcDataSource" | ||
| url: "jdbc:h2:mem:test;NON_KEYWORDS=VALUE;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;TRACE_LEVEL_FILE=0;" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| services: | ||
| flow: | ||
| image: ghcr.io/frankframework/flow:latest | ||
| build: | ||
| dockerfile: ./docker/Dockerfile | ||
| context: . | ||
| environment: | ||
| SPRING_PROFILES_ACTIVE: cloud | ||
| management.gateway.outbound.class: org.frankframework.management.gateway.HazelcastOutboundGateway | ||
| ports: | ||
| - "8080:8080" | ||
| - "5700-5709:5700-5709" | ||
|
|
||
| ff-test: | ||
| image: frankframework/frankframework:latest | ||
| ports: | ||
| - "8081:8080" | ||
| - "5710-5720:5700-5710" | ||
| volumes: | ||
| - ./docker/resources:/opt/frank/resources | ||
| environment: | ||
| - instance.name=Frank2FlowInstance | ||
| - dtap.stage=LOC | ||
| - management.gateway.inbound.class=org.frankframework.management.gateway.HazelcastInboundGateway,org.frankframework.management.bus.LocalGateway | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.