Rename EventSchema.Builder functions to align with new approach

-Rename EventSchema.Builder functions to align with new approach -Update axon-4-api-changes.md #754
AxonFramework · Oct 2, 2018 · 36de4cf · 36de4cf
1 parent add7a3c
commit 36de4cf
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 14 deletions.
diff --git a/axon-4-api-changes.md b/axon-4-api-changes.md
@@ -42,6 +42,19 @@ the other Builder implementations introduced. This entails the following changes
  - withPayloadRevisionProperty(String) -> payloadRevisionProperty(String)
  - withPayloadProperty(String) -> payloadProperty(String)
  - withMetaDataProperty(String) -> metaDataProperty(String)
+* Renamed EventSchema.Builder functions to align with the new builder approach:
+ - withEventTable(String) -> eventTable(String)
+ - withSnapshotTable(String) -> snapshotTable(String)
+ - withGlobalIndexColumn(String) -> globalIndexColumn(String)
+ - withTimestampColumn(String) -> timestampColumn(String)
+ - withEventIdentifierColumn(String) -> eventIdentifierColumn(String)
+ - withAggregateIdentifierColumn(String) -> aggregateIdentifierColumn(String)
+ - withSequenceNumberColumn(String) -> sequenceNumberColumn(String)
+ - withTypeColumn(String) -> typeColumn(String)
+ - withPayloadTypeColumn(String) -> payloadTypeColumn(String)
+ - withPayloadRevisionColumn(String) -> payloadRevisionColumn(String)
+ - withPayloadColumn(String) -> payloadColumn(String)
+ - withMetaDataColumn(String) -> metaDataColumn(String)
 
 ### Moved classes
 

diff --git a/core/src/main/java/org/axonframework/eventsourcing/eventstore/jdbc/EventSchema.java b/core/src/main/java/org/axonframework/eventsourcing/eventstore/jdbc/EventSchema.java
@@ -189,7 +189,7 @@ public static class Builder {
          * @param eventTable the event table name
          * @return the modified Builder instance
          */
-        public Builder withEventTable(String eventTable) {
+        public Builder eventTable(String eventTable) {
             this.domainEventTable = eventTable;
             return this;
         }
@@ -200,7 +200,7 @@ public Builder withEventTable(String eventTable) {
          * @param snapshotTable the snapshot table name
          * @return the modified Builder instance
          */
-        public Builder withSnapshotTable(String snapshotTable) {
+        public Builder snapshotTable(String snapshotTable) {
             this.snapshotTable = snapshotTable;
             return this;
         }
@@ -211,7 +211,7 @@ public Builder withSnapshotTable(String snapshotTable) {
          * @param globalIndexColumn the name of the global index column.
          * @return the modified Builder instance
          */
-        public Builder withGlobalIndexColumn(String globalIndexColumn) {
+        public Builder globalIndexColumn(String globalIndexColumn) {
             this.globalIndexColumn = globalIndexColumn;
             return this;
         }
@@ -222,7 +222,7 @@ public Builder withGlobalIndexColumn(String globalIndexColumn) {
          * @param timestampColumn the name of the timestamp column.
          * @return the modified Builder instance
          */
-        public Builder withTimestampColumn(String timestampColumn) {
+        public Builder timestampColumn(String timestampColumn) {
             this.timestampColumn = timestampColumn;
             return this;
         }
@@ -233,7 +233,7 @@ public Builder withTimestampColumn(String timestampColumn) {
          * @param eventIdentifierColumn the name of the event identifier column.
          * @return the modified Builder instance
          */
-        public Builder withEventIdentifierColumn(String eventIdentifierColumn) {
+        public Builder eventIdentifierColumn(String eventIdentifierColumn) {
             this.eventIdentifierColumn = eventIdentifierColumn;
             return this;
         }
@@ -244,7 +244,7 @@ public Builder withEventIdentifierColumn(String eventIdentifierColumn) {
          * @param aggregateIdentifierColumn the name of the aggregate identifier column.
          * @return the modified Builder instance
          */
-        public Builder withAggregateIdentifierColumn(String aggregateIdentifierColumn) {
+        public Builder aggregateIdentifierColumn(String aggregateIdentifierColumn) {
             this.aggregateIdentifierColumn = aggregateIdentifierColumn;
             return this;
         }
@@ -255,7 +255,7 @@ public Builder withAggregateIdentifierColumn(String aggregateIdentifierColumn) {
          * @param sequenceNumberColumn the name of the sequence number column.
          * @return the modified Builder instance
          */
-        public Builder withSequenceNumberColumn(String sequenceNumberColumn) {
+        public Builder sequenceNumberColumn(String sequenceNumberColumn) {
             this.sequenceNumberColumn = sequenceNumberColumn;
             return this;
         }
@@ -266,7 +266,7 @@ public Builder withSequenceNumberColumn(String sequenceNumberColumn) {
          * @param typeColumn the name of the aggregate type column.
          * @return the modified Builder instance
          */
-        public Builder withTypeColumn(String typeColumn) {
+        public Builder typeColumn(String typeColumn) {
             this.typeColumn = typeColumn;
             return this;
         }
@@ -277,7 +277,7 @@ public Builder withTypeColumn(String typeColumn) {
          * @param payloadTypeColumn the name of the payload type column.
          * @return the modified Builder instance
          */
-        public Builder withPayloadTypeColumn(String payloadTypeColumn) {
+        public Builder payloadTypeColumn(String payloadTypeColumn) {
             this.payloadTypeColumn = payloadTypeColumn;
             return this;
         }
@@ -288,7 +288,7 @@ public Builder withPayloadTypeColumn(String payloadTypeColumn) {
          * @param payloadRevisionColumn the name of the payload revision column.
          * @return the modified Builder instance
          */
-        public Builder withPayloadRevisionColumn(String payloadRevisionColumn) {
+        public Builder payloadRevisionColumn(String payloadRevisionColumn) {
             this.payloadRevisionColumn = payloadRevisionColumn;
             return this;
         }
@@ -299,7 +299,7 @@ public Builder withPayloadRevisionColumn(String payloadRevisionColumn) {
          * @param payloadColumn the name of the payload column.
          * @return the modified Builder instance
          */
-        public Builder withPayloadColumn(String payloadColumn) {
+        public Builder payloadColumn(String payloadColumn) {
             this.payloadColumn = payloadColumn;
             return this;
         }
@@ -310,7 +310,7 @@ public Builder withPayloadColumn(String payloadColumn) {
          * @param metaDataColumn the name of the metadata column.
          * @return the modified Builder instance
          */
-        public Builder withMetaDataColumn(String metaDataColumn) {
+        public Builder metaDataColumn(String metaDataColumn) {
             this.metaDataColumn = metaDataColumn;
             return this;
         }

diff --git a/...test/java/org/axonframework/eventsourcing/eventstore/jdbc/JdbcEventStorageEngineTest.java b/...test/java/org/axonframework/eventsourcing/eventstore/jdbc/JdbcEventStorageEngineTest.java
@@ -89,8 +89,8 @@ public void testLoadLastSequenceNumber() {
     public void testCustomSchemaConfig() {
         setTestSubject(testSubject = createEngine(NoOpEventUpcaster.INSTANCE, defaultPersistenceExceptionResolver,
                                                   EventSchema.builder()
-                                                             .withEventTable("CustomDomainEvent")
-                                                             .withPayloadColumn("eventData").build(), String.class,
+                                                             .eventTable("CustomDomainEvent")
+                                                             .payloadColumn("eventData").build(), String.class,
                                                   new HsqlEventTableFactory() {
                                                       @Override
                                                       protected String payloadType() {