Merge pull request #50 from DevFactory/release/constants-should-comply-with-naming-conventions-fix-1

Code quality fix - Constant names should comply with a naming convention.

Author: joshsh

common/src/main/java/net/fortytwo/sesametools/RandomValueFactory.java

@@ -26,15 +26,15 @@ public class RandomValueFactory {
     private static final String[] languages = {"en", "fr", "de"};
 
     private enum ValueType {
-        Uri, /*Bnode,*/ Literal
+        URI, /*Bnode,*/ LITERAL
     }
 
     private enum LiteralKind {
-        Plain, WithLanguage, Typed
+        PLAIN, WITH_LANGUAGE, TYPED
     }
 
     private enum LiteralType {
-        String, Int, Double
+        STRING, INT, DOUBLE
     }
 
     private ValueFactory valueFactory;
@@ -59,7 +59,7 @@ public Resource randomResource() {
         ValueType type;
         do {
             type = randomValueType();
-        } while (ValueType.Literal == type);
+        } while (ValueType.LITERAL == type);
         return (Resource) randomValue(type);
     }
 
@@ -81,13 +81,13 @@ public Literal randomLiteral() {
         Literal l = null;
 
         switch (kind) {
-            case Plain:
+            case PLAIN:
                 l = valueFactory.createLiteral(randomStringLabel());
                 break;
-            case WithLanguage:
+            case WITH_LANGUAGE:
                 l = valueFactory.createLiteral(randomStringLabel(), randomLanguage());
                 break;
-            case Typed:
+            case TYPED:
                 l = randomTypedLiteral();
                 break;
         }
@@ -100,13 +100,13 @@ public Literal randomTypedLiteral() {
         Literal l = null;
 
         switch (type) {
-            case Int:
+            case INT:
                 l = valueFactory.createLiteral(rand.nextInt(MAXINT));
                 break;
-            case Double:
+            case DOUBLE:
                 l = valueFactory.createLiteral(rand.nextDouble());
                 break;
-            case String:
+            case STRING:
                 l = valueFactory.createLiteral(randomStringLabel(), XMLSchema.STRING);
                 break;
         }
@@ -121,13 +121,13 @@ private ValueType randomValueType() {
     private Value randomValue(final ValueType type) {
         Value v = null;
         switch (type) {
-            case Uri:
+            case URI:
                 v = randomIRI();
                 break;
             //case Bnode:
             //    v = randomBNode();
             //    break;
-            case Literal:
+            case LITERAL:
                 v = randomLiteral();
                 break;
         }

linked-data-server/src/main/java/net/fortytwo/sesametools/ldserver/WebResource.java

@@ -42,7 +42,7 @@ public class WebResource extends ServerResource {
     private static final Logger logger = Logger.getLogger(WebResource.class.getName());
 
     enum WebResourceCategory {
-        InformationResource, NonInformationResource
+        INFORMATION_RESOURCE, NON_INFORMATION_RESOURCE
     }
 
     protected String selfURI;
@@ -91,10 +91,10 @@ public Representation get(final Variant variant) {
         }
 
         if (!format.isPresent()) {
-            webResourceCategory = WebResourceCategory.NonInformationResource;
+            webResourceCategory = WebResourceCategory.NON_INFORMATION_RESOURCE;
             getVariants().addAll(RDFMediaTypes.getRDFVariants());
         } else {
-            webResourceCategory = WebResourceCategory.InformationResource;
+            webResourceCategory = WebResourceCategory.INFORMATION_RESOURCE;
             getVariants().add(RDFMediaTypes.findVariant(format.get()));
 
             hostIdentifier = this.getRequest().getResourceRef().getHostIdentifier();
@@ -108,9 +108,9 @@ public Representation get(final Variant variant) {
         MediaType type = variant.getMediaType();
 
         switch (webResourceCategory) {
-            case InformationResource:
+            case INFORMATION_RESOURCE:
                 return representInformationResource();
-            case NonInformationResource:
+            case NON_INFORMATION_RESOURCE:
                 return representNonInformationResource(type);
             default:
                 throw new IllegalStateException("no such resource type: " + webResourceCategory);