From c8550d3558d1a438b64409bcbac94f072c191d23 Mon Sep 17 00:00:00 2001
From: Furkan KAMACI <furkankamaci@gmail.com>
Date: Thu, 3 Sep 2015 22:19:03 +0300
Subject: [PATCH 1/2] Non-final public static fields can be changed by external
 classes (by a malicious code or accidentally).

---
 .../src/main/java/org/apache/gora/solr/store/SolrStore.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
index f89762c60..184b2c63a 100644
--- a/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
+++ b/gora-solr/src/main/java/org/apache/gora/solr/store/SolrStore.java
@@ -165,7 +165,7 @@ public class SolrStore<K, T extends PersistentBase> extends DataStoreBase<K, T>
    * Default schema index with value "0" used when AVRO Union data types are
    * stored
    */
-  public static int DEFAULT_UNION_SCHEMA = 0;
+  public static final int DEFAULT_UNION_SCHEMA = 0;
 
   /*
    * Create a threadlocal map for the datum readers and writers, because they

From 4086ece8cd2f9cd7a29bf46a1d290313c4e44d14 Mon Sep 17 00:00:00 2001
From: Furkan KAMACI <furkankamaci@gmail.com>
Date: Thu, 3 Sep 2015 22:51:57 +0300
Subject: [PATCH 2/2] Non-final public static fields can be changed by external
 classes (by a malicious code or accidentally).

---
 .../java/org/apache/gora/cassandra/store/CassandraStore.java  | 4 ++--
 .../src/main/java/org/apache/gora/compiler/GoraCompiler.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
index dc4cf065c..0c9816224 100644
--- a/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
+++ b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java
@@ -96,12 +96,12 @@ public class CassandraStore<K, T extends PersistentBase> extends DataStoreBase<K
    * Fixed string with value "UnionIndex" used to generate an extra column based on 
    * the original field's name
    */
-  public static String UNION_COL_SUFIX = "_UnionIndex";
+  public static final String UNION_COL_SUFIX = "_UnionIndex";
 
   /**
    * Default schema index with value "0" used when AVRO Union data types are stored
    */
-  public static int DEFAULT_UNION_SCHEMA = 0;
+  public static final int DEFAULT_UNION_SCHEMA = 0;
 
   /**
    * The values are Avro fields pending to be stored.
diff --git a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
index f0a04f429..3b9846fc1 100644
--- a/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
+++ b/gora-compiler/src/main/java/org/apache/gora/compiler/GoraCompiler.java
@@ -36,7 +36,7 @@
 
 public class GoraCompiler extends SpecificCompiler {
 
-  public static String DIRTY_BYTES_FIELD_NAME = "__g__dirty";
+  public static final String DIRTY_BYTES_FIELD_NAME = "__g__dirty";
   public static final int FIRST_UNMANAGED_FIELD_INDEX = 1;
 
   private static final Set<String> GORA_RESERVED_NAMES = new HashSet<String>();