Roy Golan has uploaded a new change for review.
Change subject: core: remove expensive use of ObjectDescriptor.toString
......................................................................
core: remove expensive use of ObjectDescriptor.toString
Change-Id: Id0bb51579a9af1f76248cb1152e29ad7cb82d8a0
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
D
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectDescriptor.java
D
backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectDescriptorTest.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusOnlyReturnForXmlRpc.java
5 files changed, 14 insertions(+), 119 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/10356/1
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectDescriptor.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectDescriptor.java
deleted file mode 100644
index e9c09b3..0000000
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ObjectDescriptor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.ovirt.engine.core.utils;
-
-import java.util.List;
-
-import org.ovirt.engine.core.compat.backendcompat.PropertyInfo;
-import org.ovirt.engine.core.compat.backendcompat.TypeCompat;
-
-public final class ObjectDescriptor {
- public static String toString(Object obj) {
- Class type = obj.getClass();
- List<PropertyInfo> properties = TypeCompat.GetProperties(type);
- StringBuilder builder = new StringBuilder(String.format("Class Name:
%1$s", type.getName()));
- builder.append("\n");
- for (PropertyInfo property : properties) {
- String propertyName = property.getName();
- Object objValue = property.GetValue(obj, null);
- String strObjectValue;
- if (objValue != null) {
- if (!(objValue instanceof String) && !(objValue instanceof
java.util.Map)
- && objValue instanceof Iterable) {
- StringBuilder tempBuilder = new StringBuilder();
- for (Object o : (Iterable) objValue) {
- tempBuilder.append(o.toString());
- tempBuilder.append("\n");
- }
- strObjectValue = tempBuilder.toString();
- } else {
- strObjectValue = objValue.toString();
- }
- } else {
- strObjectValue = "Null";
- }
- builder.append(String.format("%1$-30s%2$s", propertyName,
strObjectValue));
- builder.append("\n");
- }
- java.lang.reflect.Field[] fields = type.getFields();
- for (java.lang.reflect.Field field : fields) {
- String propertyName = field.getName();
- String strObjectValue;
-
- try {
- field.get(null);
- continue; // ignore static fields
- } catch (IllegalAccessException e) {
- } catch (NullPointerException e) {
- }
-
- Object objValue = null;
- try {
- objValue = field.get(obj);
- } catch (IllegalAccessException e) {
- }
-
- if (objValue != null) {
- if (!(objValue instanceof String) && !(objValue instanceof
java.util.Map)
- && objValue instanceof Iterable) {
- StringBuilder tempBuilder = new StringBuilder();
- for (Object o : (Iterable) objValue) {
- tempBuilder.append(o.toString());
- tempBuilder.append("\n");
- }
- strObjectValue = tempBuilder.toString();
- } else {
- strObjectValue = objValue.toString();
- }
- } else {
- strObjectValue = "Null";
- }
- builder.append(String.format("%1$-30s%2$s", propertyName,
strObjectValue));
- builder.append("\n");
- }
- return builder.toString();
- }
-
-}
diff --git
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectDescriptorTest.java
b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectDescriptorTest.java
deleted file mode 100644
index 98a5bc3..0000000
---
a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectDescriptorTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.ovirt.engine.core.utils;
-
-import junit.framework.TestCase;
-
-public class ObjectDescriptorTest extends TestCase {
- public void testIt() {
- Jedi jedi = new Jedi();
- String desc = ObjectDescriptor.toString(jedi);
- System.out.println(desc);
- assertTrue("Anakin", desc.contains("Anakin"));
- assertTrue("name", desc.contains("name"));
- assertTrue("Blue", desc.contains("Blue"));
- assertTrue("saberColor", desc.contains("saberColor"));
- assertTrue("Class", desc.contains("Class"));
- assertTrue("org.ovirt.engine.core.utils.Jedi",
desc.contains("org.ovirt.engine.core.utils.Jedi"));
- }
-}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java
index 4b1d297..7dd7605 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java
@@ -2,27 +2,21 @@
import java.util.Map;
-import org.ovirt.engine.core.utils.ObjectDescriptor;
import org.ovirt.engine.core.vdsbroker.vdsbroker.*;
-
-//-----------------------------------------------------
-//
-//-----------------------------------------------------
public class StatusReturnForXmlRpc {
private static final String STATUS = "status";
- // [XmlRpcMember("status")]
public StatusForXmlRpc mStatus;
-
- @Override
- public String toString() {
- return ObjectDescriptor.toString(this);
- }
public StatusReturnForXmlRpc(Map<String, Object> innerMap) {
Map<String, Object> statusMap = (Map<String, Object>)
innerMap.get(STATUS);
mStatus = new StatusForXmlRpc(statusMap);
}
+ @Override
+ public String toString() {
+ return "StatusReturnForXmlRpc [mStatus=" + mStatus + "]";
+ }
+
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java
index 2c67192..4b4f431 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusForXmlRpc.java
@@ -2,22 +2,13 @@
import java.util.Map;
-import org.ovirt.engine.core.utils.ObjectDescriptor;
-
public class StatusForXmlRpc {
private static final String CODE = "code";
private static final String MESSAGE = "message";
- // [XmlRpcMember("code")]
public int mCode;
- // [XmlRpcMember("message")]
public String mMessage;
-
- @Override
- public String toString() {
- return ObjectDescriptor.toString(this);
- }
public StatusForXmlRpc(Map<String, Object> innerMap) {
mCode = (Integer) innerMap.get(CODE);
@@ -28,4 +19,8 @@
public StatusForXmlRpc() {
}
+ @Override
+ public String toString() {
+ return "StatusForXmlRpc [mCode=" + mCode + ", mMessage=" + mMessage +
"]";
+ }
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusOnlyReturnForXmlRpc.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusOnlyReturnForXmlRpc.java
index 70e392e..e44e915 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusOnlyReturnForXmlRpc.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/StatusOnlyReturnForXmlRpc.java
@@ -1,23 +1,21 @@
package org.ovirt.engine.core.vdsbroker.vdsbroker;
import java.util.Map;
-import org.ovirt.engine.core.utils.ObjectDescriptor;
public final class StatusOnlyReturnForXmlRpc {
private static final String STATUS = "status";
- // [XmlRpcMember("status")]
public StatusForXmlRpc mStatus;
-
- @Override
- public String toString() {
- return ObjectDescriptor.toString(this);
- }
public StatusOnlyReturnForXmlRpc(Map<String, Object> innerMap) {
Map<String, Object> statusMap = (Map<String, Object>)
innerMap.get(STATUS);
mStatus = new StatusForXmlRpc(statusMap);
}
+ @Override
+ public String toString() {
+ return "StatusOnlyReturnForXmlRpc [mStatus" + mStatus + "]";
+ }
+
}
--
To view, visit http://gerrit.ovirt.org/10356
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0bb51579a9af1f76248cb1152e29ad7cb82d8a0
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
