Fixed code smell.

Dennis Labordus · Dennis Labordus · commit db161851f68c · 2022-09-14T13:23:31.000+02:00
Signed-off-by: Dennis Labordus &lt;dennis.labordus@alliander.com&gt;
diff --git a/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java b/scl2003/src/main/java/org/lfenergy/compas/scl2003/commons/CompasExtensionsManager.java
@@ -27,16 +27,16 @@ public Optional<TPrivate> getCompasPrivate(SCL scl) {
         return Optional.empty();
     }
 
-    public Optional<String> getCompasSclName(TPrivate compasPrivate) {
-        return getCompasValue(compasPrivate, SCL_NAME, String.class);
+    public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
+        return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
     }
 
     public Optional<SclFileType> getCompasSclFileType(TPrivate compasPrivate) {
         return getCompasValue(compasPrivate, SCL_FILE_TYPE, SclFileType.class);
     }
 
-    public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
-        return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
+    public Optional<String> getCompasSclName(TPrivate compasPrivate) {
+        return getCompasValue(compasPrivate, SCL_NAME, String.class);
     }
 
     private <T> Optional<T> getCompasValue(TPrivate compasPrivate, CompasExtensionsField field, Class<T> clazz) {
diff --git a/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java b/scl2007b/src/main/java/org/lfenergy/compas/scl2007b/commons/CompasExtensionsManager.java
@@ -34,14 +34,14 @@ private <T> Optional<T> getCompasValue(TPrivate compasPrivate, CompasExtensionsF
         return Optional.empty();
     }
 
-    public Optional<String> getCompasSclName(TPrivate compasPrivate) {
-        return getCompasValue(compasPrivate, SCL_NAME, String.class);
-    }
-
     public Optional<SclFileType> getCompasSclFileType(TPrivate compasPrivate) {
         return getCompasValue(compasPrivate, SCL_FILE_TYPE, SclFileType.class);
     }
 
+    public Optional<String> getCompasSclName(TPrivate compasPrivate) {
+        return getCompasValue(compasPrivate, SCL_NAME, String.class);
+    }
+
     public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {
         return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);
     }

Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,16 @@ public Optional<TPrivate> getCompasPrivate(SCL scl) {`
`27`	`27`	`return Optional.empty();`
`28`	`28`	`}`
`29`	`29`
`30`		`- public Optional<String> getCompasSclName(TPrivate compasPrivate) {`
`31`		`- return getCompasValue(compasPrivate, SCL_NAME, String.class);`
	`30`	`+ public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {`
	`31`	`+ return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`public Optional<SclFileType> getCompasSclFileType(TPrivate compasPrivate) {`
`35`	`35`	`return getCompasValue(compasPrivate, SCL_FILE_TYPE, SclFileType.class);`
`36`	`36`	`}`
`37`	`37`
`38`		`- public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {`
`39`		`- return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);`
	`38`	`+ public Optional<String> getCompasSclName(TPrivate compasPrivate) {`
	`39`	`+ return getCompasValue(compasPrivate, SCL_NAME, String.class);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`private <T> Optional<T> getCompasValue(TPrivate compasPrivate, CompasExtensionsField field, Class<T> clazz) {`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,14 @@ private <T> Optional<T> getCompasValue(TPrivate compasPrivate, CompasExtensionsF`
`34`	`34`	`return Optional.empty();`
`35`	`35`	`}`
`36`	`36`
`37`		`- public Optional<String> getCompasSclName(TPrivate compasPrivate) {`
`38`		`- return getCompasValue(compasPrivate, SCL_NAME, String.class);`
`39`		`- }`
`40`		`-`
`41`	`37`	`public Optional<SclFileType> getCompasSclFileType(TPrivate compasPrivate) {`
`42`	`38`	`return getCompasValue(compasPrivate, SCL_FILE_TYPE, SclFileType.class);`
`43`	`39`	`}`
`44`	`40`
	`41`	`+ public Optional<String> getCompasSclName(TPrivate compasPrivate) {`
	`42`	`+ return getCompasValue(compasPrivate, SCL_NAME, String.class);`
	`43`	`+ }`
	`44`	`+`
`45`	`45`	`public Optional<TCompasLabels> getLabels(TPrivate compasPrivate) {`
`46`	`46`	`return getCompasValue(compasPrivate, LABELS, TCompasLabels.class);`
`47`	`47`	`}`