-
-
Notifications
You must be signed in to change notification settings - Fork 422
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
Removed dependency on 'org.apache.commons.io' #1441
Conversation
bundles/org.openhab.core.id/src/main/java/org/openhab/core/id/InstanceUUID.java
Outdated
Show resolved
Hide resolved
...penhab.core.io.rest.auth/src/main/java/org/openhab/core/io/rest/auth/internal/JwtHelper.java
Outdated
Show resolved
Hide resolved
...onfig.dispatch/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcher.java
Show resolved
Hide resolved
....tests/src/main/java/org/openhab/core/config/dispatch/internal/ConfigDispatcherOSGiTest.java
Show resolved
Hide resolved
try { | ||
Files.writeString(file.toPath(), content, StandardCharsets.UTF_8); | ||
} catch (IOException ioe) { | ||
LOGGER.warn("Failed writing to file '{}': {}", content, file.getAbsolutePath(), ioe.getMessage()); |
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.
LOGGER.warn("Failed writing to file '{}': {}", content, file.getAbsolutePath(), ioe.getMessage()); | |
LOGGER.warn("Failed writing to file '{}': {}", file.getAbsolutePath(), ioe.getMessage()); |
bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
Outdated
Show resolved
Hide resolved
bundles/org.openhab.core.audio/src/main/java/org/openhab/core/audio/URLAudioStream.java
Outdated
Show resolved
Hide resolved
....core.model.core/src/main/java/org/openhab/core/model/core/internal/ModelRepositoryImpl.java
Outdated
Show resolved
Hide resolved
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
Outdated
Show resolved
Hide resolved
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
Outdated
Show resolved
Hide resolved
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
Outdated
Show resolved
Hide resolved
....openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/FirmwareImpl.java
Outdated
Show resolved
Hide resolved
bundles/org.openhab.core.model.script/src/org/openhab/core/model/script/actions/HTTP.java
Outdated
Show resolved
Hide resolved
dea4b40
to
d0db372
Compare
@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)); |
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.
You should also close this reader after you are done with it
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.
LGTM
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.
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>
d7f6d00
to
d4109ee
Compare
@wborn I resolved all conflicts. Unfortunately I had to squash my commits to simplify the rebase. |
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 |
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de> GitOrigin-RevId: 8808f04
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