Skip to content

Commit 2685e32

Browse files
grahambrown11grahambrown11
committed
fixing some Code Smells identified by SonarQube
1 parent a4c0f5b commit 2685e32

17 files changed

Lines changed: 512 additions & 432 deletions

File tree

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/DefMapper.java‎

Lines changed: 199 additions & 165 deletions
Large diffs are not rendered by default.

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/VERSION.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
* @author lenz
77
*/
88
public class VERSION {
9+
10+
private VERSION() {
11+
throw new IllegalStateException("Utility class");
12+
}
13+
914
public static final String VER = "0.7";
1015
}
1116

codegen/src/main/java/ch/loway/oss/ari4java/codegen/genJava/JavaGen.java renamed to codegen/src/main/java/ch/loway/oss/ari4java/codegen/gen/JavaGen.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package ch.loway.oss.ari4java.codegen.genJava;
2+
package ch.loway.oss.ari4java.codegen.gen;
33

44
import java.util.Date;
55
import java.util.List;
@@ -11,6 +11,10 @@
1111
*/
1212
public class JavaGen {
1313

14+
private JavaGen() {
15+
throw new IllegalStateException("Utility class");
16+
}
17+
1418
public static void addPackage(StringBuilder sb, String myPackage) {
1519
sb.append("package ").append(myPackage).append(";\n\n");
1620
sb.append("// ----------------------------------------------------\n")
@@ -33,9 +37,10 @@ public static void addBanner(StringBuilder sb, String multiLineBanner) {
3337
sb.append("/**\n");
3438
for (String row : rows) {
3539
if (!row.isEmpty()) {
36-
row = row.replaceAll("<br /><br />", "\n * ");
37-
row = row.replaceAll("<br />", "\n * ");
38-
row = row.replaceAll("<", "&gt;").replaceAll(">", "&lt;");
40+
row = row.replace("<br /><br />", "\n * ");
41+
row = row.replace("<br />", "\n * ");
42+
row = row.replace("<", "&gt;");
43+
row = row.replace(">", "&lt;");
3944
sb.append(" * ").append(row).append("\n");
4045
}
4146
}

codegen/src/main/java/ch/loway/oss/ari4java/codegen/genJava/JavaInterface.java renamed to codegen/src/main/java/ch/loway/oss/ari4java/codegen/gen/JavaInterface.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package ch.loway.oss.ari4java.codegen.genJava;
2+
package ch.loway.oss.ari4java.codegen.gen;
33

44
import java.util.Arrays;
55
import java.util.HashMap;
@@ -69,11 +69,11 @@ public String toString() {
6969
"java.util.List",
7070
"java.util.Map",
7171
"java.util.ArrayList",
72-
"ch.loway.oss.ari4java.tools.*",
73-
"ch.loway.oss.ari4java.tools.tags.EventSource",
74-
"ch.loway.oss.ari4java.generated.actions.requests.*",
75-
"ch.loway.oss.ari4java.generated.models.Module",
76-
"ch.loway.oss.ari4java.generated.models.*"));
72+
JavaPkgInfo.BASE_PKG_NAME + ".tools.*",
73+
JavaPkgInfo.BASE_PKG_NAME + ".tools.tags.EventSource",
74+
JavaPkgInfo.GENERATED_PKG_NAME + ".actions.requests.*",
75+
JavaPkgInfo.GENERATED_PKG_NAME + ".models.Module",
76+
JavaPkgInfo.GENERATED_PKG_NAME + ".models.*"));
7777
JavaGen.addBanner(sb, "\n"
7878
+ "Generated by: " + this.getClass().getSimpleName() + "\n"
7979
);
@@ -85,8 +85,8 @@ public String toString() {
8585
sb.append(" extends ").append(parent).append(" ");
8686
}
8787
sb.append(" {\n");
88-
for (String signature : definitions.keySet()) {
89-
sb.append(definitions.get(signature).toInterfaceString()).append("\n");
88+
for (Definition definition : definitions.values()) {
89+
sb.append(definition.toInterfaceString()).append("\n");
9090
}
9191
sb.append("}\n");
9292
return sb.toString();

codegen/src/main/java/ch/loway/oss/ari4java/codegen/genJava/JavaPkgInfo.java renamed to codegen/src/main/java/ch/loway/oss/ari4java/codegen/gen/JavaPkgInfo.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
package ch.loway.oss.ari4java.codegen.genJava;
2+
package ch.loway.oss.ari4java.codegen.gen;
33

44
import java.util.HashMap;
55
import java.util.Map;
@@ -9,8 +9,11 @@
99
*/
1010
public class JavaPkgInfo {
1111

12-
public final static Map<String, String> TypeMap;
13-
public final static Map<String, String> primitiveSignature;
12+
public static final Map<String, String> TypeMap;
13+
public static final Map<String, String> primitiveSignature;
14+
public static final String BASE_PKG_NAME = "ch.loway.oss.ari4java";
15+
public static final String GENERATED_PKG_NAME = BASE_PKG_NAME + ".generated";
16+
public static final String CLAZZ_IMPL_STRING = "_impl_";
1417

1518
static {
1619
TypeMap = new HashMap<>();
@@ -31,7 +34,6 @@ public class JavaPkgInfo {
3134
primitiveSignature.put("Double", "double");
3235
}
3336

34-
String base = "ch.loway.oss.ari4java.generated";
3537
public String className = "";
3638
public String apiVersion = "";
3739
public JavaInterface minimalIf = null;
@@ -42,7 +44,7 @@ public void setPackageInfo(String classN, String apiV) {
4244
}
4345

4446
public String getBaseApiPackage() {
45-
return base + "." + apiVersion;
47+
return GENERATED_PKG_NAME + "." + apiVersion;
4648
}
4749

4850
public String getModelPackage() {
@@ -58,7 +60,7 @@ public String getInterfaceName() {
5860
}
5961

6062
public String getImplName() {
61-
return className + "_impl_" + apiVersion;
63+
return className + CLAZZ_IMPL_STRING + apiVersion;
6264
}
6365

6466
/**

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Action.java‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11

22
package ch.loway.oss.ari4java.codegen.models;
33

4-
import ch.loway.oss.ari4java.codegen.genJava.JavaInterface;
4+
import ch.loway.oss.ari4java.codegen.gen.JavaInterface;
55

66
import java.util.ArrayList;
77
import java.util.List;
8+
import java.util.Objects;
89

910
/**
1011
* @author lenz
@@ -39,5 +40,22 @@ public int compareTo(Action o) {
3940
return path.compareToIgnoreCase(o.path);
4041
}
4142

43+
@Override
44+
public boolean equals(Object o) {
45+
if (this == o) return true;
46+
if (o == null || getClass() != o.getClass()) return false;
47+
Action action = (Action) o;
48+
return Objects.equals(path, action.path) &&
49+
Objects.equals(description, action.description) &&
50+
Objects.equals(operations, action.operations) &&
51+
Objects.equals(javaFile, action.javaFile) &&
52+
Objects.equals(api, action.api);
53+
}
54+
55+
@Override
56+
public int hashCode() {
57+
return Objects.hash(path, description, operations, javaFile, api);
58+
}
59+
4260
}
4361

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Apis.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
package ch.loway.oss.ari4java.codegen.models;
33

4-
import ch.loway.oss.ari4java.codegen.genJava.JavaGen;
5-
import ch.loway.oss.ari4java.codegen.genJava.JavaInterface;
6-
import ch.loway.oss.ari4java.codegen.genJava.JavaPkgInfo;
4+
import ch.loway.oss.ari4java.codegen.gen.JavaGen;
5+
import ch.loway.oss.ari4java.codegen.gen.JavaInterface;
6+
import ch.loway.oss.ari4java.codegen.gen.JavaPkgInfo;
77

88
import java.util.ArrayList;
99
import java.util.Arrays;
@@ -26,12 +26,12 @@ public String toString() {
2626
"java.util.Map",
2727
"java.util.ArrayList",
2828
"java.net.URLEncoder",
29-
"ch.loway.oss.ari4java.ARI",
30-
"ch.loway.oss.ari4java.tools.*",
31-
"ch.loway.oss.ari4java.generated.actions.*",
32-
"ch.loway.oss.ari4java.generated.actions.requests.*",
33-
"ch.loway.oss.ari4java.generated.models.Module",
34-
"ch.loway.oss.ari4java.generated.models.*",
29+
JavaPkgInfo.BASE_PKG_NAME + ".ARI",
30+
JavaPkgInfo.BASE_PKG_NAME + ".tools.*",
31+
JavaPkgInfo.GENERATED_PKG_NAME + ".actions.*",
32+
JavaPkgInfo.GENERATED_PKG_NAME + ".actions.requests.*",
33+
JavaPkgInfo.GENERATED_PKG_NAME + ".models.Module",
34+
JavaPkgInfo.GENERATED_PKG_NAME + ".models.*",
3535
getActionsPackage() + ".requests.*",
3636
getModelPackage() + ".*",
3737
"com.fasterxml.jackson.core.type.TypeReference"));

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/AriBuilderInterface.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

22
package ch.loway.oss.ari4java.codegen.models;
33

4-
import ch.loway.oss.ari4java.codegen.genJava.JavaGen;
4+
import ch.loway.oss.ari4java.codegen.gen.JavaGen;
5+
import ch.loway.oss.ari4java.codegen.gen.JavaPkgInfo;
56

67
import java.util.ArrayList;
78
import java.util.Arrays;
@@ -21,8 +22,8 @@ public class AriBuilderInterface {
2122
public String toString() {
2223
StringBuilder sb = new StringBuilder();
2324
JavaGen.importClasses(sb, "ch.loway.oss.ari4java.generated",
24-
Arrays.asList("ch.loway.oss.ari4java.ARI",
25-
"ch.loway.oss.ari4java.generated.actions.*")
25+
Arrays.asList(JavaPkgInfo.BASE_PKG_NAME + ".ARI",
26+
JavaPkgInfo.GENERATED_PKG_NAME + ".actions.*")
2627
);
2728
sb.append("public interface AriBuilder {\n");
2829
Collections.sort(knownInterfaces);

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/ClassTranslator.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package ch.loway.oss.ari4java.codegen.models;
22

3-
import ch.loway.oss.ari4java.codegen.genJava.JavaGen;
4-
import ch.loway.oss.ari4java.codegen.genJava.JavaPkgInfo;
3+
import ch.loway.oss.ari4java.codegen.gen.JavaGen;
4+
import ch.loway.oss.ari4java.codegen.gen.JavaPkgInfo;
55

66
import java.util.*;
77

@@ -21,12 +21,12 @@ public ClassTranslator(String version) {
2121
mInterfaces = new HashMap<>();
2222
imports = new ArrayList<>();
2323
className = "ClassTranslator";
24-
imports.add("ch.loway.oss.ari4java.ARI");
25-
imports.add("ch.loway.oss.ari4java.generated.actions.*");
26-
imports.add("ch.loway.oss.ari4java.generated.models.Module");
27-
imports.add("ch.loway.oss.ari4java.generated.models.*");
28-
imports.add("ch.loway.oss.ari4java.generated." + apiVersion + ".actions.*");
29-
imports.add("ch.loway.oss.ari4java.generated." + apiVersion + ".models.*");
24+
imports.add(JavaPkgInfo.BASE_PKG_NAME + ".ARI");
25+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + ".actions.*");
26+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + ".models.Module");
27+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + ".models.*");
28+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + "." + apiVersion + ".actions.*");
29+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + "." + apiVersion + ".models.*");
3030
}
3131

3232
public void setClass(String ifName, String implementation) {

‎codegen/src/main/java/ch/loway/oss/ari4java/codegen/models/Model.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
package ch.loway.oss.ari4java.codegen.models;
33

4-
import ch.loway.oss.ari4java.codegen.genJava.JavaGen;
5-
import ch.loway.oss.ari4java.codegen.genJava.JavaInterface;
6-
import ch.loway.oss.ari4java.codegen.genJava.JavaPkgInfo;
4+
import ch.loway.oss.ari4java.codegen.gen.JavaGen;
5+
import ch.loway.oss.ari4java.codegen.gen.JavaInterface;
6+
import ch.loway.oss.ari4java.codegen.gen.JavaPkgInfo;
77

88
import java.util.ArrayList;
99
import java.util.Collections;
@@ -30,8 +30,8 @@ public Model() {
3030
imports.add("java.util.Date");
3131
imports.add("java.util.List");
3232
imports.add("java.util.Map");
33-
imports.add("ch.loway.oss.ari4java.generated.models.Module");
34-
imports.add("ch.loway.oss.ari4java.generated.models.*");
33+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + ".models.Module");
34+
imports.add(JavaPkgInfo.GENERATED_PKG_NAME + ".models.*");
3535
imports.add("com.fasterxml.jackson.databind.annotation.JsonDeserialize");
3636
imports.add("com.fasterxml.jackson.annotation.JsonIgnore");
3737
}

0 commit comments

Comments
 (0)