From b82fefd77679b80d940bfb94cfe30fc668e86fac Mon Sep 17 00:00:00 2001 From: "Kowollik, Jan" Date: Sat, 28 Sep 2019 16:39:35 +0200 Subject: [PATCH] Initial Commit --- .gitignore | 34 ++ .mvn/wrapper/MavenWrapperDownloader.java | 114 ++++ .mvn/wrapper/maven-wrapper.jar | Bin 0 -> 48337 bytes .mvn/wrapper/maven-wrapper.properties | 1 + LICENSE.txt | 201 +++++++ README.md | 71 +++ pom.xml | 76 +++ ...itional-spring-configuration-metadata.json | 12 + .../zugsteuerung/zug/BatteryUpdateTask.java | 44 ++ src/main/java/jk/zugsteuerung/zug/Color.java | 78 +++ .../zugsteuerung/zug/DistanceUpdateTask.java | 43 ++ .../jk/zugsteuerung/zug/HelloController.java | 30 + .../java/jk/zugsteuerung/zug/Message.java | 64 +++ src/main/java/jk/zugsteuerung/zug/Port.java | 64 +++ src/main/java/jk/zugsteuerung/zug/Train.java | 103 ++++ .../jk/zugsteuerung/zug/TrainConnection.java | 77 +++ .../jk/zugsteuerung/zug/TrainController.java | 99 ++++ .../jk/zugsteuerung/zug/TrainService.java | 537 ++++++++++++++++++ .../java/jk/zugsteuerung/zug/WebConfig.java | 44 ++ .../zug/ZugsteuerungApplication.java | 29 + src/main/resources/application.properties | 3 + .../zugsteuerung/zug/HelloControllerTest.java | 48 ++ .../zug/TrainControllerTests.java | 140 +++++ .../jk/zugsteuerung/zug/TrainServiceTest.java | 460 +++++++++++++++ .../jk/zugsteuerung/zug/WebConfigTest.java | 32 ++ .../zug/ZugsteuerungApplicationTests.java | 32 ++ 26 files changed, 2436 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/MavenWrapperDownloader.java create mode 100644 .mvn/wrapper/maven-wrapper.jar create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 pom.xml create mode 100644 src/main/java/META-INF/additional-spring-configuration-metadata.json create mode 100644 src/main/java/jk/zugsteuerung/zug/BatteryUpdateTask.java create mode 100644 src/main/java/jk/zugsteuerung/zug/Color.java create mode 100644 src/main/java/jk/zugsteuerung/zug/DistanceUpdateTask.java create mode 100644 src/main/java/jk/zugsteuerung/zug/HelloController.java create mode 100644 src/main/java/jk/zugsteuerung/zug/Message.java create mode 100644 src/main/java/jk/zugsteuerung/zug/Port.java create mode 100644 src/main/java/jk/zugsteuerung/zug/Train.java create mode 100644 src/main/java/jk/zugsteuerung/zug/TrainConnection.java create mode 100644 src/main/java/jk/zugsteuerung/zug/TrainController.java create mode 100644 src/main/java/jk/zugsteuerung/zug/TrainService.java create mode 100644 src/main/java/jk/zugsteuerung/zug/WebConfig.java create mode 100644 src/main/java/jk/zugsteuerung/zug/ZugsteuerungApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/jk/zugsteuerung/zug/HelloControllerTest.java create mode 100644 src/test/java/jk/zugsteuerung/zug/TrainControllerTests.java create mode 100644 src/test/java/jk/zugsteuerung/zug/TrainServiceTest.java create mode 100644 src/test/java/jk/zugsteuerung/zug/WebConfigTest.java create mode 100644 src/test/java/jk/zugsteuerung/zug/ZugsteuerungApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ead81fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +HELP.md +/target/ +!.mvn/wrapper/maven-wrapper.jar + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +/build/ + +### VS Code ### +.vscode/ + +### Project related +train_config.json +mvnw +mvnw.cmd diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java new file mode 100644 index 0000000..72308aa --- /dev/null +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -0,0 +1,114 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + https://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URL; +import java.nio.channels.Channels; +import java.nio.channels.ReadableByteChannel; +import java.util.Properties; + +public class MavenWrapperDownloader { + + /** + * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. + */ + private static final String DEFAULT_DOWNLOAD_URL = + "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.2/maven-wrapper-0.4.2.jar"; + + /** + * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to + * use instead of the default one. + */ + private static final String MAVEN_WRAPPER_PROPERTIES_PATH = + ".mvn/wrapper/maven-wrapper.properties"; + + /** + * Path where the maven-wrapper.jar will be saved to. + */ + private static final String MAVEN_WRAPPER_JAR_PATH = + ".mvn/wrapper/maven-wrapper.jar"; + + /** + * Name of the property which should be used to override the default download url for the wrapper. + */ + private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; + + public static void main(String args[]) { + System.out.println("- Downloader started"); + File baseDirectory = new File(args[0]); + System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); + + // If the maven-wrapper.properties exists, read it and check if it contains a custom + // wrapperUrl parameter. + File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); + String url = DEFAULT_DOWNLOAD_URL; + if(mavenWrapperPropertyFile.exists()) { + FileInputStream mavenWrapperPropertyFileInputStream = null; + try { + mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); + Properties mavenWrapperProperties = new Properties(); + mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); + url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); + } catch (IOException e) { + System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); + } finally { + try { + if(mavenWrapperPropertyFileInputStream != null) { + mavenWrapperPropertyFileInputStream.close(); + } + } catch (IOException e) { + // Ignore ... + } + } + } + System.out.println("- Downloading from: : " + url); + + File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); + if(!outputFile.getParentFile().exists()) { + if(!outputFile.getParentFile().mkdirs()) { + System.out.println( + "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'"); + } + } + System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); + try { + downloadFileFromURL(url, outputFile); + System.out.println("Done"); + System.exit(0); + } catch (Throwable e) { + System.out.println("- Error downloading"); + e.printStackTrace(); + System.exit(1); + } + } + + private static void downloadFileFromURL(String urlString, File destination) throws Exception { + URL website = new URL(urlString); + ReadableByteChannel rbc; + rbc = Channels.newChannel(website.openStream()); + FileOutputStream fos = new FileOutputStream(destination); + fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); + fos.close(); + rbc.close(); + } + +} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..01e67997377a393fd672c7dcde9dccbedf0cb1e9 GIT binary patch literal 48337 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 +``` +Der Parameter *--address* ist unbedingt erforderlich um Anfragen aus dem Frontend zuzulassen (aufgrund von 'CORS'). +Hierbei gilt, dass der übergebene Parameter dem entsprechen muss, was als Server Adresse im Webbrowser +angegeben wird. + +Beispiel: Wenn das Webinterface mit *http://raspberrypi.local* aufgerufen wird, dann muss als Parameter +``` +--address=raspberrypi.local +``` +übergeben werden (ohne *http://*). +Wird der Webserver über einen anderen Port aufgerufen, so muss dieser Port auch im Parameter übergeben werden. + +## Lizenz +Dieses Projekt steht unter der [Apache License 2.0](https://spdx.org/licenses/Apache-2.0.html)-Lizenz zur Verfügung. diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6d93ea5 --- /dev/null +++ b/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.1.4.RELEASE + + + jk.zugsteuerung + Zugsteuerung + 1.0.0 + Zugsteuerung + Zugsteuerung für Powered Up Züge + + + 1.8 + + + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-web + + + + org.sputnikdev + bluetooth-manager + 1.5.3 + + + org.sputnikdev + bluetooth-manager-tinyb + 1.3.3 + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + org.springframework.boot + spring-boot-starter-webflux + + + io.projectreactor + reactor-test + test + + + + + + + + diff --git a/src/main/java/META-INF/additional-spring-configuration-metadata.json b/src/main/java/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..8319a3a --- /dev/null +++ b/src/main/java/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,12 @@ +{"properties": [ + { + "name": "address", + "type": "java.lang.String", + "description": "An Address from which requests from the frontend should be allowed." + }, + { + "name": "configpath", + "type": "java.lang.String", + "description": "Path to the config file containing known trains and user settings." + } +]} \ No newline at end of file diff --git a/src/main/java/jk/zugsteuerung/zug/BatteryUpdateTask.java b/src/main/java/jk/zugsteuerung/zug/BatteryUpdateTask.java new file mode 100644 index 0000000..6f59f25 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/BatteryUpdateTask.java @@ -0,0 +1,44 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.sputnikdev.bluetooth.manager.CharacteristicGovernor; + +public class BatteryUpdateTask implements Runnable { + + private TrainConnection trainCon; + + public BatteryUpdateTask(TrainConnection trainCon) { + this.trainCon = trainCon; + } + + @Override + public void run() { + byte[] batteryRequest = new byte[] {5, 0, (byte) 0x1, 0x6, 0x5}; + + Train t = trainCon.getTrain(); + CharacteristicGovernor cg = trainCon.getCharacteristicGovernor(); + + System.out.println("Update Battery for Train " + trainCon.getTrain().getUrl()); + if(t.isOnline() && cg.isReady()) { + cg.write(batteryRequest); + System.out.println("Update Battery for Train " + trainCon.getTrain().getUrl() + " successful"); + } else { + System.out.println("Update Battery for Train " + trainCon.getTrain().getUrl() + " failed"); + } + } +} diff --git a/src/main/java/jk/zugsteuerung/zug/Color.java b/src/main/java/jk/zugsteuerung/zug/Color.java new file mode 100644 index 0000000..a8038a4 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/Color.java @@ -0,0 +1,78 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +public class Color { + + private int r, g, b; + + public Color() {} + public Color(int r, int g, int b) { + this.r = r; + this.g = g; + this.b = b; + } + + public int getB() { + return b; + } + public int getG() { + return g; + } + public int getR() { + return r; + } + public byte toByteB() { + return (byte) b; + } + public byte toByteG() { + return (byte) g; + } + public byte toByteR() { + return (byte) r; + } + + public void setB(int b) { + this.b = b; + } + public void setG(int g) { + this.g = g; + } + public void setR(int r) { + this.r = r; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof Color) { + Color c = (Color) obj; + if(c.r == r && c.g == g && c.b == b) { + return true; + } else { + return false; + } + } else { + return false; + } + } + + @Override + public int hashCode() { + return r + (g << 8) + (b << 16); + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/DistanceUpdateTask.java b/src/main/java/jk/zugsteuerung/zug/DistanceUpdateTask.java new file mode 100644 index 0000000..2178282 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/DistanceUpdateTask.java @@ -0,0 +1,43 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.sputnikdev.bluetooth.manager.CharacteristicGovernor; + +public class DistanceUpdateTask implements Runnable { + + TrainConnection trainCon; + + public DistanceUpdateTask(TrainConnection trainCon) { + this.trainCon = trainCon; + } + + @Override + public void run() { + byte[] rssiRequest = new byte[] {5, 0, (byte) 0x1, 0x5, 0x5}; + + Train t = trainCon.getTrain(); + CharacteristicGovernor cg = trainCon.getCharacteristicGovernor(); + + if(t.isOnline() && cg.isReady()) { + cg.write(rssiRequest); + System.out.println("Update Distance for Train " + trainCon.getTrain().getUrl() + " successful"); + } else { + System.out.println("Update Distance for Train " + trainCon.getTrain().getUrl() + " failed"); + } + } +} diff --git a/src/main/java/jk/zugsteuerung/zug/HelloController.java b/src/main/java/jk/zugsteuerung/zug/HelloController.java new file mode 100644 index 0000000..48f75c2 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/HelloController.java @@ -0,0 +1,30 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloController { + + @RequestMapping("/") + public String index() { + return "HELLO"; + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/Message.java b/src/main/java/jk/zugsteuerung/zug/Message.java new file mode 100644 index 0000000..93a4e4e --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/Message.java @@ -0,0 +1,64 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +public class Message { + + private byte[] array; + private int messageLength; + + public Message(byte[] messageArray) { + array = messageArray; + messageLength = array[0]; + if(messageLength > array.length) { + messageLength = array.length; + array[0] = (byte) messageLength; + } + } + + public byte[] getByteArray() { + return array; + } + + public byte byteAt(int index) { + return array[index]; + } + + public String getString(int start, int length) { + return new String(array, start, length); + } + + + public static Message motorPowerChange(int portId, int power) { + return new Message(new byte[] {8, 0, (byte) 0x81, (byte) portId, 0x11, 0x51, 0, (byte) power}); + } + + public static Message ledChange(int colorIndex) { + return new Message(new byte[] {8, 0, (byte) 0x81, 0x32, 0x11, 0x51, 0x00, (byte) colorIndex}); + } + + public static Message ledChangeRgb(Color c) { + // Command Port Output(0x81), LED Port(0x32), Execute without buffer(0x11) + // Sub Command WriteDirectModeData(0x51), RGB Mode(0x01) + return new Message(new byte[] {10, 0, (byte) 0x81, 0x32, 0x11, 0x51, 0x01, c.toByteR(), c.toByteG(), c.toByteB()}); + } + + public static Message shutdown() { + return new Message(new byte[] {4, 0, (byte) 0x2, 0x1}); + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/Port.java b/src/main/java/jk/zugsteuerung/zug/Port.java new file mode 100644 index 0000000..774daa0 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/Port.java @@ -0,0 +1,64 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +public class Port { + + private String url; + private int id, deviceType, power; + + public Port() { + url = ""; + } + + public Port(String url, int id, int deviceType) { + this.url = url; + this.id = id; + this.deviceType = deviceType; + } + + public int getDeviceType() { + return deviceType; + } + + public int getId() { + return id; + } + + public int getPower() { + return power; + } + + public String getUrl() { + return url; + } + + /**Sets the type of the connected LPF2 Device according to the + * io-type-id list. + * + * @param deviceType + */ + public void setDeviceType(int deviceType) { + this.deviceType = deviceType; + } + + public void setPower(int power) { + this.power = power; + } + + +} diff --git a/src/main/java/jk/zugsteuerung/zug/Train.java b/src/main/java/jk/zugsteuerung/zug/Train.java new file mode 100644 index 0000000..87da36a --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/Train.java @@ -0,0 +1,103 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import java.util.HashMap; +import java.util.Map; + +public class Train { + + private final String url; + private String name; + private float battery, power, distance; + private boolean online; + private Map ports; + private Color color; + + + + public Train() { + this("", ""); + } + + public Train(String url, String name) { + this.name = name; + this.url = url; + this.battery = 1.0f; + this.power = 0.0f; + this.online = false; + this.color = new Color(0, 200, 0); + this.distance = 0.0f; + ports = new HashMap<>(); + } + + + public float getBattery() { + return battery; + } + + public Color getColor() { + return color; + } + + public float getDistance() { + return distance; + } + + public String getName() { + return name; + } + + public Map getPorts() { + return ports; + } + + public float getPower() { + return power; + } + + public String getUrl() { + return url; + } + + + public boolean isOnline() { + return online; + } + + + public void setBattery(float battery) { + this.battery = battery; + } + + public void setColor(Color color) { + this.color = color; + } + + public void setDistance(float distance) { + this.distance = distance; + } + + public void setOnline(boolean online) { + this.online = online; + } + + public void setPower(float power) { + this.power = power; + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/TrainConnection.java b/src/main/java/jk/zugsteuerung/zug/TrainConnection.java new file mode 100644 index 0000000..762411e --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/TrainConnection.java @@ -0,0 +1,77 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import java.util.concurrent.ScheduledFuture; + +import org.sputnikdev.bluetooth.manager.CharacteristicGovernor; +import org.sputnikdev.bluetooth.manager.DeviceGovernor; +import org.sputnikdev.bluetooth.manager.ValueListener; + +public class TrainConnection { + + private Train train; + + private DeviceGovernor deviceGovernor; + private CharacteristicGovernor characteristicGovernor; + + private ScheduledFuture batteryTask; + private ScheduledFuture distanceTask; + private ValueListener valueListener; + + public TrainConnection(Train t) { + train = t; + } + + public Train getTrain() { + return train; + } + public void setTrain(Train train) { + this.train = train; + } + public DeviceGovernor getDeviceGovernor() { + return deviceGovernor; + } + public void setDeviceGovernor(DeviceGovernor deviceGovernor) { + this.deviceGovernor = deviceGovernor; + } + public CharacteristicGovernor getCharacteristicGovernor() { + return characteristicGovernor; + } + public void setCharacteristicGovernor(CharacteristicGovernor characteristicGovernor) { + this.characteristicGovernor = characteristicGovernor; + } + public ScheduledFuture getBatteryTask() { + return batteryTask; + } + public void setBatteryTask(ScheduledFuture batteryTask) { + this.batteryTask = batteryTask; + } + public ScheduledFuture getDistanceTask() { + return distanceTask; + } + public void setDistanceTask(ScheduledFuture distanceTask) { + this.distanceTask = distanceTask; + } + public ValueListener getValueListener() { + return valueListener; + } + public void setValueListener(ValueListener valueListener) { + this.valueListener = valueListener; + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/TrainController.java b/src/main/java/jk/zugsteuerung/zug/TrainController.java new file mode 100644 index 0000000..ba184ee --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/TrainController.java @@ -0,0 +1,99 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import reactor.core.publisher.Flux; + +@RestController +public class TrainController { + + @Autowired + private TrainService trainService; + + + @RequestMapping("api/train") + public Train updateTrain(@RequestBody Train train) { + return trainService.updateTrain(train); + } + + @RequestMapping("api/port") + public void updatePort(@RequestBody Port port) { + trainService.updatePort(port); + } + + @RequestMapping("api/trainList") + public Train[] trainList() { + return trainService.trainList(); + } + + @RequestMapping("api/discover") + public String discover() { + trainService.toggleDiscovery(); + + if(trainService.isDiscovering()) { + return "1"; + } else { + return "0"; + } + } + + @RequestMapping("api/connect") + public void connect(@RequestBody Train receivedTrain) { + trainService.connect(receivedTrain); + } + + @RequestMapping("api/trainUpdateStream") + public Flux trainUpdateStream() { + return Flux.create(emitter -> { + TrainService.TrainListener tl = train -> emitter.next(train); + trainService.registerTrainListener(tl); + emitter.onDispose(() -> { + trainService.unregisterTrainListener(tl); + }); + }); + } + + @RequestMapping("api/disconnect") + public void shutdownTrain(@RequestBody Train train) { + trainService.shutdownTrain(train); + } + + @RequestMapping("api/connectAll") + public void connectAllTrains() { + trainService.connectAllTrains(); + } + + @RequestMapping("api/disconnectAll") + public void disconnectAllTrains() { + trainService.disconnectAllTrains(); + } + + @RequestMapping("api/remove") + public void removeTrain(@RequestBody Train train) { + trainService.removeTrain(train); + } + + @RequestMapping("api/stopAll") + public void stopAll() { + trainService.stopAll(); + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/TrainService.java b/src/main/java/jk/zugsteuerung/zug/TrainService.java new file mode 100644 index 0000000..558074f --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/TrainService.java @@ -0,0 +1,537 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import java.io.File; +import java.io.IOException; +import java.time.Instant; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ScheduledFuture; +import java.util.function.Function; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.stereotype.Service; +import org.sputnikdev.bluetooth.URL; +import org.sputnikdev.bluetooth.manager.BluetoothGovernor; +import org.sputnikdev.bluetooth.manager.BluetoothManager; +import org.sputnikdev.bluetooth.manager.CharacteristicGovernor; +import org.sputnikdev.bluetooth.manager.DeviceDiscoveryListener; +import org.sputnikdev.bluetooth.manager.DeviceGovernor; +import org.sputnikdev.bluetooth.manager.DiscoveredDevice; +import org.sputnikdev.bluetooth.manager.ValueListener; +import org.sputnikdev.bluetooth.manager.impl.BluetoothManagerBuilder; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +@Service +public class TrainService { + + public class MessageType { + final static int HUB_PROPERTIES = 0x01; + final static int HUB_ACTIONS = 0x02; + final static int HUB_ALERTS = 0x03; + final static int HUB_ATTACHED_IO = 0x04; + final static int ERROR = 0x05; + + final static int PORT_MODE_INFORMATION = 0x44; + } + + private ThreadPoolTaskScheduler taskScheduler; + private Map trainMap = new HashMap(); + + private BluetoothManager bluetoothManager = null; + private boolean discovery = false; + private DeviceDiscoveryListener deviceDiscoveryListener; + private URL adapterUrl; + + private List trainListeners = new CopyOnWriteArrayList(); + private Map handlerMap = new HashMap(); + + @Value("${configpath}") + private String configPath; + + + public interface TrainListener { + void onTrainUpdate(Train t); + } + + public interface MessageHandler { + void handleMessage(TrainConnection trainCon, Message m); + } + + public TrainService() { + taskScheduler = new ThreadPoolTaskScheduler(); + taskScheduler.setPoolSize(1); // We use it as a queue so only one Thread should exist + taskScheduler.initialize(); + + handlerMap.put(MessageType.HUB_ATTACHED_IO, this::hubAttachedIoHandler); + handlerMap.put(MessageType.HUB_PROPERTIES, this::hubPropertiesHandler); + handlerMap.put(MessageType.PORT_MODE_INFORMATION, this::portModeInformationHandler); + } + + @PostConstruct + public void loadConfig() { + File configFile = new File(configPath); + if(configFile.isFile()) { + ObjectMapper mapper = new ObjectMapper(); + try { + JsonNode mainConfigNode = mapper.readTree(configFile); + mainConfigNode.get("trains").forEach(trainNode -> { + try { + Train t = mapper.treeToValue(trainNode, Train.class); + trainMap.put(t.getUrl(), new TrainConnection(t)); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + }); + } catch (IOException e) { + System.err.println("Error while reading configuration file."); + } + } + } + + @PreDestroy + public void saveConfig() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + ObjectNode mainConfigNode = mapper.createObjectNode(); + ArrayNode trainListNode = mainConfigNode.putArray("trains"); + trainMap.values().forEach(trainCon -> { + trainCon.getTrain().setBattery(0); + trainCon.getTrain().setOnline(false); + trainListNode.addPOJO(trainCon.getTrain()); + }); + mapper.writerWithDefaultPrettyPrinter().writeValue(new File(configPath), mainConfigNode); + + } + + public void registerTrainListener(TrainListener tl) { + trainListeners.add(tl); + } + + public void unregisterTrainListener(TrainListener tl) { + trainListeners.remove(tl); + } + + public void pushTrainUpdate(Train t) { + trainListeners.forEach(listener -> listener.onTrainUpdate(t)); + } + + + public void enqueueMotorUpdate(Port port) { + taskScheduler.schedule(new Runnable() { + + @Override + public void run() { + Message powerChangeMessage = Message.motorPowerChange(port.getId(), port.getPower()); + CharacteristicGovernor cg = trainMap.get(port.getUrl()).getCharacteristicGovernor(); + if(cg.isReady() && cg.isWritable()) { + cg.write(powerChangeMessage.getByteArray()); + } + } + + }, Instant.now()); + } + + public void enqueueLedColorUpdate(Train t, int delay) { + taskScheduler.schedule(new Runnable() { + + @Override + public void run() { + Color c = t.getColor(); + + // Workaround since RGB Mode does not yet work + int colorIndex = 0; + if(c.getR() == 0 && c.getG() == 200 && c.getB() == 0) { colorIndex = 6; } + if(c.getR() == 240 && c.getG() == 220 && c.getB() == 0) { colorIndex = 7; } + if(c.getR() == 180 && c.getG() == 20 && c.getB() == 0) { colorIndex = 9; } + if(c.getR() == 120 && c.getG() == 0 && c.getB() == 160) { colorIndex = 2; } + if(c.getR() == 0 && c.getG() == 100 && c.getB() == 180) { colorIndex = 3; } + if(c.getR() == 0 && c.getG() == 160 && c.getB() == 220) { colorIndex = 4; } + if(c.getR() == 180 && c.getG() == 180 && c.getB() == 180) { colorIndex = 5; } + if(c.getR() == 240 && c.getG() == 240 && c.getB() == 240) { colorIndex = 10;} + + Message changeLed = Message.ledChange(colorIndex); + CharacteristicGovernor cg = trainMap.get(t.getUrl()).getCharacteristicGovernor(); + if(cg.isReady() && cg.isWritable()) { + cg.write(changeLed.getByteArray()); + } + } + + }, Instant.now().plusMillis(delay)); + } + + public void enqueuePortInfo(Train t, int portId, int mode, int informationType, int delay) { + taskScheduler.schedule(new Runnable() { + + @Override + public void run() { + byte[] command = new byte[] {6, 0, 0x22, (byte) portId, (byte) mode, (byte) informationType}; + CharacteristicGovernor cg = trainMap.get(t.getUrl()).getCharacteristicGovernor(); + if(cg.isReady() && cg.isWritable()) { + cg.write(command); + } + } + + }, Instant.now().plusMillis(delay)); + } + + public void enqueuePortInfo2(Train t, int portId, int informationType, int delay) { + taskScheduler.schedule(new Runnable() { + + @Override + public void run() { + byte[] command = new byte[] {6, 0, 0x21, (byte) portId, (byte) informationType}; + CharacteristicGovernor cg = trainMap.get(t.getUrl()).getCharacteristicGovernor(); + if(cg.isReady() && cg.isWritable()) { + cg.write(command); + } + } + + }, Instant.now().plusMillis(delay)); + } + + public Train updateTrain(Train train) { + Train t = trainMap.get(train.getUrl()).getTrain(); + + Color newColor = new Color( + clamp(train.getColor().getR(), 0, 255), + clamp(train.getColor().getG(), 0, 255), + clamp(train.getColor().getB(), 0, 255)); + if(!t.getColor().equals(newColor)) { + t.setColor(newColor); + if(t.isOnline()) { + enqueueLedColorUpdate(t, 100); + } + } + + return t; + } + + public void updatePort(Port port) { + Train t = trainMap.get(port.getUrl()).getTrain(); + Port p = t.getPorts().get(port.getId()); + + if(p == null || !t.isOnline()) { // Maybe Port detached shortly after the user tried to use it + // TODO Send the Client the current train? + return; + } + + int newPowerValue = clamp(port.getPower(), -100, 100); + if(p.getPower() != newPowerValue) { + p.setPower(newPowerValue); + + enqueueMotorUpdate(p); + } + + return; + } + + public Train[] trainList() { + List trainList = new ArrayList<>(); + trainMap.values().forEach(trainCon -> trainList.add(trainCon.getTrain())); + return trainList.toArray(new Train[0]); + } + + public void toggleDiscovery() { + if(discovery) { + discovery = false; + bluetoothManager.removeDeviceDiscoveryListener(deviceDiscoveryListener); + //bluetoothManager.getAdapterGovernor(adapterUrl).setDiscoveringControl(false); + } else { + discovery = true; + ensureBluetoothAvailable(); + + //bluetoothManager.getAdapterGovernor(adapterUrl).setDiscoveringControl(true); + // Process devices discovered before discovery was activated since they wont be received by the discovery listener again + bluetoothManager.getDiscoveredDevices().forEach(discoveredDevice -> onDiscoveredDevice(discoveredDevice)); + // Process newly detected devices + bluetoothManager.addDeviceDiscoveryListener(deviceDiscoveryListener = new DeviceDiscoveryListener() { + + @Override + public void discovered(DiscoveredDevice discoveredDevice) { + onDiscoveredDevice(discoveredDevice); + } + }); + } + + /*byte[] data; + for (DeviceGovernor b : bleDeviceMap.values()) { + // LEGO Manufacturer ID is 0x397 / 919 + Map manufacturerData = b.getManufacturerData(); + byte[] releventData = manufacturerData.get((short) 0x397); + if(releventData == null) { + continue; + } + // relevantData has everything after the manufacturer id + System.out.println("Button State (must be 0 or 1): " + releventData[0]); + byte systemTypeAndDeviceNumber = releventData[1]; + System.out.println("System Type and Device Number (0x0 - 0xff): " + systemTypeAndDeviceNumber); + System.out.println("Device Capabilities (0x01 - 0xff): " + releventData[2]); + System.out.println("Last network (0 - 255): " + releventData[3]); + System.out.println("Status (0 - 255): " + releventData[4]); + System.out.println("Option (0 - 255): " + releventData[5]); + + String[] systemTypes = {"LEGO Wedo 2.0", "LEGO Duplo", "LEGO System", "LEGO System"}; + int systemType = (systemTypeAndDeviceNumber & 0xd0) >> 5; + System.out.println("System type: " + systemTypes[systemType]); + + if(systemType == 2) { + String[] deviceNumbers = {"", "2 Port Hub", "2 Port Handset", ""}; + int deviceNumber = systemTypeAndDeviceNumber & 0x1f; + System.out.println("Device Number: " + deviceNumbers[deviceNumber]); + } + }*/ + } + + public void onDiscoveredDevice(DiscoveredDevice discoveredDevice) { + System.out.println("Discovered " + discoveredDevice.getDisplayName() + "/" + discoveredDevice.getURL().getDeviceAddress()); + + // Only connect to Lego Devices based on MAC address + if(!discoveredDevice.getURL().getDeviceAddress().startsWith("90:84:2B") // LEGO System A/S + && !discoveredDevice.getURL().getDeviceAddress().startsWith("00:16:53")) { // LEGO System A/S IE Electronics Division + return; + } + + if(trainMap.containsKey(discoveredDevice.getURL().getDeviceAddress())) { + return; + } + + Train t = new Train( + discoveredDevice.getURL().getDeviceAddress(), + discoveredDevice.getDisplayName()); + + trainMap.put(t.getUrl(), new TrainConnection(t)); + + pushTrainUpdate(t); + } + + public boolean isDiscovering() { + return discovery; + } + + public void connect(Train receivedTrain) { + TrainConnection trainCon = trainMap.get(receivedTrain.getUrl()); + Train train = trainCon.getTrain(); + if(train.isOnline()) { + return; + } + + ensureBluetoothAvailable(); + DeviceGovernor deviceGov = trainCon.getDeviceGovernor(); + if(deviceGov == null){ + + deviceGov = bluetoothManager.getDeviceGovernor(adapterUrl.copyWithDevice(train.getUrl())); + trainCon.setDeviceGovernor(deviceGov); + + CharacteristicGovernor charaGov = trainCon.getCharacteristicGovernor(); + if(charaGov == null) { + charaGov = bluetoothManager.getCharacteristicGovernor(deviceGov.getURL().copyWith("00001623-1212-EFDE-1623-785FEABCD123", "00001624-1212-EFDE-1623-785FEABCD123"), true); + trainCon.setCharacteristicGovernor(charaGov); + } + + if(trainCon.getValueListener() == null) { + ValueListener vl = new ValueListener() { + + @Override + public void changed(byte[] value) { + System.out.println(Arrays.toString(value)); + int messageType = value[2]; + if(handlerMap.containsKey(messageType)) { + handlerMap.get(messageType).handleMessage(trainCon, new Message(value)); + } + } + }; + charaGov.addValueListener(vl); + trainCon.setValueListener(vl); + } + + charaGov.whenReady(new Function() { + + @Override + public Integer apply(BluetoothGovernor bg) { + System.out.println("Train connected!"); + + ScheduledFuture batteryFuture = taskScheduler.scheduleWithFixedDelay(new BatteryUpdateTask(trainCon), 20_000); + trainCon.setBatteryTask(batteryFuture); + + ScheduledFuture distanceFuture = taskScheduler.scheduleWithFixedDelay(new DistanceUpdateTask(trainCon), 15_000); + trainCon.setDistanceTask(distanceFuture); + + train.setOnline(true); + + pushTrainUpdate(train); + + return 0; + } + + }); + + } + } + + public void hubPropertiesHandler(TrainConnection trainCon, Message m) { + int property = m.byteAt(3); + //int operation = value[4]; // can only be 6 here for Upstream Update + if(property == 5) { // RSSI + int rssi = m.byteAt(5); // Between -127 and 0 + trainCon.getTrain().setDistance((-rssi) / 127f); + pushTrainUpdate(trainCon.getTrain()); + //System.out.println("RSSI: " + rssi); + } + if(property == 6) { // Battery Voltage + int battery = m.byteAt(5); // Between 0 and 100 + trainCon.getTrain().setBattery(battery); + pushTrainUpdate(trainCon.getTrain()); + } + } + public void hubAttachedIoHandler(TrainConnection trainCon, Message m) { + int portId = m.byteAt(3); + if(m.byteAt(4) == 1) { // Type: Attached + Port p = new Port(trainCon.getTrain().getUrl(), portId, m.byteAt(5)); + trainCon.getTrain().getPorts().put(p.getId(), p); + System.out.println("Attached Device at Port " + portId); + + // TODO After Reconnect, Ports are rediscovered -> set Power if it was non-zero before? + + // Check for LED Port(50/0x32), if there is one we change its color away from the default white + if(portId == 0x32) { + enqueueLedColorUpdate(trainCon.getTrain(), 300); + } + + if(portId == 59 || portId == 60 || portId == 50) { + //enqueuePortInfo(train, portId, 1, 0, 800 + portId * 30); + //enqueuePortInfo(train, portId, 1, 1, 3800 + portId * 30); + //enqueuePortInfo(train, portId, 1, 2, 8000 + portId * 30); + //enqueuePortInfo(train, portId, 1, 3, 12000 + portId * 30); + //enqueuePortInfo(train, portId, 1, 4, 16000 + portId * 30); + } + + //enqueuePortInfo2(train, portId, 0, 21000 + portId * 30); + //enqueuePortInfo2(train, portId, 1, 25000 + portId * 30); + } + if(m.byteAt(4) == 0) { // Type: Detached + trainCon.getTrain().getPorts().remove(portId); + System.out.println("Detached Device at Port " + portId); + } + // Push Port info to clients + pushTrainUpdate(trainCon.getTrain()); + } + public void portModeInformationHandler(TrainConnection trainCon, Message m) { + int portId = m.byteAt(3); + //int mode = m.byteAt(4); + int informationType = m.byteAt(5); + if(informationType == 0) { + String name = m.getString(6, 11); // Length should be derived from message length but message length is 18 independent of name length + // So we do what the Hub currently delivers instead of what the LEGO documentation says. + System.out.println("Port " + portId + " has Name " + name); + } + if(informationType == 4) { + String name = m.getString(6, 5); + System.out.println("Port " + portId + " has Unit " + name); + } + } + + public void shutdownTrain(Train train) { + TrainConnection trainCon = trainMap.get(train.getUrl()); + Train t = trainCon.getTrain(); + if(!t.isOnline()) { + return; + } + + Message shutdownMessage = Message.shutdown(); + CharacteristicGovernor cg = trainCon.getCharacteristicGovernor(); + + if(cg.isReady()) { + cg.write(shutdownMessage.getByteArray()); + t.setOnline(false); + trainCon.setCharacteristicGovernor(null); + trainCon.getDeviceGovernor().setConnectionControl(false); + trainCon.setDeviceGovernor(null); + + trainCon.getBatteryTask().cancel(false); + trainCon.setBatteryTask(null); + trainCon.getDistanceTask().cancel(false); + trainCon.setDistanceTask(null); + cg.removeValueListener(trainCon.getValueListener()); + trainCon.setValueListener(null); + + trainCon.getTrain().getPorts().values().forEach(port -> port.setPower(0)); + pushTrainUpdate(trainCon.getTrain()); + } + + } + + public void connectAllTrains() { + trainMap.values().forEach(trainCon -> connect(trainCon.getTrain())); + } + + public void disconnectAllTrains() { + trainMap.values().forEach(trainCon -> shutdownTrain(trainCon.getTrain())); + } + + public void removeTrain(Train train) { + Train t = trainMap.get(train.getUrl()).getTrain(); + if(t.isOnline()) { + shutdownTrain(train); + } + trainMap.remove(train.getUrl()); + } + + public void stopAll() { + trainMap.values().forEach(trainCon -> { + if(trainCon.getTrain().isOnline()) { + trainCon.getTrain().getPorts().values().forEach(port -> { + if(port.getDeviceType() == 1 || port.getDeviceType() == 2) { + port.setPower(0); + enqueueMotorUpdate(port); + } + }); + pushTrainUpdate(trainCon.getTrain()); + } + }); + } + + private void ensureBluetoothAvailable() { + if(bluetoothManager == null) { + bluetoothManager = new BluetoothManagerBuilder() + .withTinyBTransport(true) + .withDiscovering(true) + .withStarted(true) + .build(); + bluetoothManager.getDiscoveredAdapters().forEach(discoveredAdapter -> adapterUrl = discoveredAdapter.getURL()); + System.out.println("Adapter: " + adapterUrl.toString()); + } + } + + private int clamp(int value, int min, int max) { + return Math.min(max, Math.max(min, value)); + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/WebConfig.java b/src/main/java/jk/zugsteuerung/zug/WebConfig.java new file mode 100644 index 0000000..6c4779c --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/WebConfig.java @@ -0,0 +1,44 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor; +import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@EnableWebMvc +public class WebConfig implements WebMvcConfigurer { + + @Value("${address}") + private String address; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**").allowedOrigins("http://" + address); + } + + @Override + public void configureAsyncSupport(AsyncSupportConfigurer configurer) { + configurer.setTaskExecutor(new ConcurrentTaskExecutor()); // DONT USE ThreadPoolTaskExecutor !!!!! It breaks the trainUpdateStream. + } + +} diff --git a/src/main/java/jk/zugsteuerung/zug/ZugsteuerungApplication.java b/src/main/java/jk/zugsteuerung/zug/ZugsteuerungApplication.java new file mode 100644 index 0000000..55acc97 --- /dev/null +++ b/src/main/java/jk/zugsteuerung/zug/ZugsteuerungApplication.java @@ -0,0 +1,29 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class ZugsteuerungApplication { + + public static void main(String[] args) { + SpringApplication.run(ZugsteuerungApplication.class, args); + } + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..57128c5 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring.devtools.remote.secret=4749849904047654320745311 +address=localhost:4200 +configpath=train_config.json diff --git a/src/test/java/jk/zugsteuerung/zug/HelloControllerTest.java b/src/test/java/jk/zugsteuerung/zug/HelloControllerTest.java new file mode 100644 index 0000000..301106b --- /dev/null +++ b/src/test/java/jk/zugsteuerung/zug/HelloControllerTest.java @@ -0,0 +1,48 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import static org.hamcrest.Matchers.equalTo; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.http.MediaType; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; + +@RunWith(SpringRunner.class) +@SpringBootTest +@AutoConfigureMockMvc +public class HelloControllerTest { + + @Autowired + private MockMvc mvc; + + @Test + public void testIndex() throws Exception { + mvc.perform(MockMvcRequestBuilders.get("/").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(equalTo("HELLO"))); + } + +} diff --git a/src/test/java/jk/zugsteuerung/zug/TrainControllerTests.java b/src/test/java/jk/zugsteuerung/zug/TrainControllerTests.java new file mode 100644 index 0000000..0692359 --- /dev/null +++ b/src/test/java/jk/zugsteuerung/zug/TrainControllerTests.java @@ -0,0 +1,140 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.test.context.junit4.SpringRunner; + +import jk.zugsteuerung.zug.Port; +import jk.zugsteuerung.zug.Train; +import jk.zugsteuerung.zug.TrainController; +import jk.zugsteuerung.zug.TrainService; +import reactor.core.Disposable; +import reactor.core.publisher.Flux; + +@RunWith(SpringRunner.class) +@SpringBootTest +//@WebMvcTest +public class TrainControllerTests { + + @MockBean + private TrainService trainService; + + @Autowired + private TrainController trainController; + + private Train testTrain = new Train(); + private Port testPort = new Port(); + + @Test + public void testTrainController() { + TrainController trainController = new TrainController(); + assertNotNull("Cant construct TrainController", trainController); + } + + @Test + public void testUpdateTrain() { + trainController.updateTrain(testTrain); + Mockito.verify(trainService).updateTrain(testTrain); + } + + @Test + public void testUpdatePort() { + trainController.updatePort(testPort); + Mockito.verify(trainService).updatePort(testPort); + } + + @Test + public void testTrainList() { + Train[] testTrainArray = new Train[0]; + Mockito.when(trainService.trainList()).thenReturn(testTrainArray); + Train[] receivedArray = trainController.trainList(); + assertArrayEquals(testTrainArray, receivedArray); + } + + @Test + public void testDiscover() { + Mockito.when(trainService.isDiscovering()).thenReturn(true); + String receivedString = trainController.discover(); + assertEquals("1", receivedString); + + Mockito.when(trainService.isDiscovering()).thenReturn(false); + receivedString = trainController.discover(); + assertEquals("0", receivedString); + } + + @Test + public void testConnect() { + trainController.connect(testTrain); + Mockito.verify(trainService).connect(testTrain); + } + + @Test + public void testTrainUpdateStream() { + ArgumentCaptor trainListenerCaptor = ArgumentCaptor.forClass(TrainService.TrainListener.class); + + Flux flux = trainController.trainUpdateStream(); + assertNotNull(flux); + + Disposable fluxDisposable = flux.subscribe(train -> assertEquals(testTrain, train)); + Mockito.verify(trainService).registerTrainListener(trainListenerCaptor.capture()); + TrainService.TrainListener tl = trainListenerCaptor.getValue(); + tl.onTrainUpdate(testTrain); + + fluxDisposable.dispose(); + Mockito.verify(trainService).unregisterTrainListener(tl); + } + + @Test + public void testShutdownTrain() { + trainController.shutdownTrain(testTrain); + Mockito.verify(trainService).shutdownTrain(testTrain); + } + + @Test + public void testConnectAllTrains() { + trainController.connectAllTrains(); + Mockito.verify(trainService).connectAllTrains(); + } + + @Test + public void testDisconnectAllTrains() { + trainController.disconnectAllTrains(); + Mockito.verify(trainService).disconnectAllTrains(); + } + + @Test + public void testRemoveTrain() { + trainController.removeTrain(testTrain); + Mockito.verify(trainService).removeTrain(testTrain); + } + + @Test + public void testStopAll() { + trainController.stopAll(); + Mockito.verify(trainService).stopAll(); + } + +} diff --git a/src/test/java/jk/zugsteuerung/zug/TrainServiceTest.java b/src/test/java/jk/zugsteuerung/zug/TrainServiceTest.java new file mode 100644 index 0000000..48e3b77 --- /dev/null +++ b/src/test/java/jk/zugsteuerung/zug/TrainServiceTest.java @@ -0,0 +1,460 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static java.nio.file.StandardOpenOption.*; + +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.time.Instant; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ScheduledFuture; +import java.util.function.Function; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.mock.mockito.SpyBean; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.util.ReflectionTestUtils; +import org.sputnikdev.bluetooth.URL; +import org.sputnikdev.bluetooth.manager.BluetoothGovernor; +import org.sputnikdev.bluetooth.manager.BluetoothManager; +import org.sputnikdev.bluetooth.manager.CharacteristicGovernor; +import org.sputnikdev.bluetooth.manager.DeviceGovernor; +import org.sputnikdev.bluetooth.manager.DiscoveredDevice; +import org.sputnikdev.bluetooth.manager.ValueListener; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import jk.zugsteuerung.zug.Color; +import jk.zugsteuerung.zug.Message; +import jk.zugsteuerung.zug.Port; +import jk.zugsteuerung.zug.Train; +import jk.zugsteuerung.zug.TrainConnection; +import jk.zugsteuerung.zug.TrainService; +import jk.zugsteuerung.zug.TrainService.MessageHandler; +import jk.zugsteuerung.zug.TrainService.TrainListener; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class TrainServiceTest { + + @SpyBean + private TrainService trainService; + + @Rule + public TemporaryFolder configFolder = new TemporaryFolder(); + + @Mock + private ThreadPoolTaskScheduler mockScheduler; + @Mock + private BluetoothManager mockBtManager; + @Mock + private CharacteristicGovernor mockCharacteristicGovernor; + @Mock + private Map mockHandlerMap; + + private Map internalTrainMap; + + private Train testTrain, offlineTrain; + private Port testPort, offlinePort; + private TrainConnection testTrainCon, offlineTrainCon; + + @SuppressWarnings("unchecked") + @Before + public void setUp() { + ReflectionTestUtils.setField(trainService, "taskScheduler", mockScheduler); + ReflectionTestUtils.setField(trainService, "bluetoothManager", mockBtManager); + testTrain = new Train("90:84:2B:00:00:00", "TestTrain"); + testTrain.setOnline(true); + testTrain.setColor(new Color(50, -20, 300)); + testPort = new Port(testTrain.getUrl(), 0, 1); + testPort.setPower(120); + testTrain.getPorts().put(testPort.getId(), testPort); + + offlineTrain = new Train("90:84:2B:FF:FF:FF", "OfflineTrain"); + offlineTrain.setOnline(false); + offlinePort = new Port(offlineTrain.getUrl(), 0, 1); + offlinePort.setPower(-50); + offlineTrain.getPorts().put(offlinePort.getId(), offlinePort); + internalTrainMap = (Map) ReflectionTestUtils.getField(trainService, "trainMap"); + internalTrainMap.clear(); + internalTrainMap.put(testTrain.getUrl(), testTrainCon = new TrainConnection(testTrain)); + internalTrainMap.put(offlineTrain.getUrl(), offlineTrainCon = new TrainConnection(offlineTrain)); + } + + @Test + public void testTrainService() { + assertNotNull(ReflectionTestUtils.getField(trainService, "taskScheduler")); + } + + @Test + public void testLoadConfig() throws IOException { + File configFile = configFolder.newFile(); + String configContent = "{\r\n" + + " \"trains\" : [ {\r\n" + + " \"url\" : \"1\",\r\n" + + " \"name\" : \"TestTrain\",\r\n" + + " \"battery\" : 0.0,\r\n" + + " \"power\" : 0.0,\r\n" + + " \"distance\" : 0.0,\r\n" + + " \"online\" : false,\r\n" + + " \"ports\" : { },\r\n" + + " \"color\" : {\r\n" + + " \"r\" : 0,\r\n" + + " \"g\" : 200,\r\n" + + " \"b\" : 0\r\n" + + " }\r\n" + + " } ]\r\n" + + "}"; + Files.write(configFile.toPath(), Collections.singletonList(configContent), StandardCharsets.UTF_8, CREATE, TRUNCATE_EXISTING, WRITE); + TrainService trainService = new TrainService(); + ReflectionTestUtils.setField(trainService, "configPath", configFile.toString()); + + trainService.loadConfig(); + @SuppressWarnings("unchecked") + Map trainMap = (Map) ReflectionTestUtils.getField(trainService, "trainMap"); + assertEquals(1, trainMap.size()); + assertNotNull(trainMap.get("1")); + assertEquals("TestTrain", trainMap.get("1").getTrain().getName()); + } + + @Test + public void testSaveConfig() throws IOException { + File configFile = configFolder.newFile(); + TrainService trainService = new TrainService(); + ReflectionTestUtils.setField(trainService, "configPath", configFile.toString()); + @SuppressWarnings("unchecked") + Map trainMap = (Map) ReflectionTestUtils.getField(trainService, "trainMap"); + Train testTrain = new Train("12:34", "TestTrain"); + testTrain.setOnline(true); + trainMap.put("1", new TrainConnection(testTrain)); + + trainService.saveConfig(); + List configLines = Files.readAllLines(configFile.toPath()); + StringBuilder configBuilder = new StringBuilder(); + configLines.forEach(line -> configBuilder.append(line)); + String savedConfig = configBuilder.toString(); + ObjectMapper mapper = new ObjectMapper(); + JsonNode mainConfigNode = mapper.readTree(savedConfig); + + assertNotNull(mainConfigNode.get("trains")); + assertEquals(1, mainConfigNode.get("trains").size()); + JsonNode trainNode = mainConfigNode.get("trains").get(0); + Train t = mapper.treeToValue(trainNode, Train.class); + assertEquals("12:34", t.getUrl()); + assertEquals("TestTrain", t.getName()); + assertEquals(false, t.isOnline()); + } + + @Test + public void testRegisterAndUnregisterTrainListener() { + TrainListener listener = new TrainListener() { + @Override + public void onTrainUpdate(Train t) {} + }; + trainService.registerTrainListener(listener); + @SuppressWarnings("unchecked") + List trainListeners = (List) ReflectionTestUtils.getField(trainService, "trainListeners"); + assertTrue(trainListeners.contains(listener)); + + trainService.unregisterTrainListener(listener); + assertFalse(trainListeners.contains(listener)); + } + + @Test + public void testPushTrainUpdate() { + final Train testTrain = new Train(); + final class Counter {int i = 0;}; + final Counter counter = new Counter(); + TrainListener listener = new TrainListener() { + @Override + public void onTrainUpdate(Train t) { + assertEquals(testTrain, t); + counter.i++; + } + }; + trainService.registerTrainListener(listener); + trainService.pushTrainUpdate(testTrain); + assertEquals(1, counter.i); + + trainService.unregisterTrainListener(listener); + } + + @Test + public void testEnqueueMotorUpdate() { + trainService.enqueueMotorUpdate(testPort); + ArgumentCaptor taskCaptor = ArgumentCaptor.forClass(Runnable.class); + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); + verify(mockScheduler).schedule(taskCaptor.capture(), (Instant) Mockito.notNull()); + + testTrainCon.setCharacteristicGovernor(mockCharacteristicGovernor); + Mockito.when(mockCharacteristicGovernor.isReady()).thenReturn(true); + Mockito.when(mockCharacteristicGovernor.isWritable()).thenReturn(true); + taskCaptor.getValue().run(); + verify(mockCharacteristicGovernor).write(Mockito.notNull()); + } + + @Test + public void testEnqueueLedColorUpdate() { + trainService.enqueueLedColorUpdate(testTrain, 0); + ArgumentCaptor taskCaptor = ArgumentCaptor.forClass(Runnable.class); + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); + verify(mockScheduler).schedule(taskCaptor.capture(), (Instant) Mockito.notNull()); + + testTrainCon.setCharacteristicGovernor(mockCharacteristicGovernor); + Mockito.when(mockCharacteristicGovernor.isReady()).thenReturn(true); + Mockito.when(mockCharacteristicGovernor.isWritable()).thenReturn(true); + taskCaptor.getValue().run(); + verify(mockCharacteristicGovernor).write(Mockito.notNull()); + } + + @Test + public void testUpdateTrain() { + trainService.updateTrain(testTrain); + assertEquals(50, testTrain.getColor().getR()); + assertEquals(0, testTrain.getColor().getG()); + assertEquals(255, testTrain.getColor().getB()); + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); + } + + @Test + public void testUpdatePort() { + trainService.updatePort(testPort); + assertEquals(100, testPort.getPower()); + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); + + trainService.updatePort(testPort); // Power is now the same, so no call to enqueueMotorUpdate should happen + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); // Still only once + + trainService.updatePort(offlinePort); // Now train is offline, so no call again + verify(mockScheduler).schedule(Mockito.notNull(), (Instant) Mockito.notNull()); // Still only once + } + + @Test + public void testTrainList() { + Train[] trainArray = trainService.trainList(); + List trainList = Arrays.asList(trainArray); + assertTrue(trainList.contains(testTrain)); + assertTrue(trainList.contains(offlineTrain)); + } + + @Test + public void testToggleDiscovery() { + assertFalse(trainService.isDiscovering()); + + trainService.toggleDiscovery(); + assertTrue(trainService.isDiscovering()); + Mockito.verify(mockBtManager).getDiscoveredDevices(); + Mockito.verify(mockBtManager).addDeviceDiscoveryListener(Mockito.notNull()); + + trainService.toggleDiscovery(); + assertFalse(trainService.isDiscovering()); + Mockito.verify(mockBtManager).removeDeviceDiscoveryListener(Mockito.notNull()); + } + + @Test + public void testOnDiscoveredDevice() { + DiscoveredDevice mockDevice = Mockito.mock(DiscoveredDevice.class); + Mockito.when(mockDevice.getDisplayName()).thenReturn("DiscoverTest"); + URL failUrl = new URL("/FF:FF:FF:FF:FF:FF/12:34:56:EE:EE:EE"); + URL passUrl1 = new URL("/FF:FF:FF:FF:FF:FF/90:84:2B:EE:EE:EE"); + URL passUrl2 = new URL("/FF:FF:FF:FF:FF:FF/00:16:53:EE:EE:EE"); + + Mockito.when(mockDevice.getURL()).thenReturn(failUrl); + trainService.onDiscoveredDevice(mockDevice); + verify(trainService, times(0)).pushTrainUpdate(Mockito.any()); + + Mockito.when(mockDevice.getURL()).thenReturn(passUrl1); + ArgumentCaptor trainCaptor = ArgumentCaptor.forClass(Train.class); + trainService.onDiscoveredDevice(mockDevice); + verify(trainService, times(1)).pushTrainUpdate(Mockito.any()); + verify(trainService).pushTrainUpdate(trainCaptor.capture()); + Train receivedTrain = trainCaptor.getValue(); + assertEquals(passUrl1.getDeviceAddress(), receivedTrain.getUrl()); + + Mockito.when(mockDevice.getURL()).thenReturn(passUrl2); + trainCaptor = ArgumentCaptor.forClass(Train.class); + trainService.onDiscoveredDevice(mockDevice); + verify(trainService, times(2)).pushTrainUpdate(Mockito.any()); + verify(trainService, times(2)).pushTrainUpdate(trainCaptor.capture()); + receivedTrain = trainCaptor.getValue(); + assertEquals(passUrl2.getDeviceAddress(), receivedTrain.getUrl()); + } + + @SuppressWarnings("unchecked") + @Test + public void testConnect() { + trainService.connect(testTrain); + assertNull(internalTrainMap.get(testTrain.getUrl()).getDeviceGovernor()); + + URL adapterUrl = new URL("/FF:FF:FF:FF:FF:FF"); + ReflectionTestUtils.setField(trainService, "adapterUrl", adapterUrl); + DeviceGovernor mockDeviceGovernor = Mockito.mock(DeviceGovernor.class); + CharacteristicGovernor mockCharacteristicGovernor = Mockito.mock(CharacteristicGovernor.class); + Mockito.when(mockBtManager.getDeviceGovernor(Mockito.any())).thenReturn(mockDeviceGovernor); + Mockito.when(mockBtManager.getCharacteristicGovernor(Mockito.any(), Mockito.eq(true))).thenReturn(mockCharacteristicGovernor); + Mockito.when(mockDeviceGovernor.getURL()).thenReturn(adapterUrl.copyWithDevice(offlineTrain.getUrl())); + + trainService.connect(offlineTrain); + verify(mockBtManager).getDeviceGovernor(Mockito.notNull()); + verify(mockBtManager).getCharacteristicGovernor(Mockito.notNull(), Mockito.eq(true)); + verify(mockCharacteristicGovernor).addValueListener(Mockito.notNull()); + verify(mockCharacteristicGovernor).whenReady(Mockito.notNull()); + assertNotNull(offlineTrainCon.getDeviceGovernor()); + assertNotNull(offlineTrainCon.getCharacteristicGovernor()); + + // Test the valueListener lambda + ArgumentCaptor valueArgumentCaptor = ArgumentCaptor.forClass(ValueListener.class); + verify(mockCharacteristicGovernor).addValueListener(valueArgumentCaptor.capture()); + ReflectionTestUtils.setField(trainService, "handlerMap", mockHandlerMap); + when(mockHandlerMap.containsKey(99)).thenReturn(true); + MessageHandler mockMessageHandler = mock(MessageHandler.class); + when(mockHandlerMap.get(99)).thenReturn(mockMessageHandler); + valueArgumentCaptor.getValue().changed(new byte[] {0, 0, 99}); + verify(mockHandlerMap).containsKey(99); + verify(mockHandlerMap).get(99); + verify(mockMessageHandler).handleMessage(Mockito.eq(offlineTrainCon), Mockito.notNull()); + + // Test the whenReady() lambda + ArgumentCaptor> whenReadyCaptor + = ArgumentCaptor.forClass(Function.class); + verify(mockCharacteristicGovernor).whenReady(whenReadyCaptor.capture()); + when(mockScheduler.scheduleWithFixedDelay(Mockito.any(), Mockito.anyLong())).thenReturn(mock(ScheduledFuture.class)); + whenReadyCaptor.getValue().apply(null); + assertNotNull(offlineTrainCon.getBatteryTask()); + assertNotNull(offlineTrainCon.getDistanceTask()); + assertTrue(offlineTrain.isOnline()); + verify(trainService).pushTrainUpdate(offlineTrain); + } + + @Test + public void testHubPropertiesHandler() { + TrainConnection trainCon = new TrainConnection(testTrain); + Message batteryMessage = new Message(new byte[]{6, 0, + (byte) TrainService.MessageType.HUB_PROPERTIES, 6, 6, 49}); + Message distanceMessage = new Message(new byte[]{6, 0, + (byte) TrainService.MessageType.HUB_PROPERTIES, 5, 6, -49}); + + trainService.hubPropertiesHandler(trainCon, batteryMessage); + assertEquals(49, testTrain.getBattery(), 0.001); + + trainService.hubPropertiesHandler(trainCon, distanceMessage); + assertEquals(49f/127, testTrain.getDistance(), 0.001); + } + + @Test + public void testHubAttachedIoHandler() { + TrainConnection trainCon = new TrainConnection(testTrain); + Message attachedMessage = new Message(new byte[]{6, 0, + (byte) TrainService.MessageType.HUB_ATTACHED_IO, 99, 1, 49}); + Message detachedMessage = new Message(new byte[]{5, 0, + (byte) TrainService.MessageType.HUB_ATTACHED_IO, 99, 0}); + + trainService.hubAttachedIoHandler(trainCon, attachedMessage); + assertTrue(testTrain.getPorts().containsKey(99)); + assertEquals(49, testTrain.getPorts().get(99).getDeviceType()); + + trainService.hubAttachedIoHandler(trainCon, detachedMessage); + assertFalse(testTrain.getPorts().containsKey(99)); + } + + @Test + public void testPortModeInformationHandler() { + // Not implemented to do something in TrainService + } + + @Test + public void testShutdownTrain() { + CharacteristicGovernor mockCharacteristicGovernor = Mockito.mock(CharacteristicGovernor.class); + DeviceGovernor mockDeviceGovernor = Mockito.mock(DeviceGovernor.class); + ScheduledFuture mockBatteryUpdateTask = Mockito.mock(ScheduledFuture.class); + ScheduledFuture mockDistanceUpdateTask = Mockito.mock(ScheduledFuture.class); + internalTrainMap.get(offlineTrain.getUrl()).setCharacteristicGovernor(mockCharacteristicGovernor); + TrainConnection testTrainCon = internalTrainMap.get(testTrain.getUrl()); + testTrainCon.setCharacteristicGovernor(mockCharacteristicGovernor); + testTrainCon.setDeviceGovernor(mockDeviceGovernor); + testTrainCon.setBatteryTask(mockBatteryUpdateTask); + testTrainCon.setDistanceTask(mockDistanceUpdateTask); + // Dont shutdown offline train + trainService.shutdownTrain(offlineTrain); + verify(mockCharacteristicGovernor, times(0)).isReady(); + + // Online train + Mockito.when(mockCharacteristicGovernor.isReady()).thenReturn(true); + trainService.shutdownTrain(testTrain); + verify(mockCharacteristicGovernor).isReady(); + verify(mockCharacteristicGovernor).write(Mockito.notNull()); + verify(mockCharacteristicGovernor).removeValueListener(null); + verify(mockDeviceGovernor).setConnectionControl(false); + verify(mockBatteryUpdateTask).cancel(false); + verify(mockDistanceUpdateTask).cancel(false); + assertFalse(testTrain.isOnline()); + } + + @Test + public void testConnectAllTrains() { + // Put offline train online so connect() will return early + offlineTrain.setOnline(true); + trainService.connectAllTrains(); + verify(trainService, times(internalTrainMap.size())).connect(Mockito.notNull()); + assertNotEquals(0, internalTrainMap.size()); + } + + @Test + public void testDisconnectAllTrains() { + testTrain.setOnline(false); + trainService.disconnectAllTrains(); + verify(trainService, times(internalTrainMap.size())).shutdownTrain(Mockito.notNull()); + assertNotEquals(0, internalTrainMap.size()); + } + + @Test + public void testRemoveTrain() { + trainService.removeTrain(offlineTrain); + assertFalse(internalTrainMap.containsKey(offlineTrain.getUrl())); + } + + @Test + public void testStopAll() { + trainService.stopAll(); + assertEquals(0, testPort.getPower()); + assertEquals(-50, offlinePort.getPower()); + verify(trainService).enqueueMotorUpdate(testPort); + verify(trainService).pushTrainUpdate(testTrain); + } + +} diff --git a/src/test/java/jk/zugsteuerung/zug/WebConfigTest.java b/src/test/java/jk/zugsteuerung/zug/WebConfigTest.java new file mode 100644 index 0000000..33d303f --- /dev/null +++ b/src/test/java/jk/zugsteuerung/zug/WebConfigTest.java @@ -0,0 +1,32 @@ +package jk.zugsteuerung.zug; + +import static org.junit.Assert.assertFalse; +import static org.mockito.Mockito.verify; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.springframework.core.task.AsyncTaskExecutor; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; +import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer; + +import jk.zugsteuerung.zug.WebConfig; + +@RunWith(SpringRunner.class) +public class WebConfigTest { + + @Mock + private AsyncSupportConfigurer mockAsyncSupportConfigurer; + + @Test + public void testConfigureAsyncSupport() { + WebConfig webConfig = new WebConfig(); + webConfig.configureAsyncSupport(mockAsyncSupportConfigurer); + ArgumentCaptor asyncTaskExecutorCaptor = ArgumentCaptor.forClass(AsyncTaskExecutor.class); + verify(mockAsyncSupportConfigurer).setTaskExecutor(asyncTaskExecutorCaptor.capture()); + assertFalse(asyncTaskExecutorCaptor.getValue() instanceof ThreadPoolTaskExecutor); + } + +} diff --git a/src/test/java/jk/zugsteuerung/zug/ZugsteuerungApplicationTests.java b/src/test/java/jk/zugsteuerung/zug/ZugsteuerungApplicationTests.java new file mode 100644 index 0000000..bb22f7b --- /dev/null +++ b/src/test/java/jk/zugsteuerung/zug/ZugsteuerungApplicationTests.java @@ -0,0 +1,32 @@ +/* + * Copyright 2019 Jan Kowollik + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package jk.zugsteuerung.zug; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ZugsteuerungApplicationTests { + + @Test + public void contextLoads() { + } + +}