From 006e41b8863ad297206f50cbdb52803bd14b8d74 Mon Sep 17 00:00:00 2001 From: Karun Japhet Date: Tue, 2 Oct 2018 21:04:42 +0530 Subject: [PATCH 1/5] Remove ignored git files --- .gitignore | 1 + .idea/compiler.xml | 32 - .idea/copyright/profiles_settings.xml | 3 - .idea/encodings.xml | 6 - .../Maven__aopalliance_aopalliance_1_0.xml | 13 - ...Maven__com_google_code_gson_gson_2_2_4.xml | 13 - .idea/libraries/Maven__junit_junit_4_11.xml | 13 - .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 - .../Maven__org_json_json_20141113.xml | 13 - ...ringframework_spring_aop_4_0_3_RELEASE.xml | 13 - ...ngframework_spring_beans_4_0_3_RELEASE.xml | 13 - ...framework_spring_context_4_0_3_RELEASE.xml | 13 - ...ingframework_spring_core_4_0_3_RELEASE.xml | 13 - ...mework_spring_expression_4_0_3_RELEASE.xml | 13 - .../com_google_code_gson_gson_2_7.xml | 17 - .../db_java_adapter_1_2_6_SNAPSHOT.xml | 9 - .idea/misc.xml | 16 - .idea/modules.xml | 8 - .idea/uiDesigner.xml | 124 -- .idea/vcs.xml | 6 - .idea/workspace.xml | 1367 ----------------- src/main/main.iml | 11 - src/test/test.iml | 13 - 23 files changed, 1 insertion(+), 1742 deletions(-) delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/libraries/Maven__aopalliance_aopalliance_1_0.xml delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_11.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml delete mode 100644 .idea/libraries/Maven__org_json_json_20141113.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_aop_4_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_beans_4_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_context_4_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_core_4_0_3_RELEASE.xml delete mode 100644 .idea/libraries/Maven__org_springframework_spring_expression_4_0_3_RELEASE.xml delete mode 100644 .idea/libraries/com_google_code_gson_gson_2_7.xml delete mode 100644 .idea/libraries/db_java_adapter_1_2_6_SNAPSHOT.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml delete mode 100644 src/main/main.iml delete mode 100644 src/test/test.iml diff --git a/.gitignore b/.gitignore index 7fd7c94..12dad17 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ out *.class target .idea/* +**/*.iml \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index a9627eb..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index b26911b..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml deleted file mode 100644 index 30ff5cb..0000000 --- a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml deleted file mode 100644 index 4533c1b..0000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml deleted file mode 100644 index f33320d..0000000 --- a/.idea/libraries/Maven__junit_junit_4_11.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml deleted file mode 100644 index f58bbc1..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20141113.xml b/.idea/libraries/Maven__org_json_json_20141113.xml deleted file mode 100644 index 2f486e7..0000000 --- a/.idea/libraries/Maven__org_json_json_20141113.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_aop_4_0_3_RELEASE.xml deleted file mode 100644 index 6e0ca63..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_aop_4_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_beans_4_0_3_RELEASE.xml deleted file mode 100644 index dd8716d..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_beans_4_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_context_4_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_context_4_0_3_RELEASE.xml deleted file mode 100644 index 1da9035..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_context_4_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_core_4_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_core_4_0_3_RELEASE.xml deleted file mode 100644 index 6f49868..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_core_4_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_3_RELEASE.xml b/.idea/libraries/Maven__org_springframework_spring_expression_4_0_3_RELEASE.xml deleted file mode 100644 index d345067..0000000 --- a/.idea/libraries/Maven__org_springframework_spring_expression_4_0_3_RELEASE.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_google_code_gson_gson_2_7.xml b/.idea/libraries/com_google_code_gson_gson_2_7.xml deleted file mode 100644 index 6fef64f..0000000 --- a/.idea/libraries/com_google_code_gson_gson_2_7.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/db_java_adapter_1_2_6_SNAPSHOT.xml b/.idea/libraries/db_java_adapter_1_2_6_SNAPSHOT.xml deleted file mode 100644 index 98177a5..0000000 --- a/.idea/libraries/db_java_adapter_1_2_6_SNAPSHOT.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1388665..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f805504..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 3c2eea9..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1367 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - truncateDs - searchAsJson - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1469985747443 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - file://$PROJECT_DIR$/src/test/java/com/blobcity/db/test/integration/data/TextDataInsertIT.java - 25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - db-java-adapter - - - - - - - - 1.8 - - - - - - - - com.google.code.gson:gson:2.7 - - - - - - - - \ No newline at end of file diff --git a/src/main/main.iml b/src/main/main.iml deleted file mode 100644 index 908ad4f..0000000 --- a/src/main/main.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/test.iml b/src/test/test.iml deleted file mode 100644 index a4a50ef..0000000 --- a/src/test/test.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file From 162ebefa367b8a11d408cd70d78cc9d7bb0f3cfe Mon Sep 17 00:00:00 2001 From: Karun Japhet Date: Tue, 2 Oct 2018 21:06:03 +0530 Subject: [PATCH 2/5] Add editorconfig --- .editorconfig | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..0a51807 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,7 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +indent_style = space +indent_size = 2 \ No newline at end of file From 8e8c150a0e1c094fead282bf5522037212b53442 Mon Sep 17 00:00:00 2001 From: Karun Japhet Date: Tue, 2 Oct 2018 21:07:02 +0530 Subject: [PATCH 3/5] Applying formatting changes from editorConfig --- docs/_includes/archive.html | 2 +- .../custom/getting_started_series.html | 37 +- .../custom/getting_started_series_next.html | 21 +- docs/_includes/custom/series_acme.html | 37 +- docs/_includes/custom/series_acme_next.html | 18 +- docs/_includes/custom/sidebarconfigs.html | 1 - docs/_includes/custom/usermap.html | 31 +- docs/_includes/custom/usermapcomplex.html | 164 +- docs/_includes/disqus.html | 12 +- docs/_includes/feedback.html | 5 +- docs/_includes/footer.html | 15 +- docs/_includes/google_analytics.html | 6 +- docs/_includes/head.html | 24 +- docs/_includes/head_print.html | 8 +- docs/_includes/image.html | 7 +- docs/_includes/important.html | 4 +- docs/_includes/initialize_shuffle.html | 14 +- docs/_includes/inline_image.html | 2 +- docs/_includes/note.html | 4 +- docs/_includes/sidebar.html | 92 +- docs/_includes/taglogic.html | 65 +- docs/_includes/tip.html | 4 +- docs/_includes/toc.html | 2 +- docs/_includes/topnav.html | 124 +- docs/_includes/warning.html | 4 +- docs/_layouts/default.html | 51 +- docs/_layouts/default_print.html | 14 +- docs/_layouts/page.html | 57 +- docs/_layouts/page_print.html | 10 +- docs/_layouts/post.html | 54 +- docs/css/customstyles.css | 1154 +++--- docs/css/fonts/fontawesome-webfont.svg | 1646 ++++++--- docs/css/lavish-bootstrap.css | 1294 ++++++- docs/css/modern-business.css | 66 +- docs/css/printstyles.css | 216 +- docs/css/syntax.css | 374 +- docs/css/theme-blue.css | 106 +- docs/css/theme-green.css | 104 +- docs/feed.xml | 58 +- docs/fonts/fontawesome-webfont.svg | 1514 +++++--- docs/fonts/glyphicons-halflings-regular.svg | 825 +++-- docs/images/helpapi.svg | 2 +- docs/js/mydoc_scroll.html | 364 +- docs/pages/mydoc/mydoc_scroll.html | 354 +- docs/pages/mydoc/mydoc_shuffle.html | 247 +- docs/pages/news/news.html | 22 +- docs/pages/news/news_archive.html | 41 +- docs/pages/product1/p1_landing_page.html | 374 +- docs/pages/product2/p2_landing_page.html | 374 +- docs/pdfconfigs/titlepage.html | 26 +- docs/pdfconfigs/tocpage.html | 58 +- docs/search.json | 9 +- docs/sitemap.xml | 10 +- docs/tooltips.html | 39 +- docs/tooltips.json | 11 +- pom.xml | 451 +-- .../java/com/blobcity/db/CollectionStore.java | 195 +- src/main/java/com/blobcity/db/Db.java | 3248 +++++++++-------- .../java/com/blobcity/db/DbQueryRequest.java | 45 +- .../java/com/blobcity/db/DbQueryResponse.java | 127 +- .../java/com/blobcity/db/QueryConstants.java | 34 +- .../java/com/blobcity/db/QueryExecuter.java | 125 +- src/main/java/com/blobcity/db/QueryType.java | 91 +- .../com/blobcity/db/annotations/Column.java | 2 +- .../com/blobcity/db/annotations/Entity.java | 7 +- .../com/blobcity/db/annotations/Primary.java | 1 - .../com/blobcity/db/config/Credentials.java | 134 +- .../com/blobcity/db/enums/AutoDefineType.java | 21 +- .../com/blobcity/db/enums/CollectionType.java | 23 +- .../com/blobcity/db/enums/ColumnType.java | 101 +- .../java/com/blobcity/db/enums/IndexType.java | 29 +- .../blobcity/db/enums/ReplicationType.java | 27 +- .../db/exceptions/DbOperationException.java | 40 +- .../exceptions/InternalAdapterException.java | 29 +- .../db/exceptions/InternalDbException.java | 30 +- .../com/blobcity/db/search/ArrayJsonable.java | 2 +- .../java/com/blobcity/db/search/Jsonable.java | 18 +- .../blobcity/db/search/ObjectJsonable.java | 2 +- .../java/com/blobcity/db/search/Order.java | 2 +- .../com/blobcity/db/search/OrderElement.java | 94 +- .../com/blobcity/db/search/ParamOperator.java | 96 +- .../java/com/blobcity/db/search/Query.java | 523 ++- .../blobcity/db/search/SearchOperator.java | 16 +- .../com/blobcity/db/search/SearchParam.java | 676 ++-- .../java/com/blobcity/db/search/Sqlable.java | 32 +- .../com/blobcity/db/search/StringUtil.java | 168 +- .../java/com/blobcity/db/update/Update.java | 18 +- .../com/blobcity/db/entity/TestTable.java | 31 +- .../integration/data/EntityDataInsertIT.java | 75 +- .../integration/data/EntityDataSaveIT.java | 81 +- .../integration/data/JSONDataInsertIT.java | 90 +- .../integration/data/TextDataInsertIT.java | 69 +- .../db/test/integration/data/User.java | 42 +- .../integration/data/XMLDataInsertIT.java | 57 +- .../DatastoreAndCollectionOperationsIT.java | 738 ++-- .../schema/DsAndCollectionExistsIT.java | 92 +- .../ListDatastoresAndCollectionsIT.java | 118 +- .../schema/TruncateDsAndCollectionIT.java | 56 +- src/test/java/demo/DemoMain.java | 48 +- src/test/java/demo/Person.java | 58 +- 100 files changed, 10712 insertions(+), 7427 deletions(-) diff --git a/docs/_includes/archive.html b/docs/_includes/archive.html index 275850c..b0f4005 100755 --- a/docs/_includes/archive.html +++ b/docs/_includes/archive.html @@ -8,7 +8,7 @@

{{ page.title }}

-{{ content }} + {{ content }}
diff --git a/docs/_includes/custom/getting_started_series.html b/docs/_includes/custom/getting_started_series.html index fef578b..f72cd25 100755 --- a/docs/_includes/custom/getting_started_series.html +++ b/docs/_includes/custom/getting_started_series.html @@ -1,19 +1,20 @@
-
- - -
-
\ No newline at end of file +
+ + +
+ diff --git a/docs/_includes/custom/getting_started_series_next.html b/docs/_includes/custom/getting_started_series_next.html index 247e0cb..03afd89 100755 --- a/docs/_includes/custom/getting_started_series_next.html +++ b/docs/_includes/custom/getting_started_series_next.html @@ -1,11 +1,12 @@ -

{% assign series_pages = site.tags.series_acme %} - {% for p in pages %} - {% if p.series == "Getting Started" %} - {% assign nextTopic = page.weight | plus: "1" %} - {% if p.weight == nextTopic %} - - {% endif %} - {% endif %} - {% endfor %} -

\ No newline at end of file + {% for p in pages %} + {% if p.series == "Getting Started" %} + {% assign nextTopic = page.weight | plus: "1" %} + {% if p.weight == nextTopic %} + + + + {% endif %} + {% endif %} + {% endfor %} +

diff --git a/docs/_includes/custom/series_acme.html b/docs/_includes/custom/series_acme.html index adeb76f..0dd363d 100755 --- a/docs/_includes/custom/series_acme.html +++ b/docs/_includes/custom/series_acme.html @@ -1,19 +1,20 @@
-
- - -
-
\ No newline at end of file +
+ + +
+ diff --git a/docs/_includes/custom/series_acme_next.html b/docs/_includes/custom/series_acme_next.html index abd345b..8cd7716 100755 --- a/docs/_includes/custom/series_acme_next.html +++ b/docs/_includes/custom/series_acme_next.html @@ -1,10 +1,12 @@

{% assign series_pages = site.tags.series_acme %} - {% for p in pages %} - {% if p.series == "ACME series" %} - {% assign nextTopic = page.weight | plus: "1" %} - {% if p.weight == nextTopic %} - - {% endif %} - {% endif %} - {% endfor %} + {% for p in pages %} + {% if p.series == "ACME series" %} + {% assign nextTopic = page.weight | plus: "1" %} + {% if p.weight == nextTopic %} + + + + {% endif %} + {% endif %} + {% endfor %}

diff --git a/docs/_includes/custom/sidebarconfigs.html b/docs/_includes/custom/sidebarconfigs.html index 36167ad..eb23050 100755 --- a/docs/_includes/custom/sidebarconfigs.html +++ b/docs/_includes/custom/sidebarconfigs.html @@ -15,7 +15,6 @@ {% endif %} - {% comment %} sidebar configuration for print files {% endcomment %} diff --git a/docs/_includes/custom/usermap.html b/docs/_includes/custom/usermap.html index f90b5c2..cd183ff 100755 --- a/docs/_includes/custom/usermap.html +++ b/docs/_includes/custom/usermap.html @@ -1,14 +1,23 @@ - diff --git a/docs/_includes/custom/usermapcomplex.html b/docs/_includes/custom/usermapcomplex.html index c75a652..417538d 100755 --- a/docs/_includes/custom/usermapcomplex.html +++ b/docs/_includes/custom/usermapcomplex.html @@ -1,91 +1,105 @@
- - + + - -