From 106c8b227083859ca1faddbf48b94f6d8544b28f Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Wed, 3 Jan 2024 13:47:23 +0100 Subject: [PATCH] Remove unnecessary semicolons (#4009) This helps with stopping the proliferation of unnecessary semicolons. Signed-off-by: Wouter Born --- .../core/xml/osgi/XmlDocumentBundleTracker.java | 2 +- .../core/config/core/ConfigurationTest.java | 2 +- .../config/discovery/DiscoveryResultBuilder.java | 2 +- .../discovery/AbstractDiscoveryServiceTest.java | 2 +- .../persistence/scoping/GlobalStrategies.java | 8 ++++---- .../org/openhab/core/thing/ThingStatusDetail.java | 6 +++--- .../events/ChannelDescriptionChangedEvent.java | 2 +- .../internal/firmware/ProgressCallbackImpl.java | 2 +- .../BaseDynamicCommandDescriptionProviderTest.java | 2 +- .../BaseDynamicStateDescriptionProviderTest.java | 2 +- .../ui/icon/AbstractResourceIconProviderTest.java | 6 +++--- .../org/openhab/core/ui/items/ItemUIRegistry.java | 2 +- .../thing/test/hue/GenericThingProviderTest4.java | 2 +- .../thing/binding/BindingBaseClassesOSGiTest.java | 2 +- .../thing/internal/ThingManagerOSGiJavaTest.java | 14 +++++++------- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/xml/osgi/XmlDocumentBundleTracker.java b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/xml/osgi/XmlDocumentBundleTracker.java index 7840888f8..49ee09eb9 100644 --- a/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/xml/osgi/XmlDocumentBundleTracker.java +++ b/bundles/org.openhab.core.config.core/src/main/java/org/openhab/core/config/core/xml/osgi/XmlDocumentBundleTracker.java @@ -92,7 +92,7 @@ public class XmlDocumentBundleTracker<@NonNull T> extends BundleTracker CREATED, OPENED, CLOSED - }; + } public static final String THREAD_POOL_NAME = "file-processing"; diff --git a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java index 2a38f3cb2..f7a83d0df 100644 --- a/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java +++ b/bundles/org.openhab.core.config.core/src/test/java/org/openhab/core/config/core/ConfigurationTest.java @@ -41,7 +41,7 @@ public class ConfigurationTest { ON, OFF, UNKNOWN - }; + } public MyEnum enumField = MyEnum.UNKNOWN; public int intField; diff --git a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java index c64dd0392..8ff25e948 100644 --- a/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java +++ b/bundles/org.openhab.core.config.discovery/src/main/java/org/openhab/core/config/discovery/DiscoveryResultBuilder.java @@ -50,7 +50,7 @@ public class DiscoveryResultBuilder { private DiscoveryResultBuilder(ThingUID thingUID) { this.thingUID = thingUID; - }; + } /** * Creates a new builder for a given thing UID. diff --git a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/AbstractDiscoveryServiceTest.java b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/AbstractDiscoveryServiceTest.java index f0e31c81b..43ec85e1e 100644 --- a/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/AbstractDiscoveryServiceTest.java +++ b/bundles/org.openhab.core.config.discovery/src/test/java/org/openhab/core/config/discovery/AbstractDiscoveryServiceTest.java @@ -132,7 +132,7 @@ public class AbstractDiscoveryServiceTest implements DiscoveryListener { .build(); thingDiscovered(discoveryResult); } - }; + } @Override public void thingDiscovered(DiscoveryService source, DiscoveryResult result) { diff --git a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java index 401feb97b..b79c0e52a 100644 --- a/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java +++ b/bundles/org.openhab.core.model.persistence/src/org/openhab/core/model/persistence/scoping/GlobalStrategies.java @@ -27,26 +27,26 @@ public class GlobalStrategies { @Override public String getName() { return "everyUpdate"; - }; + } }; public static final Strategy CHANGE = new StrategyImpl() { @Override public String getName() { return "everyChange"; - }; + } }; public static final Strategy RESTORE = new StrategyImpl() { @Override public String getName() { return "restoreOnStartup"; - }; + } }; public static final Strategy FORECAST = new StrategyImpl() { @Override public String getName() { return "forecast"; - }; + } }; } diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java index a6b0347b4..5b13e35f1 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/ThingStatusDetail.java @@ -67,7 +67,7 @@ public enum ThingStatusDetail { public ThingStatusDetail HANDLER_CONFIGURATION_PENDING = ThingStatusDetail.HANDLER_CONFIGURATION_PENDING; public ThingStatusDetail HANDLER_INITIALIZING_ERROR = ThingStatusDetail.HANDLER_INITIALIZING_ERROR; public ThingStatusDetail BRIDGE_UNINITIALIZED = ThingStatusDetail.BRIDGE_UNINITIALIZED; - }; + } public static final class OnlineStatus { private OnlineStatus() { @@ -75,7 +75,7 @@ public enum ThingStatusDetail { public ThingStatusDetail NONE = ThingStatusDetail.NONE; public ThingStatusDetail CONFIGURATION_PENDING = ThingStatusDetail.CONFIGURATION_PENDING; - }; + } public static final class OfflineStatus { private OfflineStatus() { @@ -88,5 +88,5 @@ public enum ThingStatusDetail { public ThingStatusDetail FIRMWARE_UPDATING = ThingStatusDetail.FIRMWARE_UPDATING; public ThingStatusDetail DUTY_CYCLE = ThingStatusDetail.DUTY_CYCLE; public ThingStatusDetail GONE = ThingStatusDetail.GONE; - }; + } } diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelDescriptionChangedEvent.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelDescriptionChangedEvent.java index e4aa9ab7e..0c0b98dab 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelDescriptionChangedEvent.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/events/ChannelDescriptionChangedEvent.java @@ -37,7 +37,7 @@ public class ChannelDescriptionChangedEvent extends AbstractEvent { COMMAND_OPTIONS, PATTERN, STATE_OPTIONS - }; + } /** * The channel description changed event type. diff --git a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java index 38978462d..37c67912f 100644 --- a/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java +++ b/bundles/org.openhab.core.thing/src/main/java/org/openhab/core/thing/internal/firmware/ProgressCallbackImpl.java @@ -64,7 +64,7 @@ final class ProgressCallbackImpl implements ProgressCallback { PENDING, RUNNING, INITIALIZED - }; + } private InternalState state; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java index 7c2aed2f2..09a967278 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicCommandDescriptionProviderTest.java @@ -67,7 +67,7 @@ class BaseDynamicCommandDescriptionProviderTest { this.eventPublisher = eventPublisherMock; this.itemChannelLinkRegistry = itemChannelLinkRegistryMock; } - }; + } private @NonNullByDefault({}) TestDynamicCommandDescriptionProvider subject; diff --git a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java index b8c8a6d4c..ab048f07c 100644 --- a/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java +++ b/bundles/org.openhab.core.thing/src/test/java/org/openhab/core/thing/binding/BaseDynamicStateDescriptionProviderTest.java @@ -67,7 +67,7 @@ class BaseDynamicStateDescriptionProviderTest { this.eventPublisher = eventPublisherMock; this.itemChannelLinkRegistry = itemChannelLinkRegistryMock; } - }; + } private @NonNullByDefault({}) BaseDynamicStateDescriptionProvider subject; diff --git a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java index c86ec9284..86cebce63 100644 --- a/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java +++ b/bundles/org.openhab.core.ui.icon/src/test/java/org/openhab/core/ui/icon/AbstractResourceIconProviderTest.java @@ -82,17 +82,17 @@ public class AbstractResourceIconProviderTest { String state = substringAfterLast(resourceName, "-"); state = substringBeforeLast(state, "."); return "30".equals(state) || "y z".equals(state); - }; + } @Override public Set getIconSets(@Nullable Locale locale) { return Set.of(); - }; + } @Override public Integer getPriority() { return 0; - }; + } }; } diff --git a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java index 742498b3c..6687273c0 100644 --- a/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java +++ b/bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/items/ItemUIRegistry.java @@ -49,7 +49,7 @@ public interface ItemUIRegistry extends ItemRegistry, ItemUIProvider { ITEM_NAME, /** No suitable label source could be determined */ NONE - }; + } /** * Retrieves the label for a widget. diff --git a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java index 55229369c..03ce16947 100644 --- a/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java +++ b/itests/org.openhab.core.model.thing.tests/src/main/java/org/openhab/core/model/thing/test/hue/GenericThingProviderTest4.java @@ -126,7 +126,7 @@ public class GenericThingProviderTest4 extends JavaOSGiTest { return new BaseThingHandler(thing) { @Override public void handleCommand(ChannelUID arg0, Command arg1) { - }; + } @Override public void initialize() { diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java index 8e62ae2f8..d9f77e667 100644 --- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java +++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/binding/BindingBaseClassesOSGiTest.java @@ -498,7 +498,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest { public @Nullable Thing getThing() { return thing; } - }; + } @Test public void assertThingCanBeUpdatedFromThingHandler() { diff --git a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java index 2379680b1..c1d743213 100644 --- a/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java +++ b/itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/ThingManagerOSGiJavaTest.java @@ -434,7 +434,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { @Override public void childHandlerInitialized(ThingHandler childHandler, Thing childThing) { assertDoesNotThrow(() -> childHandlerInitializedSemaphore.acquire()); - }; + } }); registerThingHandlerFactory(THING_TYPE_UID, thing -> new BaseThingHandler(thing) { @Override @@ -453,7 +453,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { public void thingUpdated(Thing thing) { this.thing = thing; assertDoesNotThrow(() -> thingUpdatedSemapthore.acquire()); - }; + } }); Bridge bridge = BridgeBuilder.create(BRIDGE_TYPE_UID, BRIDGE_UID).build(); @@ -502,7 +502,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { @Override public void childHandlerInitialized(ThingHandler childHandler, Thing childThing) { assertDoesNotThrow(() -> childHandlerInitializedSemaphore.acquire()); - }; + } }); registerThingHandlerFactory(THING_TYPE_UID, thing -> new BaseThingHandler(thing) { @@ -522,7 +522,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { public void thingUpdated(Thing thing) { this.thing = thing; assertDoesNotThrow(() -> thingUpdatedSemapthore.acquire()); - }; + } }); Bridge bridge = BridgeBuilder.create(BRIDGE_TYPE_UID, BRIDGE_UID).build(); @@ -571,7 +571,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { @Override public void childHandlerInitialized(ThingHandler childHandler, Thing childThing) { assertDoesNotThrow(() -> childHandlerInitializedSemaphore.acquire()); - }; + } }); registerThingHandlerFactory(THING_TYPE_UID, thing -> new BaseThingHandler(thing) { @Override @@ -587,7 +587,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { public void thingUpdated(Thing thing) { this.thing = thing; assertDoesNotThrow(() -> thingUpdatedSemapthore.acquire()); - }; + } }); Bridge bridge = BridgeBuilder.create(BRIDGE_TYPE_UID, BRIDGE_UID).build(); @@ -1115,7 +1115,7 @@ public class ThingManagerOSGiJavaTest extends JavaOSGiTest { protected @Nullable ThingHandler createHandler(Thing thing) { return thingHandlerProducer.apply(thing); } - }; + } private AtomicReference initializeThingHandlerCallback() throws Exception { AtomicReference thc = new AtomicReference<>();