Skip to content
This repository has been archived by the owner on May 17, 2021. It is now read-only.

3343 isy binding #5203

Merged
merged 6 commits into from
Jun 5, 2017
Merged

3343 isy binding #5203

merged 6 commits into from
Jun 5, 2017

Conversation

mitchmitchell
Copy link
Contributor

updated with formatting and other details to comply with review comments for merging isy binding into openhab1

@9037568
Copy link
Contributor

9037568 commented May 30, 2017

A couple of quick-hit notes while I dive into the rest of the code.

Copyright dates are showing "2016". These should be updated to "2017" throughout.
@since tags should be updated to use the value 1.10.0 throughout.

@mitchmitchell
Copy link
Contributor Author

I'll fix those as soon as I get home...

@mitchmitchell
Copy link
Contributor Author

ok a little sed scripting and the copyrights are updated and the since tags are fixed -- I've thing I have the updates properly added to the pull request, but perhaps not -- @9037568 chris can you take a look and see if you see the additional commits beyond the original 3 on my pull request?

@9037568
Copy link
Contributor

9037568 commented May 31, 2017

Thanks.

a03e125 looks great.
796ddf7 made a lot of whitespace changes I wouldn't have expected, but the inheritdoc tags look improved. I'll have to review the changes in Eclipse tomorrow.

I'm hoping to finish the full review soon also.

Copy link
Contributor

@9037568 9037568 left a comment

Choose a reason for hiding this comment

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

This is in pretty good shape. Just a few minor tweaks needed.

Bundle-Name: openHAB isy Binding
Bundle-SymbolicName: org.openhab.binding.isy
Bundle-Vendor: openHAB.org
Bundle-Version: 1.9.0.qualifier
Copy link
Contributor

Choose a reason for hiding this comment

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

1.10.0.qualifier

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed.

private InsteonClient insteonClient;

/**
* Constructor, nothing to see here.
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove ", nothing to see here"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed.


runtimeConfiguration = new ISYActiveBindingConfig(config);

setProperlyConfigured(true);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should go at the end of the method.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved as requested.


runtimeConfiguration = new ISYActiveBindingConfig(config);

setProperlyConfigured(true);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should go at the end of the method.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

moved as requested.

}

/**
* @{inheritDoc
Copy link
Contributor

Choose a reason for hiding this comment

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

{@inheritDoc}

Some of these were fixed with your two new commits, but others appear to still be in need of help. Please search and replace throughout.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed here, will search and fix elsewhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed in all places, fgrep -R confirmed...

case 903/* System Not Initialized; Restart! */:
case 905/* Subscription Failed; The device might need reboot! */:
case 1020/* Couldn't create the event handler socket */:
fatalError(status, "Exit the applciation; might have to reboot ISY");
Copy link
Contributor

Choose a reason for hiding this comment

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

"application"

Also, most of these conditions sound like references to the ISY device itself. Does the binding code not include any retry logic? My quick search for such didn't find any, but I may not have used the right terms.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

spelling fixed -- I don't know about the error handling, perhaps @sytone should comment, I am not that familiar with the algorithms used here.

package org.openhab.binding.isy.internal;

/**
* This is the node types in ISY that are supported / translated.
Copy link
Contributor

Choose a reason for hiding this comment

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

"These are the node types ..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed

return;
}

//
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove this empty comment line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

this.logger.info("Authenticated");
}
} catch (NoDeviceException ne) {
this.logger.error("No device", ne);
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be a warn, not an error.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed to warning

# If true, use UPNP to communicate with the ISY 994i.
# isy:upnp=false
#
# UUID of the ISY router, git it fron the admin panel.
Copy link
Contributor

Choose a reason for hiding this comment

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

"get it ..."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@mitchmitchell
Copy link
Contributor Author

Thanks for the review, I will get to these tomorrow afternoon or this weekend.

@mitchmitchell
Copy link
Contributor Author

ok I made the remaining changes -- I built the jar file so things compile but my openhab is now on the 2.1 nightly build so I will need someone to test it on an openhab1 system.

@mitchmitchell
Copy link
Contributor Author

ok I pushed the last of the changes from your review, please let me know if I need to do anything else!

@9037568
Copy link
Contributor

9037568 commented Jun 5, 2017

Thanks, @mitchmitchell ! Much appreciated.

@9037568 9037568 merged commit f62a7e7 into openhab:master Jun 5, 2017
@9037568 9037568 added this to the 1.10.0 milestone Jun 5, 2017
@mitchmitchell mitchmitchell deleted the 3343-ISY_binding branch June 5, 2017 03:38
@mitchmitchell
Copy link
Contributor Author

Thank you!!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants