Merge pull request #191 from Jimexist/feature/code-cleanup

some code cleanup
graphql-java · Aug 23, 2016 · e02f63f · e02f63f
2 parents 0ad210c + 9defb69
commit e02f63f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/graphql/relay/Base64.java b/src/main/java/graphql/relay/Base64.java
@@ -1,11 +1,15 @@
 package graphql.relay;
 
+import java.nio.charset.Charset;
 import javax.xml.bind.DatatypeConverter;
 import java.io.UnsupportedEncodingException;
 
 
 public class Base64 {
 
+    private Base64() {
+    }
+
     public static String toBase64(String string) {
         try {
             return DatatypeConverter.printBase64Binary(string.getBytes("utf-8"));
@@ -15,6 +19,6 @@ public static String toBase64(String string) {
     }
 
     public static String fromBase64(String string) {
-        return new String(DatatypeConverter.parseBase64Binary(string));
+        return new String(DatatypeConverter.parseBase64Binary(string), Charset.forName("UTF-8"));
     }
 }
diff --git a/src/main/java/graphql/relay/Relay.java b/src/main/java/graphql/relay/Relay.java
@@ -49,6 +49,7 @@ public GraphQLInterfaceType nodeInterface(TypeResolver typeResolver) {
                 .typeResolver(typeResolver)
                 .field(newFieldDefinition()
                         .name("id")
+                        .description("The ID of an object")
                         .type(new GraphQLNonNull(GraphQLID))
                         .build())
                 .build();
@@ -192,13 +193,30 @@ public GraphQLFieldDefinition mutationWithClientMutationId(String name, String f
     }
 
     public static class ResolvedGlobalId {
+
         public ResolvedGlobalId(String type, String id) {
             this.type = type;
             this.id = id;
         }
 
+        /**
+         * @deprecated use {@link #getType()}
+         */
+        @Deprecated
         public String type;
+        /**
+         * @deprecated use {@link #getId()}
+         */
+        @Deprecated
         public String id;
+
+        public String getType() {
+            return type;
+        }
+
+        public String getId() {
+            return id;
+        }
     }
 
     public String toGlobalId(String type, String id) {