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.

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

Removed dependency on 'org.apache.commons.io' #1441

Merged
merged 1 commit into from
May 21, 2020

Conversation

cweitkamp
Copy link
Contributor

@cweitkamp cweitkamp commented Apr 22, 2020

  • Removed dependency on org.apache.commons.io

  • bom/compile/pom.xml

  • bom/compile/pom.xml

  • features/karaf/openhab-tp/src/main/feature/feature.xml

  • Resolve itest.bndrun

Signed-off-by: Christoph Weitkamp github@christophweitkamp.de

@cweitkamp cweitkamp added work in progress A PR that is not yet ready to be merged infrastructure API breaking labels Apr 22, 2020
@cweitkamp cweitkamp changed the title [WIP] Removed dependency on 'org.apache.commons.io' Removed dependency on 'org.apache.commons.io' Apr 24, 2020
@cweitkamp cweitkamp removed the work in progress A PR that is not yet ready to be merged label Apr 24, 2020
try {
Files.writeString(file.toPath(), content, StandardCharsets.UTF_8);
} catch (IOException ioe) {
LOGGER.warn("Failed writing to file '{}': {}", content, file.getAbsolutePath(), ioe.getMessage());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Suggested change
LOGGER.warn("Failed writing to file '{}': {}", content, file.getAbsolutePath(), ioe.getMessage());
LOGGER.warn("Failed writing to file '{}': {}", file.getAbsolutePath(), ioe.getMessage());

@cweitkamp cweitkamp force-pushed the feature-remove-apache-commons-io branch from dea4b40 to d0db372 Compare May 8, 2020 18:27
@cweitkamp
Copy link
Contributor Author

@cpmeister Thanks for the useful review. I rebased and incorporated all suggested changes.

return newKey;
}

private RsaJsonWebKey loadOrGenerateKey() throws FileNotFoundException, JoseException, IOException {
try {
List<String> lines = IOUtils.readLines(new FileInputStream(KEY_FILE_PATH));
return (RsaJsonWebKey) JsonWebKey.Factory.newJwk(lines.get(0));
final BufferedReader reader = Files.newBufferedReader(Paths.get(KEY_FILE_PATH));
Copy link
Contributor

Choose a reason for hiding this comment

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

You should also close this reader after you are done with it

@cweitkamp cweitkamp added this to In progress in openHAB 3 Issue Tracking May 10, 2020
Copy link
Contributor

@cpmeister cpmeister left a comment

Choose a reason for hiding this comment

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

LGTM

@cweitkamp cweitkamp mentioned this pull request May 14, 2020
16 tasks
Copy link
Member

@wborn wborn left a comment

Choose a reason for hiding this comment

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

The changes look very good to me @cweitkamp! 👍
So when the conflicts are resolved we should be able to merge this.

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
@cweitkamp cweitkamp force-pushed the feature-remove-apache-commons-io branch from d7f6d00 to d4109ee Compare May 21, 2020 09:37
@cweitkamp
Copy link
Contributor Author

@wborn I resolved all conflicts. Unfortunately I had to squash my commits to simplify the rebase.

@wborn wborn merged commit 8808f04 into openhab:master May 21, 2020
openHAB 3 Issue Tracking automation moved this from In progress to Done May 21, 2020
@cweitkamp cweitkamp deleted the feature-remove-apache-commons-io branch May 21, 2020 13:25
@wborn wborn added this to the 3.0 milestone Aug 26, 2020
@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/guide-binding-development-changes-for-openhab-3-from-2-5-x/104134/4

t-8ch added a commit to t-8ch/openhab-binding-wmbus that referenced this pull request May 16, 2021
splatch pushed a commit to ConnectorIO/copybara-hab-core that referenced this pull request Jul 11, 2023
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
GitOrigin-RevId: 8808f04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

5 participants