Skip to content

Commit

Permalink
Reorganize API classes (openhab#15934)
Browse files Browse the repository at this point in the history 
Resolves openhab#15731

Signed-off-by: Jacob Laursen <[email protected]>
Signed-off-by: Jørgen Austvik <[email protected]>
  • Loading branch information
@jlaur @austvik
jlaur authored and austvik committed Mar 27, 2024
1 parent 4ac042d commit d6021e7
Show file tree
Hide file tree
Showing 117 changed files with 308 additions and 308 deletions.
2 changes: 1 addition & 1 deletion .../binding/hue/internal/dto/ApiVersion.java → ...ue/internal/api/dto/clip1/ApiVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.regex.Matcher;
import java.util.regex.Pattern;
Expand Down
2 changes: 1 addition & 1 deletion ...ing/hue/internal/dto/ApiVersionUtils.java → ...ternal/api/dto/clip1/ApiVersionUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import org.eclipse.jdt.annotation.NonNullByDefault;

Expand Down
2 changes: 1 addition & 1 deletion .../hue/internal/dto/BridgeConfigUpdate.java → ...nal/api/dto/clip1/BridgeConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* Collection of updates to the bridge configuration.
Expand Down
2 changes: 1 addition & 1 deletion ...inding/hue/internal/dto/Capabilities.java → .../internal/api/dto/clip1/Capabilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* Collection of capabilities for lights.
Expand Down
2 changes: 1 addition & 1 deletion ...ng/hue/internal/dto/ColorTemperature.java → ...ernal/api/dto/clip1/ColorTemperature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* Collection of color temperature capabilities to control lights.
Expand Down
2 changes: 1 addition & 1 deletion ...hab/binding/hue/internal/dto/Command.java → ...g/hue/internal/api/dto/clip1/Command.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import com.google.gson.Gson;

Expand Down
2 changes: 1 addition & 1 deletion ...nhab/binding/hue/internal/dto/Config.java → ...ng/hue/internal/api/dto/clip1/Config.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.ArrayList;
import java.util.Date;
Expand Down
2 changes: 1 addition & 1 deletion ...inding/hue/internal/dto/ConfigUpdate.java → .../internal/api/dto/clip1/ConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static java.util.stream.Collectors.joining;

Expand Down
2 changes: 1 addition & 1 deletion ...hab/binding/hue/internal/dto/Control.java → ...g/hue/internal/api/dto/clip1/Control.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import org.eclipse.jdt.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...g/hue/internal/dto/CreateUserRequest.java → ...rnal/api/dto/clip1/CreateUserRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
*
Expand Down
2 changes: 1 addition & 1 deletion ...nding/hue/internal/dto/ErrorResponse.java → ...internal/api/dto/clip1/ErrorResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion .../binding/hue/internal/dto/FullConfig.java → ...ue/internal/api/dto/clip1/FullConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...b/binding/hue/internal/dto/FullGroup.java → ...hue/internal/api/dto/clip1/FullGroup.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...nding/hue/internal/dto/FullHueObject.java → ...internal/api/dto/clip1/FullHueObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static org.openhab.binding.hue.internal.HueBindingConstants.NORMALIZE_ID_REGEX;

Expand Down
2 changes: 1 addition & 1 deletion ...b/binding/hue/internal/dto/FullLight.java → ...hue/internal/api/dto/clip1/FullLight.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.time.Duration;
Expand Down
2 changes: 1 addition & 1 deletion .../binding/hue/internal/dto/FullSensor.java → ...ue/internal/api/dto/clip1/FullSensor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...enhab/binding/hue/internal/dto/Group.java → ...ing/hue/internal/api/dto/clip1/Group.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* Basic group information.
Expand Down
2 changes: 1 addition & 1 deletion ...b/binding/hue/internal/dto/HueObject.java → ...hue/internal/api/dto/clip1/HueObject.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.Map;
Expand Down
4 changes: 2 additions & 2 deletions .../internal/dto/LightLevelConfigUpdate.java → ...api/dto/clip1/LightLevelConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static org.openhab.binding.hue.internal.dto.FullSensor.*;
import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*;

/**
* Updates the configuration of a light level sensor
Expand Down
2 changes: 1 addition & 1 deletion ...g/hue/internal/dto/NewLightsResponse.java → ...rnal/api/dto/clip1/NewLightsResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* @author Q42 - Initial contribution
Expand Down
4 changes: 2 additions & 2 deletions ...ue/internal/dto/PresenceConfigUpdate.java → ...l/api/dto/clip1/PresenceConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static org.openhab.binding.hue.internal.dto.FullSensor.*;
import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.*;

/**
* Updates the configuration of a presence sensor
Expand Down
2 changes: 1 addition & 1 deletion ...enhab/binding/hue/internal/dto/Scene.java → ...ing/hue/internal/api/dto/clip1/Scene.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...ab/binding/hue/internal/dto/Schedule.java → .../hue/internal/api/dto/clip1/Schedule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.Map;
Expand Down
2 changes: 1 addition & 1 deletion ...ding/hue/internal/dto/ScheduleUpdate.java → ...nternal/api/dto/clip1/ScheduleUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.Date;

Expand Down
2 changes: 1 addition & 1 deletion .../internal/dto/SearchForLightsRequest.java → ...api/dto/clip1/SearchForLightsRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions .../hue/internal/dto/SensorConfigUpdate.java → ...nal/api/dto/clip1/SensorConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static org.openhab.binding.hue.internal.dto.FullSensor.CONFIG_ON;
import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.CONFIG_ON;

/**
* Collection of updates to the sensor configuration.
Expand Down
2 changes: 1 addition & 1 deletion ...ue/internal/dto/SetAttributesRequest.java → ...l/api/dto/clip1/SetAttributesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...ding/hue/internal/dto/SoftwareUpdate.java → ...nternal/api/dto/clip1/SoftwareUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

/**
* Details of a bridge firmware update.
Expand Down
2 changes: 1 addition & 1 deletion ...enhab/binding/hue/internal/dto/State.java → ...ing/hue/internal/api/dto/clip1/State.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.Arrays;

Expand Down
6 changes: 3 additions & 3 deletions ...binding/hue/internal/dto/StateUpdate.java → ...e/internal/api/dto/clip1/StateUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import org.openhab.binding.hue.internal.dto.State.AlertMode;
import org.openhab.binding.hue.internal.dto.State.Effect;
import org.openhab.binding.hue.internal.api.dto.clip1.State.AlertMode;
import org.openhab.binding.hue.internal.api.dto.clip1.State.Effect;

/**
* Collection of updates to the state of a light.
Expand Down
2 changes: 1 addition & 1 deletion ...ing/hue/internal/dto/SuccessResponse.java → ...ternal/api/dto/clip1/SuccessResponse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.lang.reflect.Type;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions ...internal/dto/TemperatureConfigUpdate.java → ...pi/dto/clip1/TemperatureConfigUpdate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import static org.openhab.binding.hue.internal.dto.FullSensor.CONFIG_LED_INDICATION;
import static org.openhab.binding.hue.internal.api.dto.clip1.FullSensor.CONFIG_LED_INDICATION;

/**
* Updates the configuration of a temperature sensor
Expand Down
2 changes: 1 addition & 1 deletion ...penhab/binding/hue/internal/dto/User.java → ...ding/hue/internal/api/dto/clip1/User.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.util.Date;

Expand Down
2 changes: 1 addition & 1 deletion ...penhab/binding/hue/internal/dto/Util.java → ...ding/hue/internal/api/dto/clip1/Util.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto;
package org.openhab.binding.hue.internal.api.dto.clip1;

import java.nio.charset.StandardCharsets;
import java.util.regex.Matcher;
Expand Down
2 changes: 1 addition & 1 deletion ...g/hue/internal/dto/clip2/ActionEntry.java → ...e/internal/api/dto/clip2/ActionEntry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import org.eclipse.jdt.annotation.NonNullByDefault;

Expand Down
4 changes: 2 additions & 2 deletions ...inding/hue/internal/dto/clip2/Alerts.java → ...ng/hue/internal/api/dto/clip2/Alerts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.hue.internal.dto.clip2.enums.ActionType;
import org.openhab.binding.hue.internal.api.dto.clip2.enums.ActionType;

import com.google.gson.annotations.SerializedName;

Expand Down
2 changes: 1 addition & 1 deletion .../hue/internal/dto/clip2/BridgeConfig.java → .../internal/api/dto/clip2/BridgeConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
Expand Down
4 changes: 2 additions & 2 deletions ...inding/hue/internal/dto/clip2/Button.java → ...ng/hue/internal/api/dto/clip2/Button.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType;
import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType;

import com.google.gson.annotations.SerializedName;

Expand Down
4 changes: 2 additions & 2 deletions .../hue/internal/dto/clip2/ButtonReport.java → .../internal/api/dto/clip2/ButtonReport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import java.time.Instant;

import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.binding.hue.internal.dto.clip2.enums.ButtonEventType;
import org.openhab.binding.hue.internal.api.dto.clip2.enums.ButtonEventType;

/**
* DTO for CLIP 2 button report.
Expand Down
2 changes: 1 addition & 1 deletion .../internal/dto/clip2/ColorTemperature.java → ...ernal/api/dto/clip2/ColorTemperature.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* SPDX-License-Identifier: EPL-2.0
*/
package org.openhab.binding.hue.internal.dto.clip2;
package org.openhab.binding.hue.internal.api.dto.clip2;

import java.util.Objects;

Expand Down
Loading

0 comments on commit d6021e7

Please sign in to comment.