Skip to content

Commit dceb4a9

Browse files
committed
Various fixes to specify charset encoding.
1 parent 4adb477 commit dceb4a9

34 files changed

+112
-140
lines changed

src/main/java/com/beowulfe/hap/HomekitCharacteristicChangeCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ public interface HomekitCharacteristicChangeCallback {
1616
/**
1717
* Call when the value of the characteristic that was subscribed to when this object was passed changes.
1818
*/
19-
public void changed();
19+
void changed();
2020
}

src/main/java/com/beowulfe/hap/accessories/Fan.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.accessories.properties.RotationDirection;
119
import com.beowulfe.hap.impl.services.FanService;
1210

@@ -61,7 +59,7 @@ public interface Fan extends HomekitAccessory {
6159
CompletableFuture<Void> setRotationSpeed(Integer speed) throws Exception;
6260

6361
@Override
64-
default public Collection<Service> getServices() {
62+
default Collection<Service> getServices() {
6563
return Collections.singleton(new FanService(this));
6664
}
6765

src/main/java/com/beowulfe/hap/accessories/GarageDoor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.accessories.properties.DoorState;
119
import com.beowulfe.hap.impl.services.GarageDoorService;
1210

@@ -78,7 +76,7 @@ public interface GarageDoor extends HomekitAccessory {
7876

7977

8078
@Override
81-
default public Collection<Service> getServices() {
79+
default Collection<Service> getServices() {
8280
return Collections.singleton(new GarageDoorService(this));
8381
}
8482
}

src/main/java/com/beowulfe/hap/accessories/HorizontalTiltingWindowCovering.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public interface HorizontalTiltingWindowCovering extends WindowCovering {
2929
* @return a future that completes when the change is made
3030
* @throws Exception when the change cannot be made
3131
*/
32-
public CompletableFuture<Void> setTargetHorizontalTiltAngle(int angle) throws Exception;
32+
CompletableFuture<Void> setTargetHorizontalTiltAngle(int angle) throws Exception;
3333

3434
/**
3535
* Subscribes to changes in the current horizontal tilt angle.

src/main/java/com/beowulfe/hap/accessories/HumiditySensor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.impl.services.HumiditySensorService;
119

1210
/**
@@ -23,7 +21,7 @@ public interface HumiditySensor extends HomekitAccessory {
2321
CompletableFuture<Double> getCurrentRelativeHumidity();
2422

2523
@Override
26-
default public Collection<Service> getServices() {
24+
default Collection<Service> getServices() {
2725
return Collections.singleton(new HumiditySensorService(this));
2826
}
2927

src/main/java/com/beowulfe/hap/accessories/Lightbulb.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.impl.services.LightbulbService;
119

1210
/**
@@ -31,7 +29,7 @@ public interface Lightbulb extends HomekitAccessory {
3129
CompletableFuture<Void> setLightbulbPowerState(boolean powerState) throws Exception;
3230

3331
@Override
34-
default public Collection<Service> getServices() {
32+
default Collection<Service> getServices() {
3533
return Collections.singleton(new LightbulbService(this));
3634
}
3735

src/main/java/com/beowulfe/hap/accessories/LockMechanism.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.accessories.properties.LockMechanismState;
119
import com.beowulfe.hap.impl.services.LockMechanismService;
1210

@@ -36,7 +34,7 @@ public interface LockMechanism extends HomekitAccessory {
3634
void unsubscribeCurrentMechanismState();
3735

3836
@Override
39-
default public Collection<Service> getServices() {
37+
default Collection<Service> getServices() {
4038
return Collections.singleton(new LockMechanismService(this));
4139
}
4240
}

src/main/java/com/beowulfe/hap/accessories/Outlet.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,50 +15,50 @@
1515
public interface Outlet extends HomekitAccessory {
1616

1717
@Override
18-
default public Collection<Service> getServices() {
18+
default Collection<Service> getServices() {
1919
return Collections.singleton(new OutletService(this));
2020
}
2121

2222
/**
2323
* Retrieves the current binary state of the outlet's power.
2424
* @return a future that will contain the binary state
2525
*/
26-
public CompletableFuture<Boolean> getPowerState();
26+
CompletableFuture<Boolean> getPowerState();
2727

2828
/**
2929
* Retrieves the current binary state indicating whether the outlet is in use.
3030
* @return a future that will contain the binary state
3131
*/
32-
public CompletableFuture<Boolean> getOutletInUse();
32+
CompletableFuture<Boolean> getOutletInUse();
3333

3434
/**
3535
* Sets the binary state of the outlet's power.
3636
* @param state the binary state to set
3737
* @return a future that completes when the change is made
3838
* @throws Exception when the change cannot be made
3939
*/
40-
public CompletableFuture<Void> setPowerState(boolean state) throws Exception;
40+
CompletableFuture<Void> setPowerState(boolean state) throws Exception;
4141

4242
/**
4343
* Subscribes to changes in the binary state of the outlet's power.
4444
* @param callback the function to call when the state changes.
4545
*/
46-
public void subscribePowerState(HomekitCharacteristicChangeCallback callback);
46+
void subscribePowerState(HomekitCharacteristicChangeCallback callback);
4747

4848
/**
4949
* Subscribes to changes in the binary state indicating whether the outlet is in use.
5050
* @param callback the function to call when the state changes.
5151
*/
52-
public void subscribeOutletInUse(HomekitCharacteristicChangeCallback callback);
52+
void subscribeOutletInUse(HomekitCharacteristicChangeCallback callback);
5353

5454
/**
5555
* Unsubscribes from changes in the binary state of the outlet's power.
5656
*/
57-
public void unsubscribePowerState();
57+
void unsubscribePowerState();
5858

5959
/**
6060
* Unsubscribes from changes in the binary state indicating whether hte outlet is in use.
6161
*/
62-
public void unsubscribeOutletInUse();
62+
void unsubscribeOutletInUse();
6363

6464
}

src/main/java/com/beowulfe/hap/accessories/Switch.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.impl.services.SwitchService;
119

1210
/**
@@ -31,7 +29,7 @@ public interface Switch extends HomekitAccessory {
3129
CompletableFuture<Void> setSwitchState(boolean state) throws Exception;
3230

3331
@Override
34-
default public Collection<Service> getServices() {
32+
default Collection<Service> getServices() {
3533
return Collections.singleton(new SwitchService(this));
3634
}
3735

src/main/java/com/beowulfe/hap/accessories/TemperatureSensor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import java.util.Collections;
55
import java.util.concurrent.CompletableFuture;
66

7-
import com.beowulfe.hap.HomekitAccessory;
8-
import com.beowulfe.hap.HomekitCharacteristicChangeCallback;
9-
import com.beowulfe.hap.Service;
7+
import com.beowulfe.hap.*;
108
import com.beowulfe.hap.accessories.properties.TemperatureUnit;
119
import com.beowulfe.hap.impl.services.TemperatureSensorService;
1210

@@ -24,7 +22,7 @@ public interface TemperatureSensor extends HomekitAccessory {
2422
CompletableFuture<Double> getCurrentTemperature();
2523

2624
@Override
27-
default public Collection<Service> getServices() {
25+
default Collection<Service> getServices() {
2826
return Collections.singleton(new TemperatureSensorService(this));
2927
}
3028

0 commit comments

Comments
 (0)