Skip to content

chore: include client details in header #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 24, 2023
+26 −1
Merged

chore: include client details in header #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6a9c9c
Include version in User-Agent header
dmbrooke Oct 16, 2023
aa0d4c7
Use fallback value for version in header
dmbrooke Oct 16, 2023
a719ff5
Whoops
dmbrooke Oct 16, 2023
28dbf83
Merge branch 'main' into KIT-2804
dmbrooke Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,12 @@
<version>1.7.0</version>
</dependency>

<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.9.5</version>
</dependency>


</dependencies>
<repositories>
Expand Down
21 changes: 20 additions & 1 deletion src/main/java/com/coveo/pushapiclient/PlatformClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.io.FileReader;
import java.io.IOException;
import java.net.URI;
import java.net.http.HttpClient;
Expand All @@ -11,6 +12,8 @@
import java.util.HashMap;
import java.util.stream.Stream;
import org.apache.logging.log4j.LogManager;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;

/** PlatformClient handles network requests to the Coveo platform */
public class PlatformClient {
Expand Down Expand Up @@ -567,7 +570,23 @@ private String[] getAuthorizationHeader() {
}

private String[] getContentTypeApplicationJSONHeader() {
return new String[] {"Content-Type", "application/json", "Accept", "application/json"};
MavenXpp3Reader reader = new MavenXpp3Reader();
String version = "";
try {
Model model = reader.read(new FileReader("pom.xml"));
version = model.getVersion();
} catch (Exception e) {
version = "Not-Available";
}

return new String[] {
"Content-Type",
"application/json",
"Accept",
"application/json",
"User-Agent",
String.format("CoveoSDKJava/%s", version)
};
}

private String[] getAes256Header() {
Expand Down