From 99ad6ee5ccdf17f7b8d2f8547f6e9df5b2d6c6dd Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Thu, 14 Jul 2022 22:03:45 +0200 Subject: [PATCH] Created forked version with: - https://github.com/sputnikdev/bluetooth-gatt-parser/pull/15 included - version number bumped to 2.0.0 - org.openhab namespace - dependencies updated to latest versions - updated README - removal of travis Signed-off-by: Kai Kreuzer --- .gitignore | 2 + .travis.yml | 20 ----- .travis/before-deploy.sh | 6 -- .travis/codesigning.asc.enc | Bin 9648 -> 0 bytes .travis/deploy.sh | 14 ---- .travis/settings.xml | 23 ------ README.md | 17 ++-- pom.xml | 74 +++++------------- .../gattparser/BluetoothGattParser.java | 14 ++-- .../BluetoothGattParserFactory.java | 34 ++------ .../CharacteristicFormatException.java | 5 +- .../gattparser/CharacteristicParser.java | 7 +- .../bluetooth/gattparser/FieldHolder.java | 17 ++-- .../bluetooth/gattparser/GattRequest.java | 32 ++------ .../bluetooth/gattparser/GattResponse.java | 5 +- .../GenericCharacteristicParser.java | 22 +++--- .../num/FloatingPointNumberFormatter.java | 5 +- ...IEEE11073FloatingPointNumberFormatter.java | 5 +- .../IEEE754FloatingPointNumberFormatter.java | 5 +- .../gattparser/num/RealNumberFormatter.java | 5 +- .../num/TwosComplementNumberFormatter.java | 5 +- .../bluetooth/gattparser/spec/Bit.java | 5 +- .../bluetooth/gattparser/spec/BitField.java | 5 +- .../BluetoothGattSpecificationReader.java | 5 +- .../gattparser/spec/Characteristic.java | 5 +- .../gattparser/spec/CharacteristicAccess.java | 5 +- .../gattparser/spec/Characteristics.java | 5 +- .../gattparser/spec/Enumeration.java | 5 +- .../gattparser/spec/Enumerations.java | 5 +- .../bluetooth/gattparser/spec/Examples.java | 5 +- .../bluetooth/gattparser/spec/Field.java | 5 +- .../gattparser/spec/FieldFormat.java | 5 +- .../bluetooth/gattparser/spec/FieldType.java | 5 +- .../bluetooth/gattparser/spec/FlagUtils.java | 26 +----- .../gattparser/spec/InformativeText.java | 5 +- .../bluetooth/gattparser/spec/Properties.java | 5 +- .../bluetooth/gattparser/spec/Reserved.java | 5 +- .../bluetooth/gattparser/spec/Service.java | 5 +- .../bluetooth/gattparser/spec/Value.java | 5 +- .../gattparser/BluetoothGattParserTest.java | 17 ++-- .../bluetooth/gattparser/FieldHolderTest.java | 12 ++- .../bluetooth/gattparser/GattRequestTest.java | 11 ++- ...icCharacteristicParserIntegrationTest.java | 12 +-- .../GenericCharacteristicParserTest.java | 26 +++--- .../bluetooth/gattparser/MockUtils.java | 17 ++-- ...11073FloatingPointNumberFormatterTest.java | 6 +- ...EE754FloatingPointNumberFormatterTest.java | 6 +- .../TwosComplementNumberFormatterTest.java | 6 +- .../bluetooth/gattparser/spec/BitTest.java | 8 +- .../BluetoothGattSpecificationReaderTest.java | 18 ++++- .../gattparser/spec/FieldFormatTest.java | 7 +- .../gattparser/spec/FlagUtilsTest.java | 16 ++-- 52 files changed, 175 insertions(+), 415 deletions(-) create mode 100644 .gitignore delete mode 100644 .travis.yml delete mode 100755 .travis/before-deploy.sh delete mode 100644 .travis/codesigning.asc.enc delete mode 100755 .travis/deploy.sh delete mode 100644 .travis/settings.xml rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/BluetoothGattParser.java (98%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/BluetoothGattParserFactory.java (69%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/CharacteristicFormatException.java (93%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/CharacteristicParser.java (93%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/FieldHolder.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GattRequest.java (90%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GattResponse.java (96%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GenericCharacteristicParser.java (95%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/FloatingPointNumberFormatter.java (96%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatter.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatter.java (94%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/RealNumberFormatter.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/TwosComplementNumberFormatter.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Bit.java (94%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/BitField.java (90%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/BluetoothGattSpecificationReader.java (99%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Characteristic.java (94%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/CharacteristicAccess.java (93%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Characteristics.java (91%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Enumeration.java (92%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Enumerations.java (92%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Examples.java (91%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Field.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/FieldFormat.java (97%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/FieldType.java (88%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/FlagUtils.java (86%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/InformativeText.java (92%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Properties.java (95%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Reserved.java (90%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Service.java (93%) rename src/main/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/Value.java (90%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/BluetoothGattParserTest.java (93%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/FieldHolderTest.java (99%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GattRequestTest.java (96%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GenericCharacteristicParserIntegrationTest.java (98%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/GenericCharacteristicParserTest.java (97%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/MockUtils.java (91%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/IEEE11073FloatingPointNumberFormatterTest.java (97%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/IEEE754FloatingPointNumberFormatterTest.java (95%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/num/TwosComplementNumberFormatterTest.java (98%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/BitTest.java (90%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/BluetoothGattSpecificationReaderTest.java (94%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/FieldFormatTest.java (96%) rename src/test/java/org/{sputnikdev => openhab}/bluetooth/gattparser/spec/FlagUtilsTest.java (93%) 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 a452e9e45e191c16f68a27e738c4a016f6c734b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9648 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 m4@GpBKPfqN1Q~Bc#H${}JC{J>*cZtY?aKE`e~ 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..2a2ba6d 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,22 +37,24 @@ 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 - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - ossrh + maven https://oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -71,26 +73,6 @@ - - release-no-deploy - - - !travis - - - - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8 - - true - - - - - sign @@ -109,13 +91,6 @@ - - - - - build-extras - - org.apache.maven.plugins maven-source-plugin @@ -142,17 +117,6 @@ - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ossrh - https://oss.sonatype.org/ - true - - @@ -172,17 +136,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;