-
Notifications
You must be signed in to change notification settings - Fork 0
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
[TH2-2806] Initial commit #1
Open
tatianavvedenskaya
wants to merge
49
commits into
master
Choose a base branch
from
TH2-2806
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
49 commits
Select commit
Hold shift + click to select a range
28e091f
[TH2-2806] Initial commit
f7a5c78
[TH2-2806] Creating a special assembly
014a399
[TH2-2806] Creating a special assembly
2d9c752
[TH2-2806] Creating a special assembly
94b9dbd
[TH2-2806] Update build.gradle, Dockerfile, gradle.properties, fixes …
9a46dd9
[TH2-2806] Fixes build.gradle, PillarHandler, PillarHandlerFactory, P…
b1b0def
[TH2-2806] Fixes PillarHandler, PillarMessageDecoder, PillarMessageEn…
a66f17f
[TH2-2806] Changing project name
9cf14bf
[TH2-2806] Changing project name
37b28fc
Update build.gradle
tatianavvedenskaya e74d600
Update build.gradle
b4b8450
Update build.gradle
tatianavvedenskaya 23c676d
Update PillarHandlerFactory.kt
tatianavvedenskaya 0a9437c
[TH2-2806]Update build.gradle
tatianavvedenskaya ee991ef
[TH2-2806] Update build.gradle, PillarHandler.kt, PillarHandlerFacto…
3d2d143
[TH2-2806] Update PillarHandlerFactory.kt
917db07
[TH2-2806] fixed build.gradle, TestHandler.kt
50538bb
[TH2-2806] Fixed PillarHandler.kt
tatianavvedenskaya 4800b3b
[TH2-2806] Fixed PillarHandler.kt
b53d358
[TH2-2806] Fixed PillarHandler.kt, TestHandler.kt
b7ca861
[TH2-2806] Fixed PillarHandler.kt, PillarMessageDecoder.kt, PillarMes…
6d3a33a
[TH2-2806] Add reconnect
04d981c
[TH2-2806] Fixed reconnect
30229cf
[TH2-2806] Fixed heartbeat
4b2637e
[TH2-2806] Fixed heartbeat, decoder
c138580
[TH2-2806] Fixed PillarHandler, TestHandler
4f3463c
[TH2-2806] Fixed PillarHandler
tatianavvedenskaya ce87b1e
[TH2-2806] Fixed PillarHandler, PillarMessageDecoder, TestHandler
664a853
[TH2-2806] Fixed State
829493b
[TH2-2806] Fixed PillarHandler
tatianavvedenskaya 13536f3
[TH2-2806] Fixed PillarHandler
0de0d39
[TH2-2806] Fixed PillarHandler, TestHandler
6476151
[TH2-2806] Fixed PillarMessageEncoder
tatianavvedenskaya b672813
[TH2-2806] Fixed PillarHandler
30e390f
[TH2-2806] Fixed PillarHandler
tatianavvedenskaya a4b7199
[TH2-2806] Fixed PillarHandler, PillarMessageDecoder
34465f8
[TH2-2806] Fixed PillarHandler
tatianavvedenskaya a4025aa
[TH2-2806] Fixed PillarHandler
ea93355
[TH2-2806] Fixed PillarHandler, PillarMessageEncoder, TestHandler
ed59ab7
[TH2-2806] Plugin changes
9979c7b
[TH2-2806] Plugin changes, fixed onOutgoing and onIncoming in handler…
906c695
Fixed test
99240ea
[TH2-2806] Fixed open and close stream, encode and decode SeqMsg
e113646
[TH2-2806] Plugin changes
322b803
[TH2-2806] Fixed encoder
eb4252b
[TH2-2806] Fixed handler
fe2edab
[TH2-2806] Fixed open and close session
570867d
[TH2-2806] Fixed test
tatianavvedenskaya 195a182
[TH2-2806] Fixed onReceive and seqNum
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 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,23 @@ | ||
name: CI | ||
|
||
on: | ||
pull_request: | ||
|
||
jobs: | ||
test: | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
with: | ||
ref: ${{ github.sha }} | ||
- name: Checkout tool | ||
uses: actions/checkout@v2 | ||
with: | ||
repository: exactpro-th2/ci-github-action | ||
ref: master | ||
token: ${{ secrets.PAT_CI_ACTION }} | ||
path: ci-github-action | ||
- name: Run CI action | ||
uses: ./ci-github-action | ||
with: | ||
ref: ${{ github.sha }} |
This file contains 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,47 @@ | ||
name: Dev build and publish Docker distributions to Github Container Registry ghcr.io | ||
|
||
on: | ||
push: | ||
branches-ignore: | ||
- master | ||
- version-* | ||
paths-ignore: | ||
- README.md | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
# Prepare custom build version | ||
- name: Get branch name | ||
id: branch | ||
run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/} | ||
- name: Get release_version | ||
id: ver | ||
uses: christian-draeger/[email protected] | ||
with: | ||
path: gradle.properties | ||
property: release_version | ||
- name: Build custom release version | ||
id: release_ver | ||
run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}" | ||
- name: Show custom release version | ||
run: echo ${{ steps.release_ver.outputs.value }} | ||
# Build and publish image | ||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v1 | ||
- uses: docker/login-action@v1 | ||
with: | ||
registry: ghcr.io | ||
username: ${{ github.repository_owner }} | ||
password: ${{ secrets.CR_PAT }} | ||
- run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" | ||
id: meta | ||
- name: Build and push | ||
id: docker_build | ||
uses: docker/build-push-action@v2 | ||
with: | ||
push: true | ||
tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }} | ||
labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} |
This file contains 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,37 @@ | ||
name: Build and publish Docker distributions to Github Container Registry ghcr.io | ||
|
||
on: | ||
push: | ||
branches: | ||
- master | ||
- version-* | ||
paths: | ||
- gradle.properties | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-20.04 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
- name: Set up Docker Buildx | ||
uses: docker/setup-buildx-action@v1 | ||
- uses: docker/login-action@v1 | ||
with: | ||
registry: ghcr.io | ||
username: ${{ github.repository_owner }} | ||
password: ${{ secrets.CR_PAT }} | ||
- run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" | ||
id: meta | ||
- name: Read version from gradle.properties | ||
id: read_property | ||
uses: christian-draeger/[email protected] | ||
with: | ||
path: ./gradle.properties | ||
property: release_version | ||
- name: Build and push | ||
id: docker_build | ||
uses: docker/build-push-action@v2 | ||
with: | ||
push: true | ||
tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }} | ||
labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }} |
This file contains 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,7 @@ | ||
variables: | ||
APP_NAME: th2-codec-json | ||
|
||
include: | ||
- project: vivarium/th2/pipelines | ||
ref: v2 | ||
file: /.gitlab-ci-java.yml |
This file contains 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,9 @@ | ||
FROM gradle:7.1.0-jdk11 AS build | ||
ARG release_version | ||
COPY ./ . | ||
RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version} | ||
|
||
FROM adoptopenjdk/openjdk11:alpine | ||
WORKDIR /home | ||
COPY --from=build /home/gradle/build/docker . | ||
ENTRYPOINT ["/home/service/bin/service"] |
This file contains 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,106 @@ | ||
/* | ||
* Copyright 2021-2021 Exactpro (Exactpro Systems Limited) | ||
* | ||
* 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. | ||
*/ | ||
|
||
plugins { | ||
id 'java' | ||
id 'org.jetbrains.kotlin.jvm' version '1.5.31' | ||
id 'com.palantir.docker' version '0.25.0' | ||
} | ||
|
||
apply plugin: 'application' | ||
apply plugin: 'com.palantir.docker' | ||
apply plugin: 'kotlin-kapt' | ||
|
||
group 'com.exactpro.th2' | ||
version release_version | ||
|
||
repositories { | ||
mavenCentral() | ||
|
||
maven { | ||
name 'Sonatype_snapshots' | ||
url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' | ||
} | ||
|
||
maven { | ||
name 'Sonatype_releases' | ||
url 'https://s01.oss.sonatype.org/content/repositories/releases/' | ||
} | ||
|
||
mavenLocal() | ||
|
||
configurations.all { | ||
resolutionStrategy.cacheChangingModulesFor 0, 'seconds' | ||
resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' | ||
} | ||
} | ||
|
||
dependencies { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add the |
||
api platform('com.exactpro.th2:bom:3.1.0') | ||
implementation 'com.google.auto.service:auto-service:1.0.1' | ||
|
||
implementation 'com.exactpro.th2:common:3.32.0' | ||
implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.5' | ||
|
||
implementation 'io.netty:netty-all:4.1.72.Final' | ||
|
||
implementation 'io.github.microutils:kotlin-logging:2.1.21' | ||
|
||
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' | ||
|
||
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" | ||
|
||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' | ||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' | ||
|
||
annotationProcessor 'com.google.auto.service:auto-service:1.0.1' | ||
kapt 'com.google.auto.service:auto-service:1.0.1' | ||
} | ||
|
||
test { | ||
useJUnitPlatform() | ||
} | ||
|
||
application { | ||
mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.Main' | ||
} | ||
|
||
applicationName = 'service' | ||
|
||
distTar { | ||
archiveName "${applicationName}.tar" | ||
} | ||
|
||
dockerPrepare { | ||
dependsOn distTar | ||
} | ||
|
||
docker { | ||
copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) | ||
} | ||
|
||
compileKotlin { | ||
kotlinOptions { | ||
jvmTarget = '11' | ||
} | ||
} | ||
|
||
compileTestKotlin { | ||
kotlinOptions { | ||
jvmTarget = '11' | ||
} | ||
} | ||
|
This file contains 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 @@ | ||
release_version=0.0.1 |
Binary file not shown.
This file contains 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,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Try to migrate to the 0.31.0 version