Skip to content

Commit 5499c9d

Browse files
cboehmecboehme
committed
Unified capitalisation of WellformednessChecker.
1 parent 4ebf61f commit 5499c9d

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

‎src/main/java/org/culturegraph/mf/framework/StreamReceiver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* ENTITY_OR_LITERAL = ENTITY | literal
2626
* ENTITY = startEntity, ENTITY_OR_LITERAL*, endEntity)
2727
*
28-
* The {@link WellFormednessChecker} can be used to check if a stream conforms
28+
* The {@link WellformednessChecker} can be used to check if a stream conforms
2929
* to these rules.
3030
*
3131
* @see DefaultStreamReceiver

‎src/main/java/org/culturegraph/mf/stream/sink/StreamValidator.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private void appendChildren(final StringBuilder builder) {
156156
private boolean strictKeyOrder;
157157
private boolean strictValueOrder;
158158

159-
private final WellFormednessChecker wellFormednessChecker = new WellFormednessChecker();
159+
private final WellformednessChecker wellformednessChecker = new WellformednessChecker();
160160

161161
public StreamValidator(final List<Event> expectedStream) {
162162
this.eventStream = new EventNode(null, null);
@@ -207,7 +207,7 @@ public void startRecord(final String identifier) {
207207
throw new ValidationException(VALIDATION_FAILED);
208208
}
209209

210-
wellFormednessChecker.startRecord(identifier);
210+
wellformednessChecker.startRecord(identifier);
211211

212212
validating = true;
213213

@@ -224,7 +224,7 @@ public void endRecord() {
224224
throw new ValidationException(VALIDATION_FAILED);
225225
}
226226

227-
wellFormednessChecker.endRecord();
227+
wellformednessChecker.endRecord();
228228

229229
if (!closeGroups()) {
230230
validationFailed = true;
@@ -240,7 +240,7 @@ public void startEntity(final String name) {
240240
throw new ValidationException(VALIDATION_FAILED);
241241
}
242242

243-
wellFormednessChecker.startEntity(name);
243+
wellformednessChecker.startEntity(name);
244244

245245
if (!openGroups(Event.Type.START_ENTITY, name, strictKeyOrder, strictValueOrder)) {
246246
validationFailed = true;
@@ -255,7 +255,7 @@ public void endEntity() {
255255
throw new ValidationException(VALIDATION_FAILED);
256256
}
257257

258-
wellFormednessChecker.endEntity();
258+
wellformednessChecker.endEntity();
259259

260260
if (!closeGroups()) {
261261
validationFailed = true;
@@ -270,7 +270,7 @@ public void literal(final String name, final String value) {
270270
throw new ValidationException(VALIDATION_FAILED);
271271
}
272272

273-
wellFormednessChecker.literal(name, value);
273+
wellformednessChecker.literal(name, value);
274274

275275
final List<EventNode> stackFrame = stack.peek();
276276

@@ -292,7 +292,7 @@ public void literal(final String name, final String value) {
292292

293293
@Override
294294
public void resetStream() {
295-
wellFormednessChecker.resetStream();
295+
wellformednessChecker.resetStream();
296296

297297
validating = false;
298298
validationFailed = false;
@@ -308,7 +308,7 @@ public void closeStream() {
308308
throw new ValidationException(VALIDATION_FAILED);
309309
}
310310

311-
wellFormednessChecker.closeStream();
311+
wellformednessChecker.closeStream();
312312

313313
validating = false;
314314

‎src/main/java/org/culturegraph/mf/stream/sink/WellFormednessChecker.java renamed to ‎src/main/java/org/culturegraph/mf/stream/sink/WellformednessChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Christoph Böhme
3030
*
3131
*/
32-
public final class WellFormednessChecker implements StreamReceiver {
32+
public final class WellformednessChecker implements StreamReceiver {
3333

3434
private static final String ID_MUST_NOT_BE_NULL = "id must not be null";
3535
private static final String NAME_MUST_NOT_BE_NULL = "name must not be null";

‎src/test/java/org/culturegraph/mf/stream/sink/WellFormednessCheckerTest.java renamed to ‎src/test/java/org/culturegraph/mf/stream/sink/WellformednessCheckerTest.java

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
import org.junit.Test;
2121

2222
/**
23-
* Tests for {@link WellFormednessChecker}.
23+
* Tests for {@link WellformednessChecker}.
2424
*
2525
* @author Christoph Böhme
2626
*
2727
*/
28-
public final class WellFormednessCheckerTest {
28+
public final class WellformednessCheckerTest {
2929

3030
private static final String RECORD_ID1 = "id1";
3131
private static final String RECORD_ID2 = "id2";
@@ -41,120 +41,120 @@ public final class WellFormednessCheckerTest {
4141
private static final String VALUE3 = "value3";
4242
private static final String VALUE4 = "value4";
4343

44-
private WellFormednessChecker wellFormednessChecker;
44+
private WellformednessChecker wellformednessChecker;
4545

4646
@Before
4747
public void setup() {
48-
wellFormednessChecker = new WellFormednessChecker();
48+
wellformednessChecker = new WellformednessChecker();
4949
}
5050

5151
@Test
5252
public void testShouldAcceptValidStream() {
53-
wellFormednessChecker.startRecord(RECORD_ID1);
54-
wellFormednessChecker.literal(LITERAL1, VALUE1);
55-
wellFormednessChecker.startEntity(ENTITY1);
56-
wellFormednessChecker.literal(LITERAL2, VALUE2);
57-
wellFormednessChecker.startEntity(ENTITY2);
58-
wellFormednessChecker.literal(LITERAL3, VALUE3);
59-
wellFormednessChecker.endEntity();
60-
wellFormednessChecker.endEntity();
61-
wellFormednessChecker.endRecord();
62-
wellFormednessChecker.startRecord(RECORD_ID2);
63-
wellFormednessChecker.startEntity(ENTITY3);
64-
wellFormednessChecker.literal(LITERAL4, VALUE4);
65-
wellFormednessChecker.endEntity();
66-
wellFormednessChecker.endRecord();
67-
wellFormednessChecker.closeStream();
53+
wellformednessChecker.startRecord(RECORD_ID1);
54+
wellformednessChecker.literal(LITERAL1, VALUE1);
55+
wellformednessChecker.startEntity(ENTITY1);
56+
wellformednessChecker.literal(LITERAL2, VALUE2);
57+
wellformednessChecker.startEntity(ENTITY2);
58+
wellformednessChecker.literal(LITERAL3, VALUE3);
59+
wellformednessChecker.endEntity();
60+
wellformednessChecker.endEntity();
61+
wellformednessChecker.endRecord();
62+
wellformednessChecker.startRecord(RECORD_ID2);
63+
wellformednessChecker.startEntity(ENTITY3);
64+
wellformednessChecker.literal(LITERAL4, VALUE4);
65+
wellformednessChecker.endEntity();
66+
wellformednessChecker.endRecord();
67+
wellformednessChecker.closeStream();
6868
}
6969

7070
@Test
7171
public void testShouldAcceptEmptyStream() {
72-
wellFormednessChecker.closeStream();
72+
wellformednessChecker.closeStream();
7373
}
7474

7575
@Test(expected=WellformednessException.class)
7676
public void testShouldFailOnNullRecordId() {
77-
wellFormednessChecker.startRecord(null);
78-
wellFormednessChecker.endRecord();
79-
wellFormednessChecker.closeStream();
77+
wellformednessChecker.startRecord(null);
78+
wellformednessChecker.endRecord();
79+
wellformednessChecker.closeStream();
8080
}
8181

8282
@Test(expected=WellformednessException.class)
8383
public void testShouldFailOnNullEntityName() {
84-
wellFormednessChecker.startRecord(RECORD_ID1);
85-
wellFormednessChecker.startEntity(null);
86-
wellFormednessChecker.endEntity();
87-
wellFormednessChecker.endRecord();
88-
wellFormednessChecker.closeStream();
84+
wellformednessChecker.startRecord(RECORD_ID1);
85+
wellformednessChecker.startEntity(null);
86+
wellformednessChecker.endEntity();
87+
wellformednessChecker.endRecord();
88+
wellformednessChecker.closeStream();
8989
}
9090

9191
@Test(expected=WellformednessException.class)
9292
public void testShouldFailOnNullLiteralName() {
93-
wellFormednessChecker.startRecord(RECORD_ID1);
94-
wellFormednessChecker.literal(null, VALUE1);
95-
wellFormednessChecker.endRecord();
96-
wellFormednessChecker.closeStream();
93+
wellformednessChecker.startRecord(RECORD_ID1);
94+
wellformednessChecker.literal(null, VALUE1);
95+
wellformednessChecker.endRecord();
96+
wellformednessChecker.closeStream();
9797
}
9898

9999
@Test(expected=WellformednessException.class)
100100
public void testShouldFailOnStartRecordInsideRecord() {
101-
wellFormednessChecker.startRecord(RECORD_ID1);
102-
wellFormednessChecker.startRecord(RECORD_ID2);
103-
wellFormednessChecker.endRecord();
104-
wellFormednessChecker.closeStream();
101+
wellformednessChecker.startRecord(RECORD_ID1);
102+
wellformednessChecker.startRecord(RECORD_ID2);
103+
wellformednessChecker.endRecord();
104+
wellformednessChecker.closeStream();
105105
}
106106

107107
@Test(expected=WellformednessException.class)
108108
public void testShouldFailOnEndRecordOutsideRecord() {
109-
wellFormednessChecker.endRecord();
110-
wellFormednessChecker.closeStream();
109+
wellformednessChecker.endRecord();
110+
wellformednessChecker.closeStream();
111111
}
112112

113113
@Test(expected=WellformednessException.class)
114114
public void testShouldFailOnStartEntityOutsideRecord() {
115-
wellFormednessChecker.startEntity(ENTITY1);
116-
wellFormednessChecker.closeStream();
115+
wellformednessChecker.startEntity(ENTITY1);
116+
wellformednessChecker.closeStream();
117117
}
118118

119119
@Test(expected=WellformednessException.class)
120120
public void testShouldFailOnEndEntityOutsideRecord() {
121-
wellFormednessChecker.endEntity();
122-
wellFormednessChecker.closeStream();
121+
wellformednessChecker.endEntity();
122+
wellformednessChecker.closeStream();
123123
}
124124

125125
@Test(expected=WellformednessException.class)
126126
public void testShouldFailOnUnmatchedEndEntity() {
127-
wellFormednessChecker.startRecord(RECORD_ID1);
128-
wellFormednessChecker.endEntity();
129-
wellFormednessChecker.endRecord();
130-
wellFormednessChecker.closeStream();
127+
wellformednessChecker.startRecord(RECORD_ID1);
128+
wellformednessChecker.endEntity();
129+
wellformednessChecker.endRecord();
130+
wellformednessChecker.closeStream();
131131
}
132132

133133
@Test(expected=WellformednessException.class)
134134
public void testShouldFailOnLiteralOutsideRecord() {
135-
wellFormednessChecker.literal(LITERAL1, VALUE1);
136-
wellFormednessChecker.closeStream();
135+
wellformednessChecker.literal(LITERAL1, VALUE1);
136+
wellformednessChecker.closeStream();
137137
}
138138

139139
@Test(expected=WellformednessException.class)
140140
public void testShouldFailOnUnclosedRecord() {
141-
wellFormednessChecker.startRecord(RECORD_ID1);
142-
wellFormednessChecker.closeStream();
141+
wellformednessChecker.startRecord(RECORD_ID1);
142+
wellformednessChecker.closeStream();
143143
}
144144

145145
@Test(expected=WellformednessException.class)
146146
public void testShouldFailOnUnclosedEntityAtEndRecord() {
147-
wellFormednessChecker.startRecord(RECORD_ID1);
148-
wellFormednessChecker.startEntity(ENTITY1);
149-
wellFormednessChecker.endRecord();
150-
wellFormednessChecker.closeStream();
147+
wellformednessChecker.startRecord(RECORD_ID1);
148+
wellformednessChecker.startEntity(ENTITY1);
149+
wellformednessChecker.endRecord();
150+
wellformednessChecker.closeStream();
151151
}
152152

153153
@Test(expected=WellformednessException.class)
154154
public void testShouldFailOnUnclosedEntityAtCloseStream() {
155-
wellFormednessChecker.startRecord(RECORD_ID1);
156-
wellFormednessChecker.startEntity(ENTITY1);
157-
wellFormednessChecker.closeStream();
155+
wellformednessChecker.startRecord(RECORD_ID1);
156+
wellformednessChecker.startEntity(ENTITY1);
157+
wellformednessChecker.closeStream();
158158
}
159159

160160
}

0 commit comments

Comments
 (0)