Skip to content

fixes a bug where delta tokens would not be extracted properly #197

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
baywet merged 2 commits into from
May 10, 2021
Merged

fixes a bug where delta tokens would not be extracted properly #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29377df
- updates jacoco version to remove snapshot reference since it was re…
baywet May 10, 2021
063d2ef
- fixes #196 a bug where delta tokens would not be extracted properly
baywet May 10, 2021
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jacocoTestReport {
}

jacoco {
toolVersion = "0.8.7-SNAPSHOT" //https://github.com/gradle/gradle/issues/15038
toolVersion = "0.8.7"
}

spotbugsMain {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/microsoft/graph/http/BaseDeltaCollectionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S
* ?token=thetoken (onedrive)
* delta(token='thetoken') (formal OData function usage)
*/
private static Pattern pattern = Pattern.compile("(?i)(?>\\$?delta)?token=['\"]?([\\w-\\.]+)");
private static Pattern pattern = Pattern.compile("(?>[$]?delta)?token=['\"]?([\\w\\-\\.]+)", Pattern.CASE_INSENSITIVE);
/**
* Gets the delta token from the delta link provided by the previous response
* @param deltaLink the delta link provided by the previous request
Expand All @@ -91,9 +91,9 @@ protected void addDeltaTokenOption(@Nonnull final String value, @Nonnull final S
protected String getDeltaTokenFromLink(@Nonnull final String deltaLink) {
Objects.requireNonNull(deltaLink, "parameter deltaLink cannot be null");
final Matcher matcher = pattern.matcher(deltaLink);
if(matcher.matches()) {
if(matcher.find()) {
return matcher.group(1);
}
return "";
return "";
}
}