remove AbstractModel and use ToStringStyler.INSTANCE

PhilippSalvisberg · PhilippSalvisberg · commit eb6d31af7a42 · 2020-05-25T11:27:19.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/AbstractModel.java b/sqldev/src/main/java/org/utplsql/sqldev/model/AbstractModel.java
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java b/sqldev/src/main/java/org/utplsql/sqldev/model/oddgen/GenContext.java
@@ -18,9 +18,9 @@
 import java.sql.Connection;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public class GenContext extends AbstractModel {
+public class GenContext {
     private Connection conn;
     private String objectType;
     private String objectName;
@@ -40,7 +40,7 @@ public Connection getConn() {
 
     @Override 
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("conn", conn)
                 .append("objectType", objectType)
                 .append("objectName", objectName)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/PlsqlObject.java
@@ -18,18 +18,18 @@
 import java.util.List;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 import org.utplsql.sqldev.model.ut.Annotation;
 
-public class PlsqlObject extends AbstractModel {
+public class PlsqlObject {
     private String name;
     private String type;
     private Integer position;
     private List<Annotation> annotations;
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("name", name)
                 .append("type", type)
                 .append("position", position)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java b/sqldev/src/main/java/org/utplsql/sqldev/model/parser/Unit.java
@@ -16,16 +16,16 @@
 package org.utplsql.sqldev.model.parser;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public class Unit extends AbstractModel {
+public class Unit {
     private String name;
     private Integer position;
     private Integer positionOfName;
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("name", name)
                 .append("position", position)
                 .append("positionOfName", positionOfName)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java b/sqldev/src/main/java/org/utplsql/sqldev/model/preference/PreferenceModel.java
@@ -70,7 +70,7 @@ public static PreferenceModel getInstance(final PropertyStorage prefs) {
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, UtplsqlToStringStyler.STYLER)
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append(KEY_USE_REALTIME_REPORTER, isUseRealtimeReporter())
                 .append(KEY_UNSHARED_WORKSHEET, isUnsharedWorksheet())
                 .append(KEY_RESET_PACKAGE, isResetPackage())
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Counter.java
@@ -16,9 +16,9 @@
 package org.utplsql.sqldev.model.runner;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public class Counter extends AbstractModel {
+public class Counter {
     private Integer disabled;
     private Integer success;
     private Integer failure;
@@ -27,7 +27,7 @@ public class Counter extends AbstractModel {
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("disabled", disabled)
                 .append("success", success)
                 .append("failure", failure)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Expectation.xtend
@@ -17,10 +17,9 @@ package org.utplsql.sqldev.model.runner
 
 import java.util.regex.Pattern
 import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
 
 @Accessors
-class Expectation extends AbstractModel {
+class Expectation {
 	String description
 	String message
 	String caller
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Item.java
@@ -16,9 +16,9 @@
 package org.utplsql.sqldev.model.runner;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public abstract class Item extends AbstractModel {
+public abstract class Item {
     private String id;
     private String startTime;
     private String endTime;
@@ -30,7 +30,7 @@ public abstract class Item extends AbstractModel {
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("id", id)
                 .append("startTime", startTime)
                 .append("endTime", endTime)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RealtimeReporterEvent.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/RealtimeReporterEvent.xtend
@@ -15,7 +15,5 @@
  */
 package org.utplsql.sqldev.model.runner
 
-import org.utplsql.sqldev.model.AbstractModel
-
-abstract class RealtimeReporterEvent extends AbstractModel {
+abstract class RealtimeReporterEvent {
 }
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend
@@ -18,10 +18,9 @@ package org.utplsql.sqldev.model.runner
 import java.util.LinkedHashMap
 import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
-import org.utplsql.sqldev.model.AbstractModel
 
 @Accessors
-class Run extends AbstractModel {
+class Run {
 	String reporterId
 	String connectionName
 	List<String> pathList
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/Annotation.java
@@ -16,9 +16,9 @@
 package org.utplsql.sqldev.model.ut;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public class Annotation extends AbstractModel {
+public class Annotation {
     private String objectOwner;
     private String objectName;
     private String name;
@@ -27,7 +27,7 @@ public class Annotation extends AbstractModel {
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("objectOwner", objectOwner)
                 .append("objectName", objectName)
                 .append("name", name)
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java b/sqldev/src/main/java/org/utplsql/sqldev/model/ut/OutputLines.java
@@ -16,15 +16,15 @@
 package org.utplsql.sqldev.model.ut;
 
 import org.springframework.core.style.ToStringCreator;
-import org.utplsql.sqldev.model.AbstractModel;
+import org.utplsql.sqldev.model.UtplsqlToStringStyler;
 
-public class OutputLines extends AbstractModel {
+public class OutputLines {
     private String[] lines;
     private Integer numlines;
 
     @Override
     public String toString() {
-        return new ToStringCreator(this, getStyler())
+        return new ToStringCreator(this, UtplsqlToStringStyler.INSTANCE)
                 .append("lines", lines)
                 .append("numlines", numlines)
                 .toString();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,5 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.utplsql.sqldev.model.runner`
`17`	`17`
`18`		`-import org.utplsql.sqldev.model.AbstractModel`
`19`		`-`
`20`		`-abstract class RealtimeReporterEvent extends AbstractModel {`
	`18`	`+abstract class RealtimeReporterEvent {`
`21`	`19`	`}`