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

[modbus] Modbus transformations: cascaded/chained transformations and new-style transformation string #9945

Merged
merged 12 commits into from
Feb 2, 2021
Merged

[modbus] Modbus transformations: cascaded/chained transformations and new-style transformation string #9945

merged 12 commits into from
Feb 2, 2021

Conversation

ssalonen
Copy link
Contributor

@ssalonen ssalonen commented Jan 24, 2021 •
edited
Loading

Resolves #9944
Resolves #9946

@ssalonen ssalonen changed the title Modbus cascaded transformation [modbus] Modbus cascaded transformation Jan 24, 2021
@ssalonen ssalonen changed the title [modbus] Modbus cascaded transformation [modbus] Modbus transformations: cascaded/chained transformations and new-style transformation string Jan 24, 2021
@ssalonen
Copy link
Contributor Author

Rebuilding, let's see if Jenkins would pass then.

@ssalonen ssalonen added rebuild Triggers Jenkins PR build and removed rebuild Triggers Jenkins PR build labels Jan 25, 2021
@ssalonen
Copy link
Contributor Author

Can someone find why the jenkins fails? I cannot find proper error message and everything seems to be interleaved in the logs?

@ssalonen ssalonen force-pushed the modbus-cascaded-transformation branch from a641b7d to f4d22e3 Compare January 26, 2021 17:47
@ssalonen
Copy link
Contributor Author

Rebased to get #9702

Locally failing with:

$ mvn -pl itests/org.openhab.binding.modbus.tests,bundles/org.openhab.binding.modbus install -DwithResolver=true
...
[ERROR] Failed to execute goal biz.aQute.bnd:bnd-resolver-maven-plugin:5.2.0:resolve (default) on project org.openhab.binding.modbus.tests: Unable to resolve <<INITIAL>>: missing requirement osgi.identity;filter:='(osgi.identity=org.openhab.binding.modbus.tests)' [caused by: Unable to resolve org.openhab.binding.modbus.tests version=3.1.0.202101261800: missing requirement osgi.wiring.package;filter:='(&(osgi.wiring.package=org.junit.jupiter.api)(version>=5.7.0)(!(version>=6.0.0)))';osgi.wiring.package='org.junit.jupiter.api'] -> [Help 1]

Let's see what Jenkins thinks

@ssalonen ssalonen force-pushed the modbus-cascaded-transformation branch from e33e724 to bb5fb18 Compare January 26, 2021 18:26
@ssalonen ssalonen closed this Jan 27, 2021
@ssalonen ssalonen reopened this Jan 27, 2021
@ssalonen
Copy link
Contributor Author

ssalonen commented Jan 27, 2021 •
edited
Loading

[ERROR] Failed to execute goal org.openhab.tools.sat:sat-plugin:0.10.0:spotbugs (sat-all) on project org.openhab.automation.jythonscripting: Unable to execute mojo: Execution null of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Timeout: killed the sub-process -> [Help 1]

which leads to suspect that #9404 (comment) is the issue now

@ssalonen ssalonen added rebuild Triggers Jenkins PR build and removed rebuild Triggers Jenkins PR build labels Jan 27, 2021
@ssalonen ssalonen mentioned this pull request Jan 31, 2021
Merged
@ssalonen
Copy link
Contributor Author

Apache commons dependency removed from Transformation class in 8f00425. Other references removed in #10002

@Hilbrand Hilbrand added the enhancement An enhancement or new feature for an existing add-on label Feb 1, 2021
Hilbrand
Hilbrand reviewed Feb 1, 2021
View reviewed changes
Copy link
Member

@Hilbrand Hilbrand left a comment

Choose a reason for hiding this comment

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

Just one small comment and a rebase is needed.

...ab.binding.modbus/src/main/java/org/openhab/binding/modbus/internal/ValueTransformation.java Outdated Show resolved Hide resolved
@ssalonen
[modbus] README trailing whitespaces
f37548e 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] Cascaded transforms with ∩
f2de1f2 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] README to mention cascaded transformations
d45ea3e 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] javadoc fix
010bb61 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] Take cascaded transformation into use
df8361c 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] README to show preference towards new syntax
c16efec 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] examples to use new syntax
b295002 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] fix test
f9c89e8 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] remove apache commons lang dependency
8516c38 
- see also openhab#10002
- I removed equals and hashCode implementation all-together, I could not
  see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] spotless
e87d51c 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen
[modbus] rebase fixes
04b445f 
Missing SingleValueTransformation import, sorting imports.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
@ssalonen ssalonen force-pushed the modbus-cascaded-transformation branch from 66f17ae to 04b445f Compare February 1, 2021 16:27
@ssalonen
[modbus] javadoc to have initial contribution
acb020b 
Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Hilbrand
Hilbrand approved these changes Feb 2, 2021
View reviewed changes
Copy link
Member

@Hilbrand Hilbrand left a comment

Choose a reason for hiding this comment

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

LGTM

@Hilbrand Hilbrand added this to the 3.1 milestone Feb 2, 2021
@Hilbrand Hilbrand merged commit 51ea77f into openhab:main Feb 2, 2021
lucacalcaterra pushed a commit to lucacalcaterra/openhab-addons that referenced this pull request Feb 23, 2021
@ssalonen @lucacalcaterra
[modbus] Modbus transformations: cascaded/chained transformations and…
4aee063 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Signed-off-by: Luca Calcaterra <calcaterra.luca@gmail.com>
@openhab-bot
Copy link
Collaborator

This pull request has been mentioned on openHAB Community. There might be relevant details there:

https://community.openhab.org/t/solved-oh-3-0-1-ui-transformation-modbus/116500/7

themillhousegroup pushed a commit to themillhousegroup/openhab2-addons that referenced this pull request May 10, 2021
@ssalonen @themillhousegroup
[modbus] Modbus transformations: cascaded/chained transformations and…
3d4b96e 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Signed-off-by: John Marshall <john.marshall.au@gmail.com>
splatch pushed a commit to ConnectorIO/openhab-addons that referenced this pull request Aug 19, 2021
@ssalonen @splatch
[modbus] Modbus transformations: cascaded/chained transformations and…
cb95fa3 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
thinkingstone pushed a commit to thinkingstone/openhab-addons that referenced this pull request Nov 7, 2021
@ssalonen @thinkingstone
[modbus] Modbus transformations: cascaded/chained transformations and…
8d71781 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
splatch pushed a commit to ConnectorIO/openhab-addons that referenced this pull request Apr 23, 2022
@ssalonen @splatch
[modbus] Modbus transformations: cascaded/chained transformations and…
eee9856 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
marcfischerboschio pushed a commit to bosch-io/openhab-addons that referenced this pull request May 5, 2022
@ssalonen
[modbus] Modbus transformations: cascaded/chained transformations and…
d59c368 
… new-style transformation string (openhab#9945)

* [modbus] Cascaded transforms with ∩
* [modbus] README to mention cascaded transformations
* [modbus] Take cascaded transformation into use
* [modbus] README to show preference towards new syntax
* [modbus] examples to use new syntax
* [modbus] fix test
* [modbus] remove apache commons lang dependency
- see also PR openhab#10002
- I removed equals and hashCode implementation all-together, I could not see they played any role in practice.

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Hilbrand Hilbrand Hilbrand approved these changes

Assignees
No one assigned
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
3.1
3 participants
@ssalonen @openhab-bot @Hilbrand