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.

Sign up for GitHub

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

Jump to bottom

Make interface WarningTypeCommandDescriptionProvider and related enums API #405

Merged
merged 3 commits into from Mar 10, 2019
Merged

Make interface WarningTypeCommandDescriptionProvider and related enums API #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b20a9ab
Make WarningTypeCommandDescriptionProvider API
hsudbrock Mar 8, 2019
890570f
Make WarningType and WarningMode API
hsudbrock Mar 8, 2019
94985b0
Merge branch 'master' into make-warningtypecommanddescriptionprovider…
cdjackson Mar 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions org.openhab.binding.zigbee/META-INF/MANIFEST.MF
View file
Open in desktop
Expand Up @@ -55,6 +55,7 @@ Import-Package: com.thoughtworks.xstream,
Service-Component: OSGI-INF/*.xml
Export-Package: org.openhab.binding.zigbee,
org.openhab.binding.zigbee.converter,
org.openhab.binding.zigbee.converter.warningdevice,
org.openhab.binding.zigbee.discovery,
org.openhab.binding.zigbee.handler
Bundle-ClassPath: .
Expand Down
2 changes: 1 addition & 1 deletion ...l/converter/warningdevice/SoundLevel.java → ...e/converter/warningdevice/SoundLevel.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

/**
* Possible siren level values (for both warning and squawk commands).
Expand Down
2 changes: 1 addition & 1 deletion ...l/converter/warningdevice/SquawkMode.java → ...e/converter/warningdevice/SquawkMode.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

/**
* Possible values for the squawk mode in a squawk type.
Expand Down
4 changes: 2 additions & 2 deletions ...l/converter/warningdevice/SquawkType.java → ...e/converter/warningdevice/SquawkType.java
View file
Open in desktop
Expand Up @@ -6,11 +6,11 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

import static java.util.Arrays.stream;
import static java.util.stream.Collectors.toMap;
import static org.openhab.binding.zigbee.internal.converter.warningdevice.SoundLevel.HIGH;
import static org.openhab.binding.zigbee.converter.warningdevice.SoundLevel.HIGH;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion .../converter/warningdevice/WarningMode.java → .../converter/warningdevice/WarningMode.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

/**
* Possible values for the warning mode in a warning type.
Expand Down
6 changes: 3 additions & 3 deletions .../converter/warningdevice/WarningType.java → .../converter/warningdevice/WarningType.java
View file
Open in desktop
Expand Up @@ -6,13 +6,13 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

import static java.util.Arrays.stream;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toMap;
import static org.openhab.binding.zigbee.internal.converter.warningdevice.SoundLevel.HIGH;
import static org.openhab.binding.zigbee.internal.converter.warningdevice.WarningMode.BURGLAR;
import static org.openhab.binding.zigbee.converter.warningdevice.SoundLevel.HIGH;
import static org.openhab.binding.zigbee.converter.warningdevice.WarningMode.BURGLAR;

import java.time.Duration;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...arningTypeCommandDescriptionProvider.java → ...arningTypeCommandDescriptionProvider.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*/
package org.openhab.binding.zigbee.internal.converter.warningdevice;
package org.openhab.binding.zigbee.converter.warningdevice;

import java.util.List;

Expand Down
2 changes: 2 additions & 0 deletions ...ing/zigbee/internal/converter/warningdevice/DynamicWarningCommandDescriptionProvider.java
View file
Open in desktop
Expand Up @@ -26,6 +26,8 @@
import org.eclipse.smarthome.core.types.CommandDescription;
import org.eclipse.smarthome.core.types.CommandDescriptionBuilder;
import org.eclipse.smarthome.core.types.CommandOption;
import org.openhab.binding.zigbee.converter.warningdevice.WarningType;
import org.openhab.binding.zigbee.converter.warningdevice.WarningTypeCommandDescriptionProvider;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Reference;

Expand Down
2 changes: 2 additions & 0 deletions ...openhab/binding/zigbee/internal/converter/warningdevice/ZigBeeConverterWarningDevice.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import org.eclipse.smarthome.core.types.Command;
import org.openhab.binding.zigbee.ZigBeeBindingConstants;
import org.openhab.binding.zigbee.converter.ZigBeeBaseChannelConverter;
import org.openhab.binding.zigbee.converter.warningdevice.SquawkType;
import org.openhab.binding.zigbee.converter.warningdevice.WarningType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 2 additions & 0 deletions ...zigbee/internal/converter/warningdevice/DynamicWarningCommandDescriptionProviderTest.java
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
import org.eclipse.smarthome.core.types.CommandOption;
import org.junit.Before;
import org.junit.Test;
import org.openhab.binding.zigbee.converter.warningdevice.WarningType;
import org.openhab.binding.zigbee.converter.warningdevice.WarningTypeCommandDescriptionProvider;

/**
* Unit tests for the {@link DynamicWarningCommandDescriptionProvider}.
Expand Down
3 changes: 3 additions & 0 deletions ...test/java/org/openhab/binding/zigbee/internal/converter/warningdevice/SquawkTypeTest.java
View file
Open in desktop
Expand Up @@ -11,6 +11,9 @@
import static org.junit.Assert.*;

import org.junit.Test;
import org.openhab.binding.zigbee.converter.warningdevice.SoundLevel;
import org.openhab.binding.zigbee.converter.warningdevice.SquawkMode;
import org.openhab.binding.zigbee.converter.warningdevice.SquawkType;

/**
* Unit tests for {@link SquawkType}.
Expand Down
3 changes: 3 additions & 0 deletions ...est/java/org/openhab/binding/zigbee/internal/converter/warningdevice/WarningTypeTest.java
View file
Open in desktop
Expand Up @@ -13,6 +13,9 @@
import java.time.Duration;

import org.junit.Test;
import org.openhab.binding.zigbee.converter.warningdevice.SoundLevel;
import org.openhab.binding.zigbee.converter.warningdevice.WarningMode;
import org.openhab.binding.zigbee.converter.warningdevice.WarningType;

/**
* Unit tests for {@link WarningType}.
Expand Down
5 changes: 5 additions & 0 deletions ...hab/binding/zigbee/internal/converter/warningdevice/ZigBeeConverterWarningDeviceTest.java
View file
Open in desktop
Expand Up @@ -19,6 +19,11 @@
import org.eclipse.smarthome.core.thing.Channel;
import org.junit.Before;
import org.junit.Test;
import org.openhab.binding.zigbee.converter.warningdevice.SoundLevel;
import org.openhab.binding.zigbee.converter.warningdevice.SquawkMode;
import org.openhab.binding.zigbee.converter.warningdevice.SquawkType;
import org.openhab.binding.zigbee.converter.warningdevice.WarningMode;
import org.openhab.binding.zigbee.converter.warningdevice.WarningType;
import org.openhab.binding.zigbee.handler.ZigBeeCoordinatorHandler;
import org.openhab.binding.zigbee.handler.ZigBeeThingHandler;

Expand Down