[1/2] gora git commit: GORA-465 remove deprecated logic

2016-05-24 Thread lewismc 
Repository: gora
Updated Branches:
  refs/heads/master 9361023d6 -> c0c8c6135


GORA-465 remove deprecated logic


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/1ce9a887
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/1ce9a887
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/1ce9a887

Branch: refs/heads/master
Commit: 1ce9a887a93006180ea19b00b28473acde4c8b05
Parents: 8a71017
Author: cihad guzel 
Authored: Sun May 22 22:56:08 2016 +0300
Committer: cihad guzel 
Committed: Mon May 23 23:54:10 2016 +0300

--
 .../org/apache/gora/store/DataStoreFactory.java |  7 ---
 .../gora/store/ws/impl/WSDataStoreFactory.java  |  7 ---
 .../org/apache/gora/hbase/store/HBaseStore.java | 16 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/gora/blob/1ce9a887/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
--
diff --git 
a/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java 
b/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
index b0bc1d8..e892012 100644
--- a/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
+++ b/gora-core/src/main/java/org/apache/gora/store/DataStoreFactory.java
@@ -59,13 +59,6 @@ public class DataStoreFactory{
   public static final String SCHEMA_NAME = "schema.name";
 
   /**
-   * Do not use! Deprecated because it shares system wide state. 
-   * Use {@link #createProps()} instead.
-   */
-  @Deprecated()
-  public static final Properties properties = createProps();
-
-  /**
* Creates a new {@link Properties}. It adds the default gora configuration
* resources. This properties object can be modified and used to instantiate
* store instances. It is recommended to use a properties object for a single

http://git-wip-us.apache.org/repos/asf/gora/blob/1ce9a887/gora-core/src/main/java/org/apache/gora/store/ws/impl/WSDataStoreFactory.java
--
diff --git 
a/gora-core/src/main/java/org/apache/gora/store/ws/impl/WSDataStoreFactory.java 
b/gora-core/src/main/java/org/apache/gora/store/ws/impl/WSDataStoreFactory.java
index 35d1df0..8cebb26 100644
--- 
a/gora-core/src/main/java/org/apache/gora/store/ws/impl/WSDataStoreFactory.java
+++ 
b/gora-core/src/main/java/org/apache/gora/store/ws/impl/WSDataStoreFactory.java
@@ -56,13 +56,6 @@ public class WSDataStoreFactory{
   public static final String MAPPING_FILE = "mapping.file";
 
public static final String SCHEMA_NAME = "schema.name";
-
-  /**
-   * Do not use! Deprecated because it shares system wide state. 
-   * Use {@link #createProps()} instead.
-   */
-  @Deprecated()
-  public static final Properties properties = createProps();
   
   /**
* Creates a new {@link Properties}. It adds the default gora configuration

http://git-wip-us.apache.org/repos/asf/gora/blob/1ce9a887/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
--
diff --git 
a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java 
b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
index bb83ff2..f0dc9a6 100644
--- a/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
+++ b/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
@@ -83,8 +83,6 @@ implements Configurable {
 
   public static final String PARSE_MAPPING_FILE_KEY = 
"gora.hbase.mapping.file";
 
-  @Deprecated
-  private static final String DEPRECATED_MAPPING_FILE = "hbase-mapping.xml";
   public static final String DEFAULT_MAPPING_FILE = "gora-hbase-mapping.xml";
 
   private static final String SCANNER_CACHING_PROPERTIES_KEY = 
"scanner.caching" ;
@@ -116,18 +114,8 @@ implements Configurable {
   mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY, 
DEFAULT_MAPPING_FILE));
   filterUtil = new HBaseFilterUtil<>(this.conf);
 } catch (FileNotFoundException ex) {
-  try {
-mapping = readMapping(getConf().get(PARSE_MAPPING_FILE_KEY, 
DEPRECATED_MAPPING_FILE));
-LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the 
file to "
-+ DEFAULT_MAPPING_FILE);
-  } catch (FileNotFoundException ex1) {
-  LOG.error(ex1.getMessage(), ex1);
-  //throw (ex1); //throw the original exception
-  } catch (Exception ex1) {
-LOG.warn(DEPRECATED_MAPPING_FILE + " is deprecated, please rename the 
file to "
-+ DEFAULT_MAPPING_FILE);
-throw new RuntimeException(ex1);
-  } 
+  LOG.error("{}  is not found, please check the file.",

[2/2] gora git commit: Merge branch 'GORA-465' of https://github.com/cguzel/gora

2016-05-24 Thread lewismc 
Merge branch 'GORA-465' of https://github.com/cguzel/gora


Project: http://git-wip-us.apache.org/repos/asf/gora/repo
Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/c0c8c613
Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/c0c8c613
Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/c0c8c613

Branch: refs/heads/master
Commit: c0c8c6135021302e078e7e6387a95f90acd6763a
Parents: 9361023 1ce9a88
Author: Lewis John McGibbney 
Authored: Tue May 24 06:07:09 2016 -0700
Committer: Lewis John McGibbney 
Committed: Tue May 24 06:07:09 2016 -0700

--
 .../org/apache/gora/store/DataStoreFactory.java |  7 ---
 .../gora/store/ws/impl/WSDataStoreFactory.java  |  7 ---
 .../org/apache/gora/hbase/store/HBaseStore.java | 16 ++--
 3 files changed, 2 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/gora/blob/c0c8c613/gora-hbase/src/main/java/org/apache/gora/hbase/store/HBaseStore.java
--