\#102 Message type detection more robust

entur · Nov 23, 2020 · ed11a2f · ed11a2f
1 parent 39a2e74
commit ed11a2f
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/schema2proto-lib/src/main/java/no/entur/schema2proto/generateproto/ProtoSerializer.java b/schema2proto-lib/src/main/java/no/entur/schema2proto/generateproto/ProtoSerializer.java
@@ -496,11 +496,10 @@ private void uppercaseMessageNames(Map<String, ProtoFile> packageToProtoFileMap,
 
  private CaseFormat getCaseFormatName(String s) throws IllegalFormatException {
  if (s.contains("_")) {
- if (s.toUpperCase().equals(s)) {
- return CaseFormat.UPPER_UNDERSCORE;
- }
- if (s.toLowerCase().equals(s)) {
+ if (Character.isLowerCase(s.charAt(0))) {
  return CaseFormat.LOWER_UNDERSCORE;
+ } else {
+ return CaseFormat.UPPER_UNDERSCORE;
  }
  } else if (s.contains("-")) {
  if (s.toLowerCase().equals(s)) {