Skip to content

Commit 0a957b0

Browse files
vchagvchag
committed
code formatting
1 parent d347d19 commit 0a957b0

File tree

7 files changed

+108
-118
lines changed

7 files changed

+108
-118
lines changed

‎runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/AfterRefreshTableEventMixin.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727

2828
@JsonTypeName("AfterRefreshTableEvent")
2929
public abstract class AfterRefreshTableEventMixin {
30-
@JsonProperty("catalog_name")
31-
abstract String catalogName();
30+
@JsonProperty("catalog_name")
31+
abstract String catalogName();
3232

33-
@JsonProperty("table_identifier")
34-
@JsonSerialize(using = TableIdentifierToStringSerializer.class)
35-
abstract TableIdentifier tableIdentifier();
36-
}
33+
@JsonProperty("table_identifier")
34+
@JsonSerialize(using = TableIdentifierToStringSerializer.class)
35+
abstract TableIdentifier tableIdentifier();
36+
}

‎runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/IcebergThirdPartyMixins.java‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,21 @@
2222
import com.fasterxml.jackson.annotation.JsonValue;
2323

2424
/**
25-
* Mixins for Iceberg classes we don't control, to keep JSON concise.
26-
* The @JsonValue marks toString() as the value to serialize.
25+
* Mixins for Iceberg classes we don't control, to keep JSON concise. The @JsonValue marks
26+
* toString() as the value to serialize.
2727
*/
2828
public class IcebergThirdPartyMixins {
29-
private IcebergThirdPartyMixins() {}
29+
private IcebergThirdPartyMixins() {}
3030

31-
public abstract static class NamespaceMixin {
32-
@Override
33-
@JsonValue
34-
public abstract String toString(); // serializes "namespace" as "db.sales"
35-
}
36-
37-
public abstract static class TableIdentifierMixin {
38-
@Override
39-
@JsonValue
40-
public abstract String toString(); // serializes "table_identifier" as "db.sales.orders"
41-
}
31+
public abstract static class NamespaceMixin {
32+
@Override
33+
@JsonValue
34+
public abstract String toString(); // serializes "namespace" as "db.sales"
35+
}
4236

37+
public abstract static class TableIdentifierMixin {
38+
@Override
39+
@JsonValue
40+
public abstract String toString(); // serializes "table_identifier" as "db.sales.orders"
41+
}
4342
}

‎runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/ObjectMapperFactory.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,29 @@
2424
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
2525
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
2626
import org.apache.iceberg.catalog.Namespace;
27+
import org.apache.iceberg.catalog.TableIdentifier;
2728
import org.apache.polaris.service.events.IcebergRestCatalogEvents;
2829
import org.apache.polaris.service.events.PolarisEvent;
29-
import org.apache.iceberg.catalog.TableIdentifier;
3030

3131
public class ObjectMapperFactory {
32-
private ObjectMapperFactory() {}
33-
34-
public static ObjectMapper create(){
35-
ObjectMapper mapper = new ObjectMapper()
36-
.registerModule(new Jdk8Module()) // If you never serialize Optional, you can remove the .registerModule(new Jdk8Module()) line.
37-
.registerModule(new JavaTimeModule())
38-
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
39-
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
40-
.disable(SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS);
41-
42-
mapper.addMixIn(PolarisEvent.class, PolarisEventBaseMixin.class);
43-
mapper.addMixIn(IcebergRestCatalogEvents.AfterRefreshTableEvent.class, AfterRefreshTableEventMixin.class);
44-
mapper.addMixIn(TableIdentifier.class, IcebergThirdPartyMixins.TableIdentifierMixin.class);
45-
mapper.addMixIn(Namespace.class, IcebergThirdPartyMixins.NamespaceMixin.class);
46-
47-
48-
return mapper;
49-
}
50-
32+
private ObjectMapperFactory() {}
33+
34+
public static ObjectMapper create() {
35+
ObjectMapper mapper =
36+
new ObjectMapper()
37+
.registerModule(new Jdk8Module()) // If you never serialize Optional, you can remove the
38+
// .registerModule(new Jdk8Module()) line.
39+
.registerModule(new JavaTimeModule())
40+
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
41+
.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS)
42+
.disable(SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS);
43+
44+
mapper.addMixIn(PolarisEvent.class, PolarisEventBaseMixin.class);
45+
mapper.addMixIn(
46+
IcebergRestCatalogEvents.AfterRefreshTableEvent.class, AfterRefreshTableEventMixin.class);
47+
mapper.addMixIn(TableIdentifier.class, IcebergThirdPartyMixins.TableIdentifierMixin.class);
48+
mapper.addMixIn(Namespace.class, IcebergThirdPartyMixins.NamespaceMixin.class);
49+
50+
return mapper;
51+
}
5152
}

‎runtime/service/src/main/java/org/apache/polaris/service/events/json/mixins/PolarisEventBaseMixin.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@
2121

2222
import com.fasterxml.jackson.annotation.JsonInclude;
2323
import com.fasterxml.jackson.annotation.JsonTypeInfo;
24-
import com.fasterxml.jackson.databind.annotation.JsonNaming;
2524
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
25+
import com.fasterxml.jackson.databind.annotation.JsonNaming;
2626

2727
@JsonInclude(JsonInclude.Include.NON_NULL)
2828
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
2929
@JsonTypeInfo(
30-
use = JsonTypeInfo.Id.NAME,
31-
include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
32-
property = "event_type"
33-
)
34-
35-
public abstract class PolarisEventBaseMixin {
36-
}
30+
use = JsonTypeInfo.Id.NAME,
31+
include = JsonTypeInfo.As.EXTERNAL_PROPERTY,
32+
property = "event_type")
33+
public abstract class PolarisEventBaseMixin {}

‎runtime/service/src/main/java/org/apache/polaris/service/events/json/serde/TableIdentifierToStringSerializer.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,23 @@
1818
*/
1919

2020
package org.apache.polaris.service.events.json.serde;
21+
2122
import com.fasterxml.jackson.core.JsonGenerator;
2223
import com.fasterxml.jackson.databind.JsonSerializer;
2324
import com.fasterxml.jackson.databind.SerializerProvider;
24-
import org.apache.iceberg.catalog.TableIdentifier;
25-
2625
import java.io.IOException;
27-
26+
import org.apache.iceberg.catalog.TableIdentifier;
2827

2928
public class TableIdentifierToStringSerializer extends JsonSerializer<TableIdentifier> {
3029

31-
@Override
32-
public void serialize(TableIdentifier value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
33-
34-
if (value == null) {
35-
gen.writeNull();
36-
return;
37-
}
38-
gen.writeString(value.toString());
30+
@Override
31+
public void serialize(TableIdentifier value, JsonGenerator gen, SerializerProvider serializers)
32+
throws IOException {
3933

34+
if (value == null) {
35+
gen.writeNull();
36+
return;
4037
}
38+
gen.writeString(value.toString());
39+
}
4140
}

‎runtime/service/src/main/java/org/apache/polaris/service/events/jsonEventListener/AfterRefreshTableEventListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.polaris.service.events.jsonEventListener;
2121

22-
import java.util.HashMap;
2322
import org.apache.polaris.service.events.IcebergRestCatalogEvents;
2423
import org.apache.polaris.service.events.listeners.PolarisEventListener;
2524

@@ -31,7 +30,8 @@
3130
* transformed into a JSON string, transmitted, and/or stored.
3231
*/
3332
public abstract class AfterRefreshTableEventListener implements PolarisEventListener {
34-
protected abstract void transformAndSendEvent(IcebergRestCatalogEvents.AfterRefreshTableEvent event);
33+
protected abstract void transformAndSendEvent(
34+
IcebergRestCatalogEvents.AfterRefreshTableEvent event);
3535

3636
@Override
3737
public void onAfterRefreshTable(IcebergRestCatalogEvents.AfterRefreshTableEvent event) {

‎runtime/service/src/main/java/org/apache/polaris/service/events/jsonEventListener/aws/cloudwatch/AwsCloudWatchEventListener.java‎

Lines changed: 51 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import jakarta.ws.rs.core.SecurityContext;
3434
import java.time.Clock;
3535
import java.util.Collection;
36-
import java.util.HashMap;
3736
import java.util.List;
3837
import java.util.concurrent.CompletableFuture;
3938
import java.util.function.Supplier;
@@ -159,62 +158,57 @@ void shutdown() {
159158
}
160159
}
161160

162-
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
163-
public record CloudWatchEvent(
164-
String principal,
165-
String realmId,
166-
Collection<String> activatedRoles,
167-
String eventType,
168-
@JsonUnwrapped
169-
PolarisEvent event // flatten
170-
) {}
171-
172-
@Override
173-
protected void transformAndSendEvent(IcebergRestCatalogEvents.AfterRefreshTableEvent event) {
174-
175-
176-
CloudWatchEvent payload = new CloudWatchEvent(
177-
securityContext.getUserPrincipal().getName(),
178-
callContext.getRealmContext().getRealmIdentifier(),
179-
((PolarisPrincipal) securityContext.getUserPrincipal()).getRoles(),
180-
event.getClass().getSimpleName(),
181-
event
182-
);
183-
184-
String eventAsJson;
185-
try
186-
{
187-
eventAsJson = objectMapper.writeValueAsString(payload);
188-
} catch (JsonProcessingException ex) {
189-
LOGGER.error("Error serializing CloudWatch payload: ", ex);
190-
LOGGER.debug("Failed to convert the following object into JSON string: {}", payload);
191-
return;
192-
}
193-
194-
InputLogEvent inputLogEvent =
195-
InputLogEvent.builder().message(eventAsJson).timestamp(clock.millis()).build();
196-
197-
PutLogEventsRequest.Builder requestBuilder =
198-
PutLogEventsRequest.builder()
199-
.logGroupName(logGroup)
200-
.logStreamName(logStream)
201-
.logEvents(List.of(inputLogEvent));
202-
203-
CompletableFuture<PutLogEventsResponse> future =
204-
client
205-
.putLogEvents(requestBuilder.build())
206-
.whenComplete(
207-
(resp, err) -> {
208-
if (err != null) {
209-
LOGGER.error(
210-
"Error writing log to CloudWatch. Event: {}, Error: ", inputLogEvent, err);
211-
}
212-
});
213-
214-
215-
if (synchronousMode) {
216-
future.join();
217-
}
161+
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
162+
public record CloudWatchEvent(
163+
String principal,
164+
String realmId,
165+
Collection<String> activatedRoles,
166+
String eventType,
167+
@JsonUnwrapped PolarisEvent event // flatten
168+
) {}
169+
170+
@Override
171+
protected void transformAndSendEvent(IcebergRestCatalogEvents.AfterRefreshTableEvent event) {
172+
173+
CloudWatchEvent payload =
174+
new CloudWatchEvent(
175+
securityContext.getUserPrincipal().getName(),
176+
callContext.getRealmContext().getRealmIdentifier(),
177+
((PolarisPrincipal) securityContext.getUserPrincipal()).getRoles(),
178+
event.getClass().getSimpleName(),
179+
event);
180+
181+
String eventAsJson;
182+
try {
183+
eventAsJson = objectMapper.writeValueAsString(payload);
184+
} catch (JsonProcessingException ex) {
185+
LOGGER.error("Error serializing CloudWatch payload: ", ex);
186+
LOGGER.debug("Failed to convert the following object into JSON string: {}", payload);
187+
return;
188+
}
218189

190+
InputLogEvent inputLogEvent =
191+
InputLogEvent.builder().message(eventAsJson).timestamp(clock.millis()).build();
192+
193+
PutLogEventsRequest.Builder requestBuilder =
194+
PutLogEventsRequest.builder()
195+
.logGroupName(logGroup)
196+
.logStreamName(logStream)
197+
.logEvents(List.of(inputLogEvent));
198+
199+
CompletableFuture<PutLogEventsResponse> future =
200+
client
201+
.putLogEvents(requestBuilder.build())
202+
.whenComplete(
203+
(resp, err) -> {
204+
if (err != null) {
205+
LOGGER.error(
206+
"Error writing log to CloudWatch. Event: {}, Error: ", inputLogEvent, err);
207+
}
208+
});
209+
210+
if (synchronousMode) {
211+
future.join();
219212
}
213+
}
220214
}

0 commit comments

Comments
 (0)