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.

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

Jump to bottom

Resolve Merge conflicts #251

Closed
wants to merge 31 commits into from
Closed

Resolve Merge conflicts #251

wants to merge 31 commits into from

Conversation

SaikrishnaBairamoni
Copy link
Contributor

@SaikrishnaBairamoni SaikrishnaBairamoni commented Aug 27, 2024 •
edited
Loading

PR Details

Resolved merge conflicts between release/neon and master

Description

Related GitHub Issue

Related Jira Key

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

abey-yoseph and others added 29 commits March 31, 2023 12:40
@abey-yoseph
initial queue implementation cc bridge
3c6ab67
@abey-yoseph
add some comments
62b3ee0
@adev4a
fix unsub logic (#126)
1bf28d8
@dan-du-car
init
9a25264
@adev4a
Merge pull request #128 from usdot-fhwa-stol/fix_ui_confirm_topics
732c2a9 
Fix UI confirm topics send the old topic list
@abey-yoseph
cc bridge simplify logic
6a1c0af
@abey-yoseph
Cloud bridge investigation (#131)
a6bfeae 
* initial queue implementation cc bridge

* add some comments

* cc bridge simplify logic
@abey-yoseph
back to queue, add in file listener
3181cb0
@abey-yoseph
merge conflicts resolve
df63b3c
@adev4a
Merge pull request #132 from usdot-fhwa-stol/cloud_bridge_investigation
12b6ad4 
Cloud bridge investigation
@dan-du-car
Fix unit status and UI notification and event live status (#129)
19d192e 
* init

* add comments

* fix warning

* update text
@dan-du-car
Remove credentials (#134)
d6d46a2
@abey-yoseph
updating log levels, docker compose log size parameter
8dcc64d
@abey-yoseph
revert local changes
ee3cbb4
@dan-du-car
init
5016c14
@dan-du-car
remove hardcoded values
c6a113a
@adev4a
Data type conflict on message fields with intermittent alphanumeric v…
5e21503 
…alues prevents writing to influx (#140)

<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
Data type conflict on message fields with intermittent alphanumeric
values prevents writing to influx
<!--- Describe your changes in detail -->

## Related Issue
#138
<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?

<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@adev4a
Verification testing small fixes (#139)
8be591a 
<!-- Thanks for the contribution, this is awesome. -->
# PR Details
## Description
Updating log levels in vehicle nats bridge, and update docker log size
parameter in docker.compose.units.yml

<!--- Describe your changes in detail -->

## Related Issue

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context
WFD Verification testing 
<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
Local
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x ] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x ] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@adev4a
add analysis scripts
952bed3
@abey-yoseph
messaging server log size parameter
6834657
@adev4a
messaging server log size parameter (#143)
c55f61e 
<!-- Thanks for the contribution, this is awesome. -->
# PR Details
## Description
Need to update the log size parameter on the messaging server images

<!--- Describe your changes in detail -->

## Related Issue
#137 

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context
WFD Data Analysis
<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
Local
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@dan-du-car
init
1880188
@dan-du-car
add nan
a71d39b
@adev4a
Data type float into string field type conflicting (#144)
52e3338 
<!-- Thanks for the contribution, this is awesome. -->

# PR Details
## Description
There are a few more fields that were stored as string, but the incoming
message is of type float.

<!--- Describe your changes in detail -->

![image](https://user-images.githubusercontent.com/62157949/235765847-eb3fe9f9-1bda-44b7-b632-f5b3012bd9c2.png)

## Related Issue
#138
#145

<!--- This project only accepts pull requests related to open issues -->
<!--- If suggesting a new feature or change, please discuss it in an
issue first -->
<!--- If fixing a bug, there should be an issue describing it with steps
to reproduce -->
<!--- Please link to the issue here: -->

## Motivation and Context

<!--- Why is this change required? What problem does it solve? -->

## How Has This Been Tested?
NA
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran
to -->
<!--- see how your change affects other areas of the code, etc. -->

## Types of changes

<!--- What types of changes does your code introduce? Put an `x` in all
the boxes that apply: -->

- [x] Defect fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that cause existing functionality
to change)

## Checklist:

<!--- Go over all the following points, and put an `x` in all the boxes
that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->

- [ ] I have added any new packages to the sonar-scanner.properties file
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [x] I have read the **CONTRIBUTING** document.
[CDA Telematics Contributing
Guide](https://github.com/usdot-fhwa-stol/cda-telematics/blob/main/Contributing.md)
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
@adev4a
Fix json key value convertor logic (#146)
4c2e3d7 
fix comparison
@adev4a
Fix/drop nan value fields (#148)
cac3958 
drop fields with NaN values
@SaikrishnaBairamoni
clean up readme.md
b8405a3
@codygarver
Merge release/k900 for 4.4.0 release (#149)
1db4ec5
@SaikrishnaBairamoni
Resolved merge conflicts between release/neon and master
4e8cc90
adev4a
adev4a reviewed Aug 27, 2024
View reviewed changes
README.md Outdated
@@ -1,9 +1,8 @@
## GitHub Actions Build status
|Docker Image Builds (develop) | Docker Image Builds (release) | Sonar Scanner |
| Carma-streets-bridge | Carma-vehicle-bridge | telematics-cloud-messaging |
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The badges below seem to be pointing to the docker image builds for develop, release and sonar scanner - so the original text should be accurate.

.../com/telematic/telematic_cloud_messaging/message_converters/JSON2KeyValuePairsConverter.java Outdated
@@ -9,6 +9,7 @@
@Component
public class JSON2KeyValuePairsConverter {
/**
<<<<<<< HEAD
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

telematic_system/telematic_apps/web_app/client/src/api/user_topic_request.js Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file looks like it shouldn't be changing from the release candidate

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like there was duplicate new file added with same one deleted

...ematic_units/carma_cloud_bridge/cloud_nats_bridge/src/cloud_nats_bridge/cloud_nats_bridge.py Outdated
@@ -229,6 +227,9 @@ def xmlToJson(self, xmlString):
self.logger.info("Error converting xml to json for: " + str(xmlString))

return json_data

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is defining the queue_send function twice. For all of these application specific files, we want to keep what is there on the release candidate since that is tested code

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted what we have on the release/neon

@SaikrishnaBairamoni
Copy link
Contributor Author

addressed by PR 257

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adev4a adev4a adev4a left review comments

@dan-du-car dan-du-car Awaiting requested review from dan-du-car

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SaikrishnaBairamoni @adev4a @abey-yoseph @dan-du-car @codygarver