[DMR-9] Unify ModelTypes.

jbossas · Jun 14, 2016 · 1d84f1a · 1d84f1a
1 parent edd5fed
commit 1d84f1a
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 48 deletions.
diff --git a/src/main/java/org/jboss/dmr/TypeModelValue.java b/src/main/java/org/jboss/dmr/TypeModelValue.java
@@ -172,7 +172,7 @@ public int hashCode() {
 
     @Override
     void write(final ModelWriter writer) throws IOException, ModelException {
-        writer.writeType(org.jboss.dmr.stream.ModelType.valueOf(value.toString()));
+        writer.writeType(value);
     }
 
 }
diff --git a/src/main/java/org/jboss/dmr/stream/JsonReaderImpl.java b/src/main/java/org/jboss/dmr/stream/JsonReaderImpl.java
@@ -55,6 +55,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */

diff --git a/src/main/java/org/jboss/dmr/stream/JsonWriterImpl.java b/src/main/java/org/jboss/dmr/stream/JsonWriterImpl.java
@@ -56,6 +56,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */

diff --git a/src/main/java/org/jboss/dmr/stream/ModelReader.java b/src/main/java/org/jboss/dmr/stream/ModelReader.java
@@ -24,6 +24,8 @@
 
 import java.io.IOException;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * DMR reader. Instances of this interface are not thread safe.
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>

diff --git a/src/main/java/org/jboss/dmr/stream/ModelReaderImpl.java b/src/main/java/org/jboss/dmr/stream/ModelReaderImpl.java
@@ -51,6 +51,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */

diff --git a/src/main/java/org/jboss/dmr/stream/ModelType.java b/src/main/java/org/jboss/dmr/stream/ModelType.java
diff --git a/src/main/java/org/jboss/dmr/stream/ModelWriter.java b/src/main/java/org/jboss/dmr/stream/ModelWriter.java
@@ -27,6 +27,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * DMR writer. Instances of this interface are not thread safe.
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>

diff --git a/src/main/java/org/jboss/dmr/stream/ModelWriterImpl.java b/src/main/java/org/jboss/dmr/stream/ModelWriterImpl.java
@@ -54,6 +54,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */

diff --git a/src/test/java/org/jboss/dmr/stream/AbstractModelStreamsTestCase.java b/src/test/java/org/jboss/dmr/stream/AbstractModelStreamsTestCase.java
@@ -44,6 +44,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
+
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>
  */

diff --git a/src/test/java/org/jboss/dmr/stream/InvalidJsonReaderTestCase.java b/src/test/java/org/jboss/dmr/stream/InvalidJsonReaderTestCase.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 /**
@@ -2672,7 +2673,7 @@ private void read_brokenExpressionString_unexpectedEOF() throws IOException, Mod
     private void read_brokenType_unexpectedChar() throws IOException, ModelException {
         final ModelReader reader = getModelReader( "{\"TYPE_MODEL_VALUE\":\"ObJECT\"}" );
         assertInitialState( reader );
-        assertModelException( reader, "No enum constant org.jboss.dmr.stream.ModelType.ObJECT" );
+        assertModelException( reader, "No enum constant org.jboss.dmr.ModelType.ObJECT" );
         assertFinalState( reader );
         reader.close();
     }

diff --git a/src/test/java/org/jboss/dmr/stream/InvalidJsonWriterTestCase.java b/src/test/java/org/jboss/dmr/stream/InvalidJsonWriterTestCase.java
@@ -22,6 +22,7 @@
 
 package org.jboss.dmr.stream;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;

diff --git a/src/test/java/org/jboss/dmr/stream/InvalidModelReaderTestCase.java b/src/test/java/org/jboss/dmr/stream/InvalidModelReaderTestCase.java
@@ -27,6 +27,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 /**

diff --git a/src/test/java/org/jboss/dmr/stream/InvalidModelWriterTestCase.java b/src/test/java/org/jboss/dmr/stream/InvalidModelWriterTestCase.java
@@ -30,6 +30,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 /**

diff --git a/src/test/java/org/jboss/dmr/stream/ValidJsonReaderTestCase.java b/src/test/java/org/jboss/dmr/stream/ValidJsonReaderTestCase.java
@@ -22,6 +22,7 @@
 
 package org.jboss.dmr.stream;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;

diff --git a/src/test/java/org/jboss/dmr/stream/ValidJsonWriterTestCase.java b/src/test/java/org/jboss/dmr/stream/ValidJsonWriterTestCase.java
@@ -32,7 +32,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
-import static org.jboss.dmr.stream.ModelType.*;
+import static org.jboss.dmr.ModelType.*;
 
 /**
  * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a>

diff --git a/src/test/java/org/jboss/dmr/stream/ValidModelReaderTestCase.java b/src/test/java/org/jboss/dmr/stream/ValidModelReaderTestCase.java
@@ -27,6 +27,7 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import org.jboss.dmr.ModelType;
 import org.junit.Test;
 
 /**

diff --git a/src/test/java/org/jboss/dmr/stream/ValidModelWriterTestCase.java b/src/test/java/org/jboss/dmr/stream/ValidModelWriterTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.dmr.stream;
 
-import static org.jboss.dmr.stream.ModelType.*;
+import static org.jboss.dmr.ModelType.*;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;