From ed4b5ff94b4236dde4a65ffd5f2f448d66528054 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Thu, 23 Apr 2020 17:17:12 +0200 Subject: [PATCH] Reconfigure and apply Spotless (#1442) Adds a configuration for feature.xml files which will be necessary for https://github.com/openhab/static-code-analysis/pull/375 Also applies the results of running Spotless Signed-off-by: Wouter Born --- bom/compile/pom.xml | 2 +- bom/runtime/pom.xml | 4 +-- bundles/org.openhab.core.io.http.auth/pom.xml | 4 +-- .../pom.xml | 2 +- .../persistence/internal/PersistItemsJob.java | 5 ++-- .../org/openhab/core/items/GenericItem.java | 25 +++++++++---------- .../openhab-core/src/main/feature/feature.xml | 6 ++--- .../openhab-tp/src/main/feature/feature.xml | 15 ++++------- pom.xml | 16 ++++++++++++ .../src/main/feature/feature.xml | 2 +- 10 files changed, 45 insertions(+), 36 deletions(-) diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml index 7f67bce7ed..26bb7e9d77 100644 --- a/bom/compile/pom.xml +++ b/bom/compile/pom.xml @@ -315,7 +315,7 @@ jose4j 0.7.0 compile - + diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml index 4ef9d19356..6e117df68a 100644 --- a/bom/runtime/pom.xml +++ b/bom/runtime/pom.xml @@ -879,14 +879,14 @@ 0.5.8 - + org.bitbucket.b_c jose4j 0.7.0 compile - + diff --git a/bundles/org.openhab.core.io.http.auth/pom.xml b/bundles/org.openhab.core.io.http.auth/pom.xml index d2a9e5bcf6..734029d38a 100644 --- a/bundles/org.openhab.core.io.http.auth/pom.xml +++ b/bundles/org.openhab.core.io.http.auth/pom.xml @@ -26,7 +26,7 @@ ${project.version} - + @@ -49,6 +49,6 @@ - + diff --git a/bundles/org.openhab.core.model.persistence/pom.xml b/bundles/org.openhab.core.model.persistence/pom.xml index 6edaeed3c5..5bf756b42f 100644 --- a/bundles/org.openhab.core.model.persistence/pom.xml +++ b/bundles/org.openhab.core.model.persistence/pom.xml @@ -9,7 +9,7 @@ org.openhab.core.reactor.bundles 3.0.0-SNAPSHOT - + org.openhab.core.model.persistence openHAB Core :: Bundles :: Model Persistence diff --git a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java index 3638c8bd22..ae3fb49545 100644 --- a/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java +++ b/bundles/org.openhab.core.persistence/src/main/java/org/openhab/core/persistence/internal/PersistItemsJob.java @@ -16,9 +16,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.openhab.core.items.Item; +import org.openhab.core.persistence.PersistenceItemConfiguration; import org.openhab.core.persistence.PersistenceService; import org.openhab.core.persistence.PersistenceServiceConfiguration; -import org.openhab.core.persistence.PersistenceItemConfiguration; import org.openhab.core.persistence.strategy.PersistenceStrategy; import org.openhab.core.scheduler.SchedulerRunnable; import org.slf4j.Logger; @@ -66,7 +66,8 @@ public class PersistItemsJob implements SchedulerRunnable { } } - private boolean hasStrategy(List defaults, PersistenceItemConfiguration config, String strategyName) { + private boolean hasStrategy(List defaults, PersistenceItemConfiguration config, + String strategyName) { // check if the strategy is directly defined on the config for (PersistenceStrategy strategy : config.getStrategies()) { if (strategyName.equals(strategy.getName())) { diff --git a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java index 84ea99b5c3..b2a00f0e90 100644 --- a/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java +++ b/bundles/org.openhab.core/src/main/java/org/openhab/core/items/GenericItem.java @@ -252,21 +252,20 @@ public abstract class GenericItem implements ActiveItem { ExecutorService pool = ThreadPoolManager.getPool(ITEM_THREADPOOLNAME); try { final boolean stateChanged = newState != null && !newState.equals(oldState); - clonedListeners.forEach(listener -> - pool.execute(() -> { - try { - listener.stateUpdated(GenericItem.this, newState); - if (stateChanged) { - listener.stateChanged(GenericItem.this, oldState, newState); - } - } catch (Exception e) { - logger.warn("failed notifying listener '{}' about state update of item {}: {}", listener, - GenericItem.this.getName(), e.getMessage(), e); + clonedListeners.forEach(listener -> pool.execute(() -> { + try { + listener.stateUpdated(GenericItem.this, newState); + if (stateChanged) { + listener.stateChanged(GenericItem.this, oldState, newState); } - })); + } catch (Exception e) { + logger.warn("failed notifying listener '{}' about state update of item {}: {}", listener, + GenericItem.this.getName(), e.getMessage(), e); + } + })); } catch (IllegalArgumentException e) { - logger.warn("failed comparing oldState '{}' to newState '{}' for item {}: {}", oldState, - newState, GenericItem.this.getName(), e.getMessage(), e); + logger.warn("failed comparing oldState '{}' to newState '{}' for item {}: {}", oldState, newState, + GenericItem.this.getName(), e.getMessage(), e); } } diff --git a/features/karaf/openhab-core/src/main/feature/feature.xml b/features/karaf/openhab-core/src/main/feature/feature.xml index fffd77c5aa..c877543f62 100644 --- a/features/karaf/openhab-core/src/main/feature/feature.xml +++ b/features/karaf/openhab-core/src/main/feature/feature.xml @@ -129,8 +129,7 @@ openhab.tp-jbbp - + openhab-core-base shell mvn:org.openhab.core.bundles/org.openhab.core.io.console.karaf/${project.version} @@ -469,8 +468,7 @@ - + mvn:org.openhab.core.bundles/org.openhab.core.io.jetty.certificate/${project.version} diff --git a/features/karaf/openhab-tp/src/main/feature/feature.xml b/features/karaf/openhab-tp/src/main/feature/feature.xml index d668db4c24..2fcd6143df 100644 --- a/features/karaf/openhab-tp/src/main/feature/feature.xml +++ b/features/karaf/openhab-tp/src/main/feature/feature.xml @@ -43,8 +43,7 @@ mvn:org.eclipse.californium/scandium/2.0.0 - + openhab.tp;feature=commons-net;version=3.3 mvn:commons-net/commons-net/3.3 @@ -170,8 +169,7 @@ mvn:de.jollyday/jollyday/0.5.8 - + openhab.tp;feature=jmdns;version=3.5.5 mvn:org.jmdns/jmdns/3.5.5 @@ -217,8 +215,7 @@ mvn:com.neuronrobotics/nrjavaserial/3.20.0 - + openhab.tp;feature=xtext;version=2.19.0 mvn:org.eclipse.xtext/org.eclipse.xtext/2.19.0 @@ -270,11 +267,9 @@ mvn:org.eclipse.xtext/org.eclipse.xtext.xbase.ide/2.19.0 - + - +
This feature is currently only for external usage by products and not used by openHAB Core itself.
diff --git a/pom.xml b/pom.xml index 0ff07c332a..d67181afd6 100644 --- a/pom.xml +++ b/pom.xml @@ -576,6 +576,7 @@ Import-Package: \\ src/**/*.xml + **/feature.xml **/pom.xml @@ -588,6 +589,21 @@ Import-Package: \\ + + + + src/main/feature/feature.xml + + + XML + + openhab_wst_feature_file.prefs + + 4.12.0 + + + + diff --git a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml index 6ec9238684..857aa2e49c 100644 --- a/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml +++ b/tools/archetype/binding/src/main/resources/archetype-resources/src/main/feature/feature.xml @@ -16,7 +16,7 @@ mvn:org.openhab.core.features.karaf/org.openhab.core.features.karaf.openhab-core/${ohc.version}/xml/features - + openhab-runtime-base mvn:org.openhab.addons.bundles/${rootArtifactId}/${project.version}