Skip to content
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.

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

Fix compilation error in spring and event-store quickstarts #654

Merged
merged 2 commits into from
Jan 28, 2025
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -153,9 +153,14 @@ public AdminEventQuery resourcePath(String resourcePath) {

@Override
public AdminEventQuery fromTime(Date fromTime) {
return fromTime(fromTime.getTime());
}


public AdminEventQuery fromTime(long fromTime) {
Iterator<AdminEvent> itr = this.adminEvents.iterator();
while (itr.hasNext()) {
if (!(itr.next().getTime() >= fromTime.getTime())) {
if (!(itr.next().getTime() >= fromTime)) {
itr.remove();
}
}
@@ -164,9 +169,14 @@ public AdminEventQuery fromTime(Date fromTime) {

@Override
public AdminEventQuery toTime(Date toTime) {
return toTime(toTime.getTime());
}


public AdminEventQuery toTime(long toTime) {
Iterator<AdminEvent> itr = this.adminEvents.iterator();
while (itr.hasNext()) {
if (!(itr.next().getTime() <= toTime.getTime())) {
if (!(itr.next().getTime() <= toTime)) {
itr.remove();
}
}
Original file line number Diff line number Diff line change
@@ -93,23 +93,33 @@ public EventQuery user(String userId) {
}
return this;
}

@Override
public EventQuery fromDate(Date fromDate) {
return fromDate(fromDate.getTime());
}


public EventQuery fromDate(long fromDate) {
Iterator<Event> itr = this.events.iterator();
while (itr.hasNext()) {
if (!(itr.next().getTime() >= fromDate.getTime())) {
if (!(itr.next().getTime() >= fromDate)) {
itr.remove();
}
}
return this;
}

@Override
public EventQuery toDate(Date toDate) {
return toDate(toDate.getTime());
}


public EventQuery toDate(long toDate) {
Iterator<Event> itr = this.events.iterator();
while (itr.hasNext()) {
if (!(itr.next().getTime() <= toDate.getTime())) {
if (!(itr.next().getTime() <= toDate)) {
itr.remove();
}
}
Original file line number Diff line number Diff line change
@@ -23,7 +23,6 @@
import org.keycloak.adapters.authorization.spi.ConfigurationResolver;
import org.keycloak.adapters.authorization.spi.HttpRequest;
import org.keycloak.representations.adapters.config.PolicyEnforcerConfig;
import org.keycloak.util.SystemPropertiesJsonParserFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -64,7 +63,7 @@ private ServletPolicyEnforcerFilter createPolicyEnforcerFilter() {
PolicyEnforcerConfig config;

try {
ObjectMapper mapper = new ObjectMapper(new SystemPropertiesJsonParserFactory());
ObjectMapper mapper = new ObjectMapper();
mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
config = mapper.readValue(getClass().getResourceAsStream("/policy-enforcer.json"), PolicyEnforcerConfig.class);
} catch (IOException e) {