Skip to content

Commit 4866823

Browse files
brynrhodesbrynrhodes
committed
Spotless and quality gate fixes
1 parent 49ff33b commit 4866823

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/Cql2ElmVisitor.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,10 @@ public Object visitListSelector(cqlParser.ListSelectorContext ctx) {
734734
for (cqlParser.ExpressionContext elementContext : ctx.expression()) {
735735
Expression element = parseExpression(elementContext);
736736

737+
if (element == null) {
738+
throw new RuntimeException("Element failed to parse");
739+
}
740+
737741
if (elementType != null) {
738742
libraryBuilder.verifyType(element.getResultType(), elementType);
739743
} else {

‎Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/LibraryBuilder.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,7 @@ public Invocation resolveProperContainsInvocation(
11001100

11011101
private int getTypeScore(OperatorResolution resolution) {
11021102
int typeScore = ConversionMap.ConversionScore.ExactMatch.score();
1103-
for (DataType operand :
1104-
resolution.getOperator().getSignature().getOperandTypes()) {
1103+
for (DataType operand : resolution.getOperator().getSignature().getOperandTypes()) {
11051104
typeScore += ConversionMap.getTypePrecedenceScore(operand);
11061105
}
11071106

@@ -1114,10 +1113,12 @@ private Expression lowestScoringInvocation(Invocation primary, Invocation second
11141113
if (secondary.getResolution().getScore()
11151114
< primary.getResolution().getScore()) {
11161115
return secondary.getExpression();
1117-
} else if (primary.getResolution().getScore() < secondary.getResolution().getScore()) {
1116+
} else if (primary.getResolution().getScore()
1117+
< secondary.getResolution().getScore()) {
11181118
return primary.getExpression();
11191119
}
1120-
if (primary.getResolution().getScore() == secondary.getResolution().getScore()) {
1120+
if (primary.getResolution().getScore()
1121+
== secondary.getResolution().getScore()) {
11211122
int primaryTypeScore = getTypeScore(primary.getResolution());
11221123
int secondaryTypeScore = getTypeScore(secondary.getResolution());
11231124

‎Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/model/OperatorEntry.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ private OperatorResolution getOperatorResolution(
7878
boolean requireConversions) {
7979
Conversion[] conversions = getConversions(
8080
callSignature, operator.getSignature(), conversionMap, operatorMap, allowPromotionAndDemotion);
81-
OperatorResolution result = new OperatorResolution(
82-
operator, conversions);
81+
OperatorResolution result = new OperatorResolution(operator, conversions);
8382
if (requireConversions && conversions == null) {
8483
return null;
8584
}

‎Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/TranslationTests.java

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -341,67 +341,67 @@ void resolutionProperlyIncludesTests() throws IOException {
341341

342342
ExpressionDef test = statements.get(0);
343343
assertThat(test.getExpression(), instanceOf(ProperContains.class));
344-
ProperContains properContains = (ProperContains)test.getExpression();
344+
ProperContains properContains = (ProperContains) test.getExpression();
345345
assertThat(properContains.getOperand().get(0), instanceOf(Interval.class));
346-
Interval interval = (Interval)properContains.getOperand().get(0);
346+
Interval interval = (Interval) properContains.getOperand().get(0);
347347
assertThat(interval.getResultType(), instanceOf(IntervalType.class));
348-
IntervalType intervalType = (IntervalType)interval.getResultType();
348+
IntervalType intervalType = (IntervalType) interval.getResultType();
349349
assertThat(intervalType.getPointType(), instanceOf(SimpleType.class));
350-
SimpleType pointType = (SimpleType)intervalType.getPointType();
350+
SimpleType pointType = (SimpleType) intervalType.getPointType();
351351
assertThat(pointType.getName(), equalTo("System.Integer"));
352352
assertThat(properContains.getOperand().get(1), instanceOf(As.class));
353-
As _as = (As)properContains.getOperand().get(1);
353+
As _as = (As) properContains.getOperand().get(1);
354354
assertThat(_as.getAsType().toString(), equalTo("{urn:hl7-org:elm-types:r1}Integer"));
355355
assertThat(_as.getOperand(), instanceOf(Null.class));
356356

357357
test = statements.get(1);
358358
assertThat(test.getExpression(), instanceOf(ProperContains.class));
359-
properContains = (ProperContains)test.getExpression();
359+
properContains = (ProperContains) test.getExpression();
360360
assertThat(properContains.getOperand().get(0), instanceOf(Interval.class));
361-
interval = (Interval)properContains.getOperand().get(0);
361+
interval = (Interval) properContains.getOperand().get(0);
362362
assertThat(interval.getResultType(), instanceOf(IntervalType.class));
363-
intervalType = (IntervalType)interval.getResultType();
363+
intervalType = (IntervalType) interval.getResultType();
364364
assertThat(intervalType.getPointType(), instanceOf(SimpleType.class));
365-
pointType = (SimpleType)intervalType.getPointType();
365+
pointType = (SimpleType) intervalType.getPointType();
366366
assertThat(pointType.getName(), equalTo("System.Integer"));
367367
assertThat(properContains.getOperand().get(1), instanceOf(As.class));
368-
_as = (As)properContains.getOperand().get(1);
368+
_as = (As) properContains.getOperand().get(1);
369369
assertThat(_as.getAsType().toString(), equalTo("{urn:hl7-org:elm-types:r1}Integer"));
370370
assertThat(_as.getOperand(), instanceOf(Null.class));
371371

372372
test = statements.get(2);
373373
assertThat(test.getExpression(), instanceOf(ProperContains.class));
374-
properContains = (ProperContains)test.getExpression();
374+
properContains = (ProperContains) test.getExpression();
375375
assertThat(properContains.getOperand().get(0), instanceOf(Interval.class));
376-
interval = (Interval)properContains.getOperand().get(0);
376+
interval = (Interval) properContains.getOperand().get(0);
377377
assertThat(interval.getResultType(), instanceOf(IntervalType.class));
378-
intervalType = (IntervalType)interval.getResultType();
378+
intervalType = (IntervalType) interval.getResultType();
379379
assertThat(intervalType.getPointType(), instanceOf(SimpleType.class));
380-
pointType = (SimpleType)intervalType.getPointType();
380+
pointType = (SimpleType) intervalType.getPointType();
381381
assertThat(pointType.getName(), equalTo("System.Any"));
382382
assertThat(properContains.getOperand().get(1), instanceOf(Null.class));
383383

384384
test = statements.get(3);
385385
assertThat(test.getExpression(), instanceOf(ProperContains.class));
386-
properContains = (ProperContains)test.getExpression();
386+
properContains = (ProperContains) test.getExpression();
387387
assertThat(properContains.getOperand().get(0), instanceOf(Interval.class));
388-
interval = (Interval)properContains.getOperand().get(0);
388+
interval = (Interval) properContains.getOperand().get(0);
389389
assertThat(interval.getResultType(), instanceOf(IntervalType.class));
390-
intervalType = (IntervalType)interval.getResultType();
390+
intervalType = (IntervalType) interval.getResultType();
391391
assertThat(intervalType.getPointType(), instanceOf(SimpleType.class));
392-
pointType = (SimpleType)intervalType.getPointType();
392+
pointType = (SimpleType) intervalType.getPointType();
393393
assertThat(pointType.getName(), equalTo("System.Any"));
394394
assertThat(properContains.getOperand().get(1), instanceOf(Null.class));
395395

396396
test = statements.get(4);
397397
assertThat(test.getExpression(), instanceOf(ProperContains.class));
398-
properContains = (ProperContains)test.getExpression();
398+
properContains = (ProperContains) test.getExpression();
399399
assertThat(properContains.getOperand().get(0), instanceOf(Interval.class));
400-
interval = (Interval)properContains.getOperand().get(0);
400+
interval = (Interval) properContains.getOperand().get(0);
401401
assertThat(interval.getResultType(), instanceOf(IntervalType.class));
402-
intervalType = (IntervalType)interval.getResultType();
402+
intervalType = (IntervalType) interval.getResultType();
403403
assertThat(intervalType.getPointType(), instanceOf(SimpleType.class));
404-
pointType = (SimpleType)intervalType.getPointType();
404+
pointType = (SimpleType) intervalType.getPointType();
405405
assertThat(pointType.getName(), equalTo("System.Integer"));
406406
assertThat(properContains.getOperand().get(1), instanceOf(As.class));
407407
}

0 commit comments

Comments
 (0)