throw errors properly

kobylynskyi · May 12, 2023 · 2542b8f · 2542b8f
1 parent 45f0afd
commit 2542b8f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 18 deletions.
diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLTypeMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/java/JavaGraphQLTypeMapper.java
@@ -71,11 +71,14 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
             // in case it is query/mutation, return type is list and apiReturnListType is set
             if (mappingContext.getApiReturnListType().contains(MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER)) {
                 Matcher matcher = JAVA_UTIL_LIST_ELEMENT_REGEX.matcher(computedTypeName);
-                matcher.find();
-                String listElement = matcher.group(1);
-                return mappingContext.getApiReturnListType().replace(
-                        MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER,
-                        listElement);
+                if (matcher.find()) {
+                    String listElement = matcher.group(1);
+                    return mappingContext.getApiReturnListType().replace(
+                            MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER,
+                            listElement);
+                } else {
+                    throw new IllegalStateException();
+                }
             } else {
                 return computedTypeName.replace(JAVA_UTIL_LIST, mappingContext.getApiReturnListType());
             }

diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinGraphQLTypeMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/kotlin/KotlinGraphQLTypeMapper.java
@@ -100,15 +100,18 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
                 boolean isNullable = computedTypeName.endsWith(KOTLIN_UTIL_NULLABLE);
 
                 Matcher matcher = KOTLIN_UTIL_LIST_ELEMENT_REGEX.matcher(computedTypeName);
-                matcher.find();
-                String listElement = matcher.group(1);
-                computedTypeName = mappingContext.getApiReturnListType()
-                        .replace(MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER, listElement);
-
-                if (isNullable) {
-                    return computedTypeName + "?";
+                if (matcher.find()) {
+                    String listElement = matcher.group(1);
+                    computedTypeName = mappingContext.getApiReturnListType()
+                            .replace(MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER, listElement);
+
+                    if (isNullable) {
+                        return computedTypeName + "?";
+                    } else {
+                        return computedTypeName;
+                    }
                 } else {
-                    return computedTypeName;
+                    throw new IllegalStateException();
                 }
             } else {
                 return computedTypeName.replace(KOTLIN_UTIL_LIST, mappingContext.getApiReturnListType());

diff --git a/src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaGraphQLTypeMapper.java b/src/main/java/com/kobylynskyi/graphql/codegen/scala/ScalaGraphQLTypeMapper.java
@@ -78,11 +78,14 @@ public String wrapApiReturnTypeIfRequired(MappingContext mappingContext,
             // in case it is query/mutation, return type is list and apiReturnListType is set
             if (mappingContext.getApiReturnListType().contains(MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER)) {
                 Matcher matcher = SCALA_UTIL_LIST_ELEMENT_REGEX.matcher(computedTypeName);
-                matcher.find();
-                String listElement = matcher.group(1);
-                return mappingContext.getApiReturnListType().replace(
-                        MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER,
-                        listElement);
+                if (matcher.find()) {
+                    String listElement = matcher.group(1);
+                    return mappingContext.getApiReturnListType().replace(
+                            MappingConfigConstants.API_RETURN_NAME_PLACEHOLDER,
+                            listElement);
+                } else {
+                    throw new IllegalStateException();
+                }
             } else {
                 return computedTypeName.replace(SCALA_UTIL_LIST, mappingContext.getApiReturnListType());
             }