Skip to content

Commit bc45169

Browse files
authored
Merge pull request #3 from matchews/codex/remove-http-login-and-telemetry-code
Refactor Hayward OmniLogic local binding to UDP
2 parents 3e16a7e + 611795c commit bc45169

7 files changed

Lines changed: 219 additions & 208 deletions

File tree

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/GetTelemetry.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

bundles/org.openhab.binding.haywardomnilogiclocal/src/main/java/org/openhab/binding/haywardomnilogiclocal/internal/HaywardHandlerFactory.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import org.eclipse.jdt.annotation.NonNullByDefault;
2323
import org.eclipse.jdt.annotation.Nullable;
24-
import org.eclipse.jetty.client.HttpClient;
2524
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardBackyardHandler;
2625
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardBowHandler;
2726
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardBridgeHandler;
@@ -32,7 +31,6 @@
3231
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardPumpHandler;
3332
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardRelayHandler;
3433
import org.openhab.binding.haywardomnilogiclocal.internal.handler.HaywardVirtualHeaterHandler;
35-
import org.openhab.core.io.net.http.HttpClientFactory;
3634
import org.openhab.core.thing.Bridge;
3735
import org.openhab.core.thing.Thing;
3836
import org.openhab.core.thing.ThingTypeUID;
@@ -57,18 +55,15 @@ public class HaywardHandlerFactory extends BaseThingHandlerFactory {
5755
private static final Set<ThingTypeUID> SUPPORTED_THING_TYPES_UIDS = Collections.unmodifiableSet(
5856
Stream.concat(BRIDGE_THING_TYPES_UIDS.stream(), THING_TYPES_UIDS.stream()).collect(Collectors.toSet()));
5957
private final HaywardDynamicStateDescriptionProvider stateDescriptionProvider;
60-
private final HttpClient httpClient;
6158

6259
@Override
6360
public boolean supportsThingType(ThingTypeUID thingTypeUID) {
6461
return SUPPORTED_THING_TYPES_UIDS.contains(thingTypeUID);
6562
}
6663

6764
@Activate
68-
public HaywardHandlerFactory(final @Reference HaywardDynamicStateDescriptionProvider stateDescriptionProvider,
69-
@Reference HttpClientFactory httpClientFactory) {
65+
public HaywardHandlerFactory(final @Reference HaywardDynamicStateDescriptionProvider stateDescriptionProvider) {
7066
this.stateDescriptionProvider = stateDescriptionProvider;
71-
this.httpClient = httpClientFactory.getCommonHttpClient();
7267
}
7368

7469
/**
@@ -79,7 +74,7 @@ public HaywardHandlerFactory(final @Reference HaywardDynamicStateDescriptionProv
7974
ThingTypeUID thingTypeUID = thing.getThingTypeUID();
8075

8176
if (thingTypeUID.equals(HaywardBindingConstants.THING_TYPE_BRIDGE)) {
82-
return new HaywardBridgeHandler(stateDescriptionProvider, (Bridge) thing, httpClient);
77+
return new HaywardBridgeHandler(stateDescriptionProvider, (Bridge) thing);
8378
}
8479
if (thingTypeUID.equals(HaywardBindingConstants.THING_TYPE_BACKYARD)) {
8580
return new HaywardBackyardHandler(thing);

0 commit comments

Comments
 (0)