You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/10/30 04:57:23 UTC
git commit: Conform to code styles.
Updated Branches:
refs/heads/master 0e76d85fe -> 84514daa1
Conform to code styles.
Signed-off-by: Chandan V A <ch...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/84514daa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/84514daa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/84514daa
Branch: refs/heads/master
Commit: 84514daa16099d9a6dac1f96bee113eb669ff746
Parents: 0e76d85
Author: Chandan V A <ch...@sap.com>
Authored: Wed Oct 30 09:26:26 2013 +0530
Committer: Chandan V A <ch...@sap.com>
Committed: Wed Oct 30 09:26:26 2013 +0530
----------------------------------------------------------------------
.../olingo/odata2/processor/api/jpa/ODataJPAContext.java | 8 ++++----
.../odata2/processor/api/jpa/model/JPAEdmBaseView.java | 4 ++--
.../core/jpa/jpql/JPQLJoinStatementBuilderTest.java | 4 ++--
.../odata2/jpa/processor/ref/util/DataGenerator.java | 10 +++++-----
4 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/84514daa/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java b/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
index ae8b555..9974434 100644
--- a/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
+++ b/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
@@ -176,28 +176,28 @@ public interface ODataJPAContext {
public JPAEdmExtension getJPAEdmExtension();
/**
- * The method sets into the context whether the library should consider default naming for
+ * The method sets into the context whether the library should consider default naming for
* <ul><li>EdmProperty</li>
* <li>EdmComplexProperty</li>
* <li>EdmNavigationProperty</li></ul>
*
* @param defaultNaming is a boolean value that indicates if set to
* <ul><li>true - default naming is considered in case no mapping is provided.</li>
- * <li>false - default naming is not considered in case no mapping is provided. The
+ * <li>false - default naming is not considered in case no mapping is provided. The
* name provided in JPA Entity Model is considered.</li>
* </ul>
*/
public void setDefaultNaming(boolean defaultNaming);
/**
- * The method returns whether the library should consider default naming for
+ * The method returns whether the library should consider default naming for
* <ul><li>EdmProperty</li>
* <li>EdmComplexProperty</li>
* <li>EdmNavigationProperty</li></ul>
*
* @return
* <ul><li>true - default naming is considered in case no mapping is provided.</li>
- * <li>false - default naming is not considered in case no mapping is provided. The
+ * <li>false - default naming is not considered in case no mapping is provided. The
* name provided in JPA Entity Model is considered.</li>
* </ul>
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/84514daa/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java b/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
index e6987b1..765da7f 100644
--- a/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
+++ b/odata2-processor-jpa/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
@@ -94,8 +94,8 @@ public interface JPAEdmBaseView {
* current view.
*
* @return <ul><li>true - skip default naming logic</li>
- * <li>false - do not skip default naming logic</li>
- * </ul>
+ * <li>false - do not skip default naming logic</li>
+ * </ul>
*/
public boolean isDefaultNamingSkipped();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/84514daa/odata2-processor-jpa/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java b/odata2-processor-jpa/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
index 0097b57..dad45e3 100644
--- a/odata2-processor-jpa/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
+++ b/odata2-processor-jpa/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
@@ -87,8 +87,8 @@ public class JPQLJoinStatementBuilderTest {
assertEquals(
"SELECT mat FROM SOHeader soh JOIN soh.soItem soi JOIN soi.material mat WHERE soh.buyerId = 2 AND "
+
- "soh.createdBy = 'Peter' AND soi.shId = soh.soId AND mat.id = 'abc' "
- +
+ "soh.createdBy = 'Peter' AND soi.shId = soh.soId AND mat.id = 'abc' "
+ +
"ORDER BY mat.buyerId asc , mat.city desc",
jpqlStatement.toString());
} catch (ODataJPARuntimeException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/84514daa/odata2-processor-jpa/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
----------------------------------------------------------------------
diff --git a/odata2-processor-jpa/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java b/odata2-processor-jpa/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
index 335dca1..55eb876 100644
--- a/odata2-processor-jpa/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
+++ b/odata2-processor-jpa/jpa-web/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/util/DataGenerator.java
@@ -36,7 +36,7 @@ import org.eclipse.persistence.sessions.Session;
/**
* This is a utility class for generating and cleaning data. The generated data would be used by the application.
*
- *
+ *
*/
public class DataGenerator {
@@ -67,14 +67,14 @@ public class DataGenerator {
*/
public void generate() {
String[] resourceSQLPropFileNames = getSQLInsertFileNames();
- if (resourceSQLPropFileNames.length > 0) { //If configuration is proper with at least one file
+ if (resourceSQLPropFileNames.length > 0) { // If configuration is proper with at least one file
Session session = ((EntityManagerImpl) entityManager).getActiveSession();
ResourceBundle[] resourceBundleArr = new ResourceBundle[resourceSQLPropFileNames.length];
entityManager.getTransaction().begin();
- for (int i = 0; i < resourceSQLPropFileNames.length; i++) { //For each Entity SQL property file,
+ for (int i = 0; i < resourceSQLPropFileNames.length; i++) { // For each Entity SQL property file,
System.out.println("Reading from File - " + resourceSQLPropFileNames[i]);
- resourceBundleArr[i] = ResourceBundle.getBundle(resourceSQLPropFileNames[i]);//Get SQL statements as properties
+ resourceBundleArr[i] = ResourceBundle.getBundle(resourceSQLPropFileNames[i]);// Get SQL statements as properties
Set<String> keySet = resourceBundleArr[i].keySet();
@@ -138,7 +138,7 @@ public class DataGenerator {
public void clean() {
// Delete using SQLs
String[] deleteStatements = getSQLDeleteStatements();
- if (deleteStatements.length > 0) { //If configuration is proper with at least one delete Statements
+ if (deleteStatements.length > 0) { // If configuration is proper with at least one delete Statements
Session session = ((EntityManagerImpl) entityManager).getActiveSession();
entityManager.getTransaction().begin();
for (String deleteStatement : deleteStatements) {