Merge pull request #28 from smsapi/user-agent-fix

Fixes User-Agent header

Author: maciejlew

CHANGELOG.md

@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- User-Agent header
 
 ## [3.0.0] - 2024-10-30
 

pom.xml

@@ -45,11 +45,6 @@
             <artifactId>commons-codec</artifactId>
             <version>1.10</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-model</artifactId>
-            <version>3.9.8</version>
-        </dependency>
 
         <!-- test -->
         <dependency>
@@ -67,6 +62,14 @@
     </dependencies>
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources-filtered</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <plugins>
 
             <plugin>
@@ -150,6 +153,15 @@
                 </configuration>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.3.1</version>
+                <configuration>
+                    <propertiesEncoding>ISO-8859-1</propertiesEncoding>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>

src/main/java/pl/smsapi/proxy/ProxyNative.java

@@ -1,8 +1,5 @@
 package pl.smsapi.proxy;
 
-import org.apache.maven.model.Model;
-import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import pl.smsapi.api.authenticationStrategy.AuthenticationStrategy;
 import pl.smsapi.exception.ProxyException;
 
@@ -89,11 +86,19 @@ public String execute(String endpoint, Map<String, String> data, Map<String, Inp
         return response;
     }
 
-    private String generateUserAgent() throws IOException, XmlPullParserException {
+    private String generateUserAgent() throws IOException {
         if (userAgent == null) {
-            MavenXpp3Reader reader = new MavenXpp3Reader();
-            Model model = reader.read(new FileReader("pom.xml"));
-            userAgent = "smsapi/java-client:" + model.getVersion() + ";java:" + System.getProperty("java.vm.version");
+            String version = "undefined";
+            try (InputStream propertiesResource = this.getClass().getClassLoader().getResourceAsStream("smsapi-java-client.properties")) {
+                if (propertiesResource != null) {
+                    final Properties properties = new Properties();
+                    properties.load(propertiesResource);
+                    version = properties.getProperty("version", "undefined");
+                }
+            }
+            userAgent =
+                "smsapi/java-client:" + version + ";" +
+                "java:" + System.getProperty("java.vm.version", "undefined");
         }
         return userAgent;
     }

src/main/resources-filtered/smsapi-java-client.properties

@@ -0,0 +1 @@
+version=${project.version}