diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e3ee4c --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.vscode +target diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 95cf8c2..0000000 --- a/.travis.yml +++ /dev/null @@ -1,20 +0,0 @@ -language: java -script: mvn test -P !build-extras -B -notifications: - slack: kolotov:69j2qLZ0paybeuQMcKfyN2gP -before_deploy: git checkout master -after_success: - - mvn jacoco:report coveralls:report - - .travis/before-deploy.sh - - .travis/deploy.sh -env: - global: - # OSSRH_JIRA_USERNAME - - secure: "kEC9Mc5QifCq4p2lcOkWzQ8DB8dDn+iUhmJMahb+OTYg0MJg6sPU29IV7541hLtILI1IncEx4lzEVMw5c778b5iIx3kAjUZfY35D459Eg5thHUg99I4bfCD+frAsxs7IofLa5MesCFGxX4+IpqVnIBSUqgtSaDpt4fmFjC6qZcupGll5KQDtZunG88iQr08Roa6fIjyEoQtwVxqIbsqjmX0k7PaR0g9avj0Ba3a6xTAq+4ZkDpfbIudS2EkRHfUH/aSDWcHFMp1IaeSlCE0CEKmyKh0Cg+nei9YOkirE89lWJ/atwYCUYM6r0+gi9x/2cs/vBqS1gTMtWig4CqpqP3KUrrBTqE3+Dq4O71TNCqU7WysSDN5h14ih+FA4BWOWZwKRg/PYyVw0xXeyMnw2XeuACIpXZh5snpJbFyeS9fDBuBlYSZTilZyn4HAkZKQNGS5zIYzzB3+/SMOJSQhrAHbajNyGkeZXMieeXGhxvQ5ajokkrFR05EsCG2zvEwmnYKxCo4nhmk/Vh82ZH9IvPjGgpPTSOnGBuaZGFakbeVcLTAqGoU2RZaUFtjudBOAZ5gIitjsh+qpvbb3jayiQ0XRW+4Tk3yr0Z0/161fneUDxhAjQ9ne73YqEQE1ZgtQqCzoQmm/ur1E5eu/uYEX2zIflgfParUGZpLNzW7GwNfc=" - # OSSRH_JIRA_PASSWORD - - secure: "YV+30V9X0YJ11GVeleWnazJbppsPBdrqYW9sL880a4gAXiV9ZsVGEMSvNp0FZpcOhCF47aAX0iptKvEcTX7X4ILgGSXIJWLvISAxvld6kTQd6AVVqgtr8MEvJADt3Q8Gj4QCSZVYqlvQCm5CpDwj9HCrZ98+rpZSqlSo3Il4c2oAahXLZjqQ38rs97nCfmVsoAI/zgfpCYrV2wiAWHke0e1offmSrzZoysAg/OqRM9kI2MdeIP+A+beBlPmUEHb/65lENzbkvSeWP2lWaTHjBNxZQeulQLfv0oxQohzNZrVteG9tpDjCydDgrOb9DACxNv0VA5gmLLg8fESULATZ+20gdALMOCX4VyEyr05Edv5dNp2uRd11PFc3Wlr/Ou99eluLUI88rtvH/UHY8N3n2MFhqf/laE+w2Pqob73Moa6gSGLOYb1VdNLiV+z1xrFRKkCTMrneIoAYIWrxJyHZ6fs8QW1I22m4YTcl2e6+rnAOnewodOPAy6kndHo/iRyi6Aqc+eCik65zcGUKQVNFm9M1U4TTe9ytbTmf97BsnHRnx68lDOOBhAbcBu+hFTt+WvYKBryVtQoLYLEE4Q2LolNtUfFXNqM4HFeJ2pPoBmTDrhRkm/2gkDY+bJx1lNh74/jP/LzvQRa/TJP6yBXF6MedJ4aBdIWVujr+VMESjXU=" - # GPG_KEY_NAME - - secure: "mi54rBR5Wa46xNM1fRinQNf80h6mvmhErmQDvS/UNThJ+STN0PNRyR5msVbwoXG9QwIKLCojS8C5Iy6ei+jy4RnMcU5r36KfdA3qkzYx7mzYap3EQ+QW4STS5tOdSO4o9Fjr65jGiA2QWvprOUfjsobY9bRMW+jq/Q725yAfGu+v91t9LiR9Kgh9GybjHa9Vxost4187/HysjkOjubxyZvB+ZbmeSNvOJis8zR4TvKqwU/QY+45mf7v4fhANfAVK0UnMMjx1a3VnvYN6SDfl+3IxZXXD0M3ubhT+yNCdcnb2PnlIMW00UBs+CmfZwI6jr/SYcPJtGTNzUS+heAVWRLYwavyKID8Ka9iLl0+SNCl9ETWhtVW76CSirUCUa7WX4Ksu5ejyXhVNqxu5P6C4om4huj5E7hxnxn4LFw4bKdsZoE0FSQKAmIrewzwzAB7/5dEnqxLJlHk2JgWeErJfdGCaGkhf0EBwhhv15SNL4InSPpKiri0MRReYHB3XhtDTF5P4WqYG9lDKExVhmy/s0huc+uzSpaDPCcpQzkF8SsIOstzAt0Y0kkuqzUWJeePNTD5lv4pYRgRCWjR28np096pgNThVkKBPGmmZrf6GzBpsmR+cb86KOVNAOMtuKxxmMwm5qP//qDUIs8kIwTF0lXTZZfCiE4WQWVu5n/mFhfs=" - # GPG_PASSPHRASE - - secure: "FftLTMOYJn711TWFYtr2MZ0pUK0PxbgTWxG+gw2Yuf8FLXNaoBNgVUEMrYatfa5WUoVXWdmUFKY9i+vDGRoJKEJg4L8vlAXdjHU/5p8nbK4HaDdtyThYhk+NFihMLwlnU64O3+oG/lrZOJrm6Eo3gWmWlWxnK+7KcmIu/0Zw7Xxj8Uc+arZ/BNZlIf50xM7jLKzPQJDZdZweMEUemGhAQkHJccEMt9d8yZZftD4hwH78Dbe+csrnrcMYHgmP5pyVtnOiWNwNWWajzUKUvs7wcmBWyhSy0wyGNBXgNionKUYJ6BtY+lmi9Og58sRUoRHUVeae1eO493S6a+rBMEoPW1Yzv5ia16nfMwd+IDvRL9g08wpJB1VAhvxqwr0cHDb6yLn0OxHSseIi9kQNXit+E/EnW9ylC/ugFWV+hSvfbYAMq4SEPDkOUimYegnorhFGaDTeUqaxV7G7q0LeSjCfPdZv21mthQ5+sjqclP85kvG9hjEGztfOInZ5vQIXs4BoQbiDzlypLbMiDC9HDZfIcMCckB4P8/BdrnRhP61LWqw0601rJGHc4I6Ox5Dy83L0FZYqzWaVU1Db47wKzVVkwEFSYcG8SZan2X1Epe2fHQlgdGSRsi0KZqQVvHVwMSUDIPVk1ajKFN7maTi2bgR31CiudfqG+HSqi1MzMgicwpc=" -install: mvn install -P !build-extras -DskipTests=true -Dmaven.javadoc.skip=true -B -V \ No newline at end of file diff --git a/.travis/before-deploy.sh b/.travis/before-deploy.sh deleted file mode 100755 index 31fddde..0000000 --- a/.travis/before-deploy.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -if [ "$TRAVIS_PULL_REQUEST" == 'false' ] && [ ! -z "$TRAVIS_TAG" ] -then - openssl aes-256-cbc -K $encrypted_24480018a79b_key -iv $encrypted_24480018a79b_iv -in .travis/codesigning.asc.enc -out .travis/codesigning.asc -d - gpg --fast-import .travis/codesigning.asc -fi \ No newline at end of file diff --git a/.travis/codesigning.asc.enc b/.travis/codesigning.asc.enc deleted file mode 100644 index a452e9e..0000000 Binary files a/.travis/codesigning.asc.enc and /dev/null differ diff --git a/.travis/deploy.sh b/.travis/deploy.sh deleted file mode 100755 index 0932c7f..0000000 --- a/.travis/deploy.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -VERSION=$( echo "${TRAVIS_TAG##*-}" ) -if [ "$TRAVIS_PULL_REQUEST" == 'false' ] && [ ! -z "$TRAVIS_TAG" ] -then - echo "on a tag -> set pom.xml to $VERSION" - mvn --settings .travis/settings.xml org.codehaus.mojo:versions-maven-plugin:2.1:set -DnewVersion=$VERSION 1>/dev/null 2>/dev/null - mvn deploy -P sign,build-extras --settings .travis/settings.xml -else - mvn deploy -Dtravis=true -P !build-extras --settings .travis/settings.xml -fi -rc=$? -if [[ $rc -ne 0 ]] ; then - echo 'Could deploy artifact to snaphot/release repository!'; exit $rc -fi \ No newline at end of file diff --git a/.travis/settings.xml b/.travis/settings.xml deleted file mode 100644 index 9c8c472..0000000 --- a/.travis/settings.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - ossrh - ${env.OSSRH_JIRA_USERNAME} - ${env.OSSRH_JIRA_PASSWORD} - - - - - - ossrh - - true - - - gpg - ${env.GPG_KEY_NAME} - ${env.GPG_PASSPHRASE} - - - - \ No newline at end of file diff --git a/README.md b/README.md index e09bbd4..6794d24 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,9 @@ -[![Maven Central](https://img.shields.io/maven-central/v/org.sputnikdev/bluetooth-gatt-parser.svg)](https://mvnrepository.com/artifact/org.sputnikdev/bluetooth-gatt-parser) -[![Build Status](https://travis-ci.org/sputnikdev/bluetooth-gatt-parser.svg?branch=master)](https://travis-ci.org/sputnikdev/bluetooth-gatt-parser) -[![Coverage Status](https://coveralls.io/repos/github/sputnikdev/bluetooth-gatt-parser/badge.svg?branch=master)](https://coveralls.io/github/sputnikdev/bluetooth-gatt-parser?branch=master) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/42d4968bc4ae4474b2cda4d01f8e4d56)](https://www.codacy.com/app/vkolotov/bluetooth-gatt-parser?utm_source=github.com&utm_medium=referral&utm_content=sputnikdev/bluetooth-gatt-parser&utm_campaign=Badge_Grade) -[![Join the chat at https://gitter.im/sputnikdev/bluetooth-gatt-parser](https://badges.gitter.im/sputnikdev/bluetooth-gatt-parser.svg)](https://gitter.im/sputnikdev/bluetooth-gatt-parser?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -# bluetooth-gatt-parser +[![Maven Central](https://img.shields.io/maven-central/v/org.openhab/bluetooth-gatt-parser.svg)](https://mvnrepository.com/artifact/org.openhab/bluetooth-gatt-parser) A **simple** library/framework to work with Bluetooth Smart (BLE) GATT services and characteristics. +Note: This is a fork from the no longer maintained project at https://github.com/sputnikdev/bluetooth-gatt-parser. + Have a look at an example of parsing a standard characteristic ([Battery Level 0x2A19](https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.characteristic.battery_level.xml)) value: ```java BluetoothGattParserFactory.getDefault().parse("2A19", new byte[] {51}).get("Level").getInteger(null); @@ -25,7 +22,7 @@ This would print 51. **Start using the library by including a maven dependency in your project:** ```xml - org.sputnikdev + org.openhab bluetooth-gatt-parser X.Y.Z @@ -81,10 +78,7 @@ parser.registerParser(CHARACTERISTIC_UUID, customParser); --- ## Contribution -You are welcome to contribute to the project, the project environment is designed to make it easy by using: -* Travis CI to release artifacts directly to the Maven Central repository. -* Code style rules to support clarity and supportability. The results can be seen in the Codacy. -* Code coverage reports in the Coveralls to maintain sustainability. 100% of code coverage with unittests is the target. +You are welcome to contribute to the project. The build process is streamlined by using standard maven tools. @@ -98,4 +92,3 @@ To cut a new release and upload it to the Maven Central Repository: mvn release:prepare -B mvn release:perform ``` -Travis CI process will take care of everything, you will find a new artifact in the Maven Central repository when the release process finishes successfully. diff --git a/pom.xml b/pom.xml index da2c602..2090433 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - org.sputnikdev + org.openhab bluetooth-gatt-parser - 1.9.5-SNAPSHOT + 2.0.0-SNAPSHOT jar ${project.groupId}:${project.artifactId} A simple library/framework to work with Bluetooth Smart (BLE) GATT services and characteristics. - https://github.com/sputnikdev/bluetooth-gatt-parser + https://github.com/openhab/bluetooth-gatt-parser @@ -18,10 +18,10 @@ - Sputnik Dev - http://sputnikdev.org/ + openHAB + https://www.openhab.org/ - 2017 + 2022 1.8 @@ -37,12 +37,18 @@ Sputnik Dev https://sputnikdev.org/ + + Kai Kreuzer + kai@openhab.org + openHAB + https://www.openhab.org/ + - https://github.com/sputnikdev/bluetooth-gatt-parser/tree/master - scm:git:git@github.com:sputnikdev/bluetooth-gatt-parser.git - scm:git:git@github.com:sputnikdev/bluetooth-gatt-parser.git + https://github.com/openhab/bluetooth-gatt-parser/tree/main + scm:git:https://github.com/openhab/bluetooth-gatt-parser + scm:git:https://github.com/openhab/bluetooth-gatt-parser HEAD @@ -71,26 +77,6 @@ - - release-no-deploy - - - !travis - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8 - - true - - - - - sign @@ -109,13 +95,6 @@ - - - - - build-extras - - org.apache.maven.plugins maven-source-plugin @@ -142,17 +121,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - @@ -172,17 +140,17 @@ com.google.code.gson gson - 2.7 + 2.9.0 commons-beanutils commons-beanutils - 1.9.3 + 1.9.4 com.google.guava guava - 18.0 + 31.1-jre junit diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParser.java b/src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParser.java similarity index 98% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParser.java rename to src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParser.java index e315aef..c420f31 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParser.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParser.java @@ -1,9 +1,11 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; + +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.Service; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,10 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sputnikdev.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; -import org.sputnikdev.bluetooth.gattparser.spec.Characteristic; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.Service; import java.net.URL; import java.util.Arrays; diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserFactory.java b/src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParserFactory.java similarity index 69% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserFactory.java rename to src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParserFactory.java index b4066da..66f80f3 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserFactory.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/BluetoothGattParserFactory.java @@ -1,31 +1,11 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; -/*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% - * Copyright (C) 2017 Sputnik Dev - * %% - * 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 - * - * http://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. - * #L% - */ - -import org.sputnikdev.bluetooth.gattparser.num.FloatingPointNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.IEEE11073FloatingPointNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.IEEE754FloatingPointNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.RealNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.TwosComplementNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.num.FloatingPointNumberFormatter; +import org.openhab.bluetooth.gattparser.num.IEEE11073FloatingPointNumberFormatter; +import org.openhab.bluetooth.gattparser.num.IEEE754FloatingPointNumberFormatter; +import org.openhab.bluetooth.gattparser.num.RealNumberFormatter; +import org.openhab.bluetooth.gattparser.num.TwosComplementNumberFormatter; +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; /** * A factory class for some main objects in the library: diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicFormatException.java b/src/main/java/org/openhab/bluetooth/gattparser/CharacteristicFormatException.java similarity index 93% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicFormatException.java rename to src/main/java/org/openhab/bluetooth/gattparser/CharacteristicFormatException.java index e6d7f0d..3abd401 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicFormatException.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/CharacteristicFormatException.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicParser.java b/src/main/java/org/openhab/bluetooth/gattparser/CharacteristicParser.java similarity index 93% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicParser.java rename to src/main/java/org/openhab/bluetooth/gattparser/CharacteristicParser.java index 9abd8be..2bf3042 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/CharacteristicParser.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/CharacteristicParser.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +20,7 @@ import java.util.Collection; import java.util.LinkedHashMap; -import org.sputnikdev.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.Characteristic; /** * A root interface for all GATT characteristic parsers in the framework. It defines simple read and write operations. diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/FieldHolder.java b/src/main/java/org/openhab/bluetooth/gattparser/FieldHolder.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/FieldHolder.java rename to src/main/java/org/openhab/bluetooth/gattparser/FieldHolder.java index ec5a2f8..38eb158 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/FieldHolder.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/FieldHolder.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -31,12 +28,12 @@ import org.apache.commons.beanutils.converters.IntegerConverter; import org.apache.commons.beanutils.converters.LongConverter; import org.apache.commons.beanutils.converters.StringConverter; -import org.sputnikdev.bluetooth.gattparser.num.TwosComplementNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.spec.Enumeration; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FieldFormat; -import org.sputnikdev.bluetooth.gattparser.spec.FieldType; -import org.sputnikdev.bluetooth.gattparser.spec.FlagUtils; +import org.openhab.bluetooth.gattparser.num.TwosComplementNumberFormatter; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/GattRequest.java b/src/main/java/org/openhab/bluetooth/gattparser/GattRequest.java similarity index 90% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/GattRequest.java rename to src/main/java/org/openhab/bluetooth/gattparser/GattRequest.java index 9cf731b..2e4cce9 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/GattRequest.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/GattRequest.java @@ -1,29 +1,4 @@ -package org.sputnikdev.bluetooth.gattparser; - -/*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% - * Copyright (C) 2017 Sputnik Dev - * %% - * 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 - * - * http://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. - * #L% - */ - -import org.sputnikdev.bluetooth.gattparser.spec.BitField; -import org.sputnikdev.bluetooth.gattparser.spec.Enumeration; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FlagUtils; +package org.openhab.bluetooth.gattparser; import java.math.BigInteger; import java.util.ArrayList; @@ -34,6 +9,11 @@ import java.util.Map; import java.util.function.BiConsumer; +import org.openhab.bluetooth.gattparser.spec.BitField; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; + /** * Defines an object for capturing field values of a Bluetooth GATT characteristic. A GattRequest provides some methods * for identifying mandatory and optional fields as well as some convenient methods for capturing field values. diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/GattResponse.java b/src/main/java/org/openhab/bluetooth/gattparser/GattResponse.java similarity index 96% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/GattResponse.java rename to src/main/java/org/openhab/bluetooth/gattparser/GattResponse.java index 69a13c7..6108b58 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/GattResponse.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/GattResponse.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParser.java b/src/main/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParser.java similarity index 95% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParser.java rename to src/main/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParser.java index 32d513b..569bfdf 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParser.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParser.java @@ -1,9 +1,15 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; + +import org.openhab.bluetooth.gattparser.num.FloatingPointNumberFormatter; +import org.openhab.bluetooth.gattparser.num.RealNumberFormatter; +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,14 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sputnikdev.bluetooth.gattparser.num.FloatingPointNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.RealNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; -import org.sputnikdev.bluetooth.gattparser.spec.Characteristic; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FieldFormat; -import org.sputnikdev.bluetooth.gattparser.spec.FieldType; -import org.sputnikdev.bluetooth.gattparser.spec.FlagUtils; import java.io.UnsupportedEncodingException; import java.math.BigInteger; diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/FloatingPointNumberFormatter.java b/src/main/java/org/openhab/bluetooth/gattparser/num/FloatingPointNumberFormatter.java similarity index 96% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/num/FloatingPointNumberFormatter.java rename to src/main/java/org/openhab/bluetooth/gattparser/num/FloatingPointNumberFormatter.java index a4da582..899b54d 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/FloatingPointNumberFormatter.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/num/FloatingPointNumberFormatter.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java b/src/main/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java rename to src/main/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java index 62d64de..5fdf55a 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java b/src/main/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java similarity index 94% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java rename to src/main/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java index 6819ab5..2c0993b 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/RealNumberFormatter.java b/src/main/java/org/openhab/bluetooth/gattparser/num/RealNumberFormatter.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/num/RealNumberFormatter.java rename to src/main/java/org/openhab/bluetooth/gattparser/num/RealNumberFormatter.java index 93debe4..6509c9c 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/RealNumberFormatter.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/num/RealNumberFormatter.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatter.java b/src/main/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatter.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatter.java rename to src/main/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatter.java index 801e9b6..290ab45 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatter.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatter.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Bit.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Bit.java similarity index 94% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Bit.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Bit.java index 18cd009..21458ef 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Bit.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Bit.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BitField.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/BitField.java similarity index 90% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BitField.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/BitField.java index aa64cc6..2f86283 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BitField.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/BitField.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java similarity index 99% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java index 3491ff5..2396d6f 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristic.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristic.java similarity index 94% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristic.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristic.java index 33b79c9..02e76fc 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristic.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristic.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/CharacteristicAccess.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/CharacteristicAccess.java similarity index 93% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/CharacteristicAccess.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/CharacteristicAccess.java index 2225be3..c26d9fc 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/CharacteristicAccess.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/CharacteristicAccess.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristics.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristics.java similarity index 91% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristics.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristics.java index b2f0435..ad52f8e 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Characteristics.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Characteristics.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumeration.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Enumeration.java similarity index 92% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumeration.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Enumeration.java index bb25833..7f32fba 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumeration.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Enumeration.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumerations.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Enumerations.java similarity index 92% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumerations.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Enumerations.java index 45e3166..a800b16 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Enumerations.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Enumerations.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Examples.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Examples.java similarity index 91% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Examples.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Examples.java index 77f881f..eaba23c 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Examples.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Examples.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Field.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Field.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Field.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Field.java index 78fee49..a80b189 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Field.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Field.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormat.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/FieldFormat.java similarity index 97% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormat.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/FieldFormat.java index 6700c54..237a476 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormat.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/FieldFormat.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldType.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/FieldType.java similarity index 88% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldType.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/FieldType.java index 226315c..ac10af4 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FieldType.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/FieldType.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtils.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/FlagUtils.java similarity index 86% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtils.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/FlagUtils.java index 15b37aa..2d11f19 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtils.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/FlagUtils.java @@ -1,26 +1,4 @@ -package org.sputnikdev.bluetooth.gattparser.spec; - -/*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% - * Copyright (C) 2017 Sputnik Dev - * %% - * 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 - * - * http://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. - * #L% - */ - -import org.sputnikdev.bluetooth.gattparser.BluetoothGattParserFactory; +package org.openhab.bluetooth.gattparser.spec; import java.math.BigInteger; import java.util.Arrays; @@ -34,6 +12,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import org.openhab.bluetooth.gattparser.BluetoothGattParserFactory; + /** * * @author Vlad Kolotov diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/InformativeText.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/InformativeText.java similarity index 92% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/InformativeText.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/InformativeText.java index b2d0e4b..804ec3c 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/InformativeText.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/InformativeText.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Properties.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Properties.java similarity index 95% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Properties.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Properties.java index 7693300..3cc0ed9 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Properties.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Properties.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Reserved.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Reserved.java similarity index 90% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Reserved.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Reserved.java index 7c038af..039ad79 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Reserved.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Reserved.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Service.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Service.java similarity index 93% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Service.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Service.java index 1fe62a1..3d8ed07 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Service.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Service.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Value.java b/src/main/java/org/openhab/bluetooth/gattparser/spec/Value.java similarity index 90% rename from src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Value.java rename to src/main/java/org/openhab/bluetooth/gattparser/spec/Value.java index 3b57709..654b641 100644 --- a/src/main/java/org/sputnikdev/bluetooth/gattparser/spec/Value.java +++ b/src/main/java/org/openhab/bluetooth/gattparser/spec/Value.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserTest.java b/src/test/java/org/openhab/bluetooth/gattparser/BluetoothGattParserTest.java similarity index 93% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/BluetoothGattParserTest.java index a195be9..8f5dcd0 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/BluetoothGattParserTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/BluetoothGattParserTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,9 +21,6 @@ import java.util.LinkedHashMap; import java.util.List; -import org.sputnikdev.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; -import org.sputnikdev.bluetooth.gattparser.spec.Characteristic; -import org.sputnikdev.bluetooth.gattparser.spec.Field; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -35,6 +29,15 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; +import org.openhab.bluetooth.gattparser.BluetoothGattParser; +import org.openhab.bluetooth.gattparser.CharacteristicFormatException; +import org.openhab.bluetooth.gattparser.CharacteristicParser; +import org.openhab.bluetooth.gattparser.FieldHolder; +import org.openhab.bluetooth.gattparser.GattRequest; +import org.openhab.bluetooth.gattparser.GattResponse; +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.Field; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/FieldHolderTest.java b/src/test/java/org/openhab/bluetooth/gattparser/FieldHolderTest.java similarity index 99% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/FieldHolderTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/FieldHolderTest.java index 4808758..69062e0 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/FieldHolderTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/FieldHolderTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,9 +23,10 @@ import org.mockito.Answers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.sputnikdev.bluetooth.gattparser.spec.Enumeration; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.FieldHolder; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldType; import java.math.BigInteger; import java.util.ArrayList; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/GattRequestTest.java b/src/test/java/org/openhab/bluetooth/gattparser/GattRequestTest.java similarity index 96% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/GattRequestTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/GattRequestTest.java index 5a2333d..bca4133 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/GattRequestTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/GattRequestTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,11 +23,13 @@ import java.util.List; import java.util.Map; -import org.sputnikdev.bluetooth.gattparser.spec.Field; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.runners.MockitoJUnitRunner; -import org.sputnikdev.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.FieldHolder; +import org.openhab.bluetooth.gattparser.GattRequest; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldType; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java b/src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java similarity index 98% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java index b509d9c..e1f0577 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +18,12 @@ */ import org.junit.Test; -import org.sputnikdev.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.BluetoothGattParser; +import org.openhab.bluetooth.gattparser.BluetoothGattParserFactory; +import org.openhab.bluetooth.gattparser.FieldHolder; +import org.openhab.bluetooth.gattparser.GattRequest; +import org.openhab.bluetooth.gattparser.GattResponse; +import org.openhab.bluetooth.gattparser.spec.Enumeration; import java.math.BigInteger; import java.util.regex.Matcher; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserTest.java b/src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserTest.java similarity index 97% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserTest.java index 21b9b53..52109e7 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/GenericCharacteristicParserTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/GenericCharacteristicParserTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,17 +24,22 @@ import org.mockito.Matchers; import org.mockito.Mock; import org.mockito.Spy; +import org.openhab.bluetooth.gattparser.BluetoothGattParserFactory; +import org.openhab.bluetooth.gattparser.CharacteristicFormatException; +import org.openhab.bluetooth.gattparser.FieldHolder; +import org.openhab.bluetooth.gattparser.GattRequest; +import org.openhab.bluetooth.gattparser.GenericCharacteristicParser; +import org.openhab.bluetooth.gattparser.num.FloatingPointNumberFormatter; +import org.openhab.bluetooth.gattparser.num.RealNumberFormatter; +import org.openhab.bluetooth.gattparser.spec.Bit; +import org.openhab.bluetooth.gattparser.spec.BitField; +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.sputnikdev.bluetooth.gattparser.num.FloatingPointNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.num.RealNumberFormatter; -import org.sputnikdev.bluetooth.gattparser.spec.Bit; -import org.sputnikdev.bluetooth.gattparser.spec.BitField; -import org.sputnikdev.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; -import org.sputnikdev.bluetooth.gattparser.spec.Characteristic; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FlagUtils; import java.io.UnsupportedEncodingException; import java.math.BigInteger; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/MockUtils.java b/src/test/java/org/openhab/bluetooth/gattparser/MockUtils.java similarity index 91% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/MockUtils.java rename to src/test/java/org/openhab/bluetooth/gattparser/MockUtils.java index f2b72e2..3847d2d 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/MockUtils.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/MockUtils.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser; +package org.openhab.bluetooth.gattparser; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,12 +22,12 @@ import java.util.Arrays; import java.util.List; -import org.sputnikdev.bluetooth.gattparser.spec.Bit; -import org.sputnikdev.bluetooth.gattparser.spec.Enumeration; -import org.sputnikdev.bluetooth.gattparser.spec.Enumerations; -import org.sputnikdev.bluetooth.gattparser.spec.Field; -import org.sputnikdev.bluetooth.gattparser.spec.FieldFormat; -import org.sputnikdev.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.spec.Bit; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Enumerations; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FieldType; import static org.mockito.Mockito.RETURNS_DEEP_STUBS; import static org.mockito.Mockito.mock; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java b/src/test/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java similarity index 97% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java index 054fa9b..f7de341 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,6 +20,7 @@ import java.util.BitSet; import org.junit.Test; +import org.openhab.bluetooth.gattparser.num.IEEE11073FloatingPointNumberFormatter; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java b/src/test/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java similarity index 95% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java index dc5e8d8..b206016 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,6 +20,7 @@ import java.util.BitSet; import org.junit.Test; +import org.openhab.bluetooth.gattparser.num.IEEE754FloatingPointNumberFormatter; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java b/src/test/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java similarity index 98% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java index 5ca9904..32c01af 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.num; +package org.openhab.bluetooth.gattparser.num; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,6 +21,7 @@ import java.util.BitSet; import org.junit.Test; +import org.openhab.bluetooth.gattparser.num.TwosComplementNumberFormatter; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BitTest.java b/src/test/java/org/openhab/bluetooth/gattparser/spec/BitTest.java similarity index 90% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BitTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/spec/BitTest.java index cfa983d..7ce2e3d 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BitTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/spec/BitTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +26,9 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; +import org.openhab.bluetooth.gattparser.spec.Bit; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Enumerations; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java b/src/test/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java similarity index 94% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java index f245360..b50a88e 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -29,6 +26,19 @@ import org.junit.runner.RunWith; import org.mockito.Spy; import org.mockito.runners.MockitoJUnitRunner; +import org.openhab.bluetooth.gattparser.spec.Bit; +import org.openhab.bluetooth.gattparser.spec.BitField; +import org.openhab.bluetooth.gattparser.spec.BluetoothGattSpecificationReader; +import org.openhab.bluetooth.gattparser.spec.Characteristic; +import org.openhab.bluetooth.gattparser.spec.CharacteristicAccess; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FieldType; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; +import org.openhab.bluetooth.gattparser.spec.Properties; +import org.openhab.bluetooth.gattparser.spec.Service; +import org.openhab.bluetooth.gattparser.spec.Value; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormatTest.java b/src/test/java/org/openhab/bluetooth/gattparser/spec/FieldFormatTest.java similarity index 96% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormatTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/spec/FieldFormatTest.java index 286a2ac..6725508 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FieldFormatTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/spec/FieldFormatTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,6 +18,8 @@ */ import org.junit.Test; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FieldType; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtilsTest.java b/src/test/java/org/openhab/bluetooth/gattparser/spec/FlagUtilsTest.java similarity index 93% rename from src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtilsTest.java rename to src/test/java/org/openhab/bluetooth/gattparser/spec/FlagUtilsTest.java index be80086..95d5b3f 100644 --- a/src/test/java/org/sputnikdev/bluetooth/gattparser/spec/FlagUtilsTest.java +++ b/src/test/java/org/openhab/bluetooth/gattparser/spec/FlagUtilsTest.java @@ -1,9 +1,6 @@ -package org.sputnikdev.bluetooth.gattparser.spec; +package org.openhab.bluetooth.gattparser.spec; /*- - * #%L - * org.sputnikdev:bluetooth-gatt-parser - * %% * Copyright (C) 2017 Sputnik Dev * %% * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,12 +22,17 @@ import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; +import org.openhab.bluetooth.gattparser.BluetoothGattParserFactory; +import org.openhab.bluetooth.gattparser.MockUtils; +import org.openhab.bluetooth.gattparser.num.RealNumberFormatter; +import org.openhab.bluetooth.gattparser.spec.Bit; +import org.openhab.bluetooth.gattparser.spec.Enumeration; +import org.openhab.bluetooth.gattparser.spec.Field; +import org.openhab.bluetooth.gattparser.spec.FieldFormat; +import org.openhab.bluetooth.gattparser.spec.FlagUtils; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import org.sputnikdev.bluetooth.gattparser.BluetoothGattParserFactory; -import org.sputnikdev.bluetooth.gattparser.MockUtils; -import org.sputnikdev.bluetooth.gattparser.num.RealNumberFormatter; import java.math.BigInteger; import java.util.ArrayList;