Created forked version with:

- sputnikdev#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 <[email protected]>
openhab · Jul 14, 2022 · 99ad6ee · 99ad6ee
1 parent cd239f9
commit 99ad6ee
Show file tree

Hide file tree

Showing 52 changed files with 175 additions and 415 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.vscode
+target
diff --git a/.travis.yml b/.travis.yml
diff --git a/.travis/before-deploy.sh b/.travis/before-deploy.sh
diff --git a/.travis/codesigning.asc.enc b/.travis/codesigning.asc.enc
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
diff --git a/.travis/settings.xml b/.travis/settings.xml
diff --git 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&amp;utm_medium=referral&amp;utm_content=sputnikdev/bluetooth-gatt-parser&amp;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
 <dependency>
-  <groupId>org.sputnikdev</groupId>
+  <groupId>org.openhab</groupId>
   <artifactId>bluetooth-gatt-parser</artifactId>
   <version>X.Y.Z</version>
 </dependency>
@@ -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
@@ -1,14 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.sputnikdev</groupId>
+    <groupId>org.openhab</groupId>
     <artifactId>bluetooth-gatt-parser</artifactId>
-    <version>1.9.5-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>A simple library/framework to work with Bluetooth Smart (BLE) GATT services and characteristics.</description>
-    <url>https://github.com/sputnikdev/bluetooth-gatt-parser</url>
+    <url>https://github.com/openhab/bluetooth-gatt-parser</url>
 
     <licenses>
         <license>
@@ -18,10 +18,10 @@
     </licenses>
 
     <organization>
-        <name>Sputnik Dev</name>
-        <url>http://sputnikdev.org/</url>
+        <name>openHAB</name>
+        <url>https://www.openhab.org/</url>
     </organization>
-    <inceptionYear>2017</inceptionYear>
+    <inceptionYear>2022</inceptionYear>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -37,22 +37,24 @@
             <organization>Sputnik Dev</organization>
             <organizationUrl>https://sputnikdev.org/</organizationUrl>
         </developer>
+        <developer>
+            <name>Kai Kreuzer</name>
+            <email>[email protected]</email>
+            <organization>openHAB</organization>
+            <organizationUrl>https://www.openhab.org/</organizationUrl>
+        </developer>
     </developers>
 
     <scm>
-        <url>https://github.com/sputnikdev/bluetooth-gatt-parser/tree/master</url>
-        <connection>scm:git:git@github.com:sputnikdev/bluetooth-gatt-parser.git</connection>
-        <developerConnection>scm:git:git@github.com:sputnikdev/bluetooth-gatt-parser.git</developerConnection>
+        <url>https://github.com/openhab/bluetooth-gatt-parser/tree/main</url>
+        <connection>scm:git:https://github.com/openhab/bluetooth-gatt-parser</connection>
+        <developerConnection>scm:git:https://github.com/openhab/bluetooth-gatt-parser</developerConnection>
         <tag>HEAD</tag>
     </scm>
 
     <distributionManagement>
-        <snapshotRepository>
-            <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
         <repository>
-            <id>ossrh</id>
+            <id>maven</id>
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
@@ -71,26 +73,6 @@
     </repositories>
 
     <profiles>
-        <profile>
-            <id>release-no-deploy</id>
-            <activation>
-                <property>
-                    <name>!travis</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.8</version>
-                        <configuration>
-                            <skip>true</skip>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>sign</id>
             <build>
@@ -109,13 +91,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>build-extras</id>
-            <build>
-                <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
@@ -142,17 +117,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.7</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
@@ -172,17 +136,17 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.7</version>
+            <version>2.9.0</version>
         </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>
-            <version>1.9.3</version>
+            <version>1.9.4</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>31.1-jre</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/...tooth/gattparser/BluetoothGattParser.java → ...tooth/gattparser/BluetoothGattParser.java b/...tooth/gattparser/BluetoothGattParser.java → ...tooth/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/...attparser/BluetoothGattParserFactory.java → ...attparser/BluetoothGattParserFactory.java b/...attparser/BluetoothGattParserFactory.java → ...attparser/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/...parser/CharacteristicFormatException.java → ...parser/CharacteristicFormatException.java b/...parser/CharacteristicFormatException.java → ...parser/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/...ooth/gattparser/CharacteristicParser.java → ...ooth/gattparser/CharacteristicParser.java b/...ooth/gattparser/CharacteristicParser.java → ...ooth/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/...dev/bluetooth/gattparser/FieldHolder.java → ...hab/bluetooth/gattparser/FieldHolder.java b/...dev/bluetooth/gattparser/FieldHolder.java → ...hab/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;