Skip to content

Commit

Permalink
HSEARCH-2594 Initial work on JSR-352 - third part
Browse files Browse the repository at this point in the history
This commit has been extracted from https://github.com/mincong-h/gsoc-hsearch/tree/master/
It is the result of squashing commits
576f105 to 40aff727a4ca70dd809ca72dcb6315d71f80a37f
(see git log below).

commit 40aff727a4ca70dd809ca72dcb6315d71f80a37f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Jan 5 23:18:43 2017 +0100

    hibernate#168 test batch job runnability over a poorly-formed entity
    It has multiple ID-like fields, which make it difficult to identify the real identifier.

commit 3cd83d9b5d9c055ee133d66a5af7e9c027a572dc
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Jan 5 22:22:33 2017 +0100

    hibernate#165 delete unused import

commit 58fabd11044b64f82f69432061fe1a37ad8967a4
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Jan 5 21:55:17 2017 +0100

    hibernate#165 remove duplicate ID projection

commit d0c23f934851866ecfc797c889a9c3f69971208c
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Jan 5 21:49:01 2017 +0100

    hibernate#165 avoid using toString() method

commit 15d2952a30d14384ed9a1a514b7a9a72b2d30ae6
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Jan 3 22:34:49 2017 +0100

    hibernate#165 use `Projections#id()`
    instead of `DocumentBuilderIndexedEntity#getIdPropertyName()` to avoid null reference issue for provided IDs.

commit 89624d52f7b6b955bbf45d576b538b8fc93445fb
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 21:40:45 2016 +0100

    hibernate#162 refactor entitiyType

commit c15633f0a2912b2cf50531c7742ae37b201d1229
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 21:13:59 2016 +0100

    hibernate#162 increase default itemCount to 200

commit 21be31a72a59e933006c1ccdc9e372b76a979098
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 20:27:12 2016 +0100

    hibernate#162 rename ID to Id

commit 81a39117cb8f9c8d0086c2252c2a3c759488fa4f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 20:13:51 2016 +0100

    hibernate#162 rename entityClazz to entityType

commit 6a7f42a8b3f3ef23dc6df3d93ea0c8b69210b5cb
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 17:10:03 2016 +0100

    hibernate#162 rename PartitionUnit to PartitionBound

commit 58add35f70ff943c915be7aeaf03b411db1847e7
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 16:49:48 2016 +0100

    hibernate#162 refactor job context data setup

commit 0e942211a850a0d5c5b6c5a20f6e9a441123a8e0
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 15:56:51 2016 +0100

    hibernate#162 format code according to hibernate-ide-codestyles
    https://github.com/hibernate/hibernate-ide-codestyles

commit d0c9d69f2a702b997d40160f0aba6960fd22c4f8
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 12:10:43 2016 +0100

    hibernate#161 use getName() instead of toString()

commit d26d5c9acf9d08d303f1e2f1f728227a66bad87f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Dec 8 11:15:29 2016 +0100

    hibernate#134 rename StepContextData to PartitionContextData
    to provide a better understanding

commit f4983aacf9b14faebcbe8f553eb68d5182caea0a
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Dec 6 17:37:12 2016 +0100

    hibernate#134 persist indexing progress using `setPersistentData`

commit 3dd8b30bbaf623acddd3f240a9a0ca3583a5b488
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Dec 6 12:48:42 2016 +0100

    hibernate#134 fix indexing progress error: avoid storing increment

commit a2c5ffcb60e99eff7245bd4999d81079f31db4e0
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Dec 6 12:10:29 2016 +0100

    hibernate#134 delete unused attributes
    `isRestarted` and `rowsToIndex`

commit f4bcbd422a735364b9f90f71f1e1bf198d983eb5
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Dec 6 11:22:37 2016 +0100

    hibernate#134 refactor process of indexing-progress-monitoring

commit 3c6b1d373a5096f993a77198e239acbe7a7fd844
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Mon Dec 5 21:42:45 2016 +0100

    hibernate#134 add class StepProgress, storing indexing progress at step level

commit bc037f453f1b25dd86b60f5d3e5e34f3eff584b1
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Fri Dec 2 09:44:05 2016 +0100

    hibernate#87 rename lgpl.txt to LICENSE.txt

commit 9ab00469a589cf9bdb118a6f952760c8e555836f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Mon Nov 21 10:59:41 2016 +0100

    hibernate#160 add Travis CI status

commit cd5b933953dc4c523541709ccbe0100632823950
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Mon Nov 21 10:50:47 2016 +0100

    hibernate#160 set up Travis CI

commit 0229fdb56e9218994cdc4d7793553337ba93d476
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Fri Sep 30 21:39:53 2016 +0200

    hibernate#146 misc. enhance & use another test scenario for WF
    which demonstrates the possibility to index recent inserted entities

commit 13bc769a101c8f4cfa53fbe46433abdae2047a98
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 29 16:29:48 2016 +0200

    hibernate#133 type and naming enhancement

commit b7ca7eab62eec0457ee56586c66c90946364c6f0
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 29 15:44:26 2016 +0200

    hibernate#151 rename "massIndex" / "mass-index" -> "BatchIndexingJob"

commit 031e6a02fabc8fb7ee731fdf3a8258f88aab0e6a
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 29 15:28:17 2016 +0200

    hibernate#156 hibernate#159 refactor the MassIndexer -> BatchIndexingJob
    - Make a second level Builder class Builder.
    - Avoid using constructor of MassIndexer.
    - Various arguments of type Class<?>, Class<?>... for builder to allow at least 1 argument.
    - Rename MassIndexer to BatchIndexingJob
    - Avoid a static reference to the EMF
    - Update all the test cases according to the changes

commit 950106e036309e24560a599b9132644d3b328e74
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Wed Sep 28 13:26:39 2016 +0200

    hibernate#133 the batch insertion counter need to be incremented

commit 4b8f5525a9ab716618bb42f0b90de0e5d77f5ec9
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Sep 27 16:59:52 2016 +0200

    hibernate#133 require at least one element for MassIndexer#addRootEntities(...)

commit 556e88e74d5f39212af86712bd767821f7839de0
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Tue Sep 27 10:50:42 2016 +0200

    hibernate#146 Allow to select the entities through a HQL/JPQL query

commit ff9f4c6dfdee918d4f59d1e4a03b0765105746db
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sun Sep 25 22:10:50 2016 +0200

    hibernate#150 add test for validating the job start/stop in CLI

commit 4258265f34ddb69b0e14c15a9f30d20ca6170b9a
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sun Sep 25 17:37:00 2016 +0200

    hibernate#133 rename the war using the class's name

commit 038d53c0ac765f0ebd3826323c8c01a23b9255ad
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 22 17:29:13 2016 +0200

    hibernate#136 refactor mocked tests
    Use real EntityManagerFactory instead of mocked one. Batch properties are now passed using a protected args-constructor. After the refactoring, there's no need to use PowerMock anymore.

commit 217d560424171e83864dfe55f6d08d955baeb763
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sun Sep 18 21:23:13 2016 +0200

    hibernate#158 store Object as job property, e.g. Hibernate criterion
    enable selection of entities to be re-indexed through criteria

commit e3a097a7eec8057b9c105684c9ab473645d08d3e
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Fri Sep 16 16:58:44 2016 +0200

    hibernate#154 banne caching option for PartitionMapper

commit 3bf541a6ebfd4aa7d10a6d1475e4977a2fbb706d
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 15 18:36:22 2016 +0200

    hibernate#153 avoid SNAPSHOT versions among the dependencies

commit de4be0b1478c66237537847d27868059d38e981f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Sep 15 18:09:03 2016 +0200

    hibernate#152 use java.lang.String for all the batch properties

commit e4e1ed4a33fcd616ccf5d58e065e77b85bcbf187
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Fri Aug 26 21:46:36 2016 +0200

    hibernate#132 remove dummy job xml

commit e52939897253a79320ad471645637275e1e3b6a8
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Fri Aug 26 21:41:38 2016 +0200

    hibernate#132 enable the module approach

commit a4fa8430b43ce138180eda8ce682d393ce55f473
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Wed Aug 24 23:47:53 2016 +0200

    hibernate#132 enable arquillian-managed WF's debug

commit 188fba5902ca1dc3777048db8039721ada32abb3
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Aug 25 22:57:10 2016 +0200

    hibernate#132 WFLY-7000 Batch jobs from installed modules should be detected for non-batch app

commit 68ccad9abb1562f0f8cd0bbdc4b5057469fb7f77
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Wed Aug 24 23:47:53 2016 +0200

    hibernate#132 enable arquillian-managed WF's debug

commit 88c2dac3e7a7a7b2f8b7f4cc93d10d197b1b5244
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Mon Aug 22 23:55:34 2016 +0200

    hibernate#132 add org.jberet.jberet-core as a module dependency
    to fix unsatisfied dependencies issue

commit 3fb229edb54f78c79208391a722168751b7811e0
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 15:10:20 2016 +0200

    hibernate#132 implement an SPI like this ?

commit c44d5f7
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 23:54:34 2016 +0200

    hibernate#133 avoid dependence on the existing mass indexer
    for batchlets

commit 5c4add3
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 22:47:33 2016 +0200

    hibernate#143 change log level to INFO

commit e1b8229
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 22:47:06 2016 +0200

    hibernate#143 maven cleanup

commit 3c111e5
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 22:40:22 2016 +0200

    hibernate#140 change project version to 1.0

commit 1070a6d
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 22:08:44 2016 +0200

    hibernate#143 add issue management

commit 5ae4508
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 22:03:48 2016 +0200

    hibernate#143 maven clean up

commit e9bad75
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 20:59:43 2016 +0200

    hibernate#143 add license and developers info

commit 1b9f491
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 20:41:07 2016 +0200

    hibernate#139 separate simple integration test and performance test

commit 3a18b7b
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 18:43:59 2016 +0200

    hibernate#143 delete profiles

commit 35d8ba7
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 18:40:53 2016 +0200

    hibernate#143 revert WF module installation approach

commit a78086f
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Sat Aug 20 17:27:29 2016 +0200

    hibernate#143 rename maven module javaee-wildfly to wildfly

commit d9fadc8
Merge: 50908f9 ca09828
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Aug 18 21:15:00 2016 +0200

    hibernate#132 import meta-inf from dependency

commit 50908f9
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Aug 18 02:06:07 2016 +0200

    hibernate#132 update for IT

commit 576f105
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Wed Aug 17 23:50:36 2016 +0200

    hibernate#132 package batch job as module for WildFly

commit ca09828
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Thu Aug 18 02:06:07 2016 +0200

    hibernate#132 update for IT

commit 69440de
Author: Mincong HUANG <mincong.h@gmail.com>
Date:   Wed Aug 17 23:50:36 2016 +0200

    hibernate#132 package batch job as module for WildFly
  • Loading branch information
mincong-h authored and yrodiere committed May 17, 2017
1 parent 0de4fe3 commit 09616af
Show file tree
Hide file tree
Showing 77 changed files with 2,856 additions and 2,146 deletions.
3 changes: 3 additions & 0 deletions jsr352/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
language: java
jdk:
- oraclejdk8
File renamed without changes.
6 changes: 5 additions & 1 deletion jsr352/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status][travis-img]][travis]

# gsoc-hsearch

This project aims to provide an alternative to the current mass indexer
Expand Down Expand Up @@ -25,4 +27,6 @@ control (start/stop/restart), logging, checkpointing and parallelization.

For more information, please check http://mincong-h.github.io/gsoc-hsearch

[1]: https://raw.githubusercontent.com/mincong-h/gsoc-hsearch/master/img/mass-index.png
[1]: https://raw.githubusercontent.com/mincong-h/gsoc-hsearch/master/img/mass-index.png
[travis]: https://travis-ci.org/mincong-h/gsoc-hsearch
[travis-img]: https://travis-ci.org/mincong-h/gsoc-hsearch.svg?branch=master
4 changes: 2 additions & 2 deletions jsr352/build-config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hsearch-jsr352-parent</artifactId>
<version>5.5.4.Final</version>
<version>1.0</version>
</parent>
<artifactId>hsearch-jsr352-build-config</artifactId>

Expand All @@ -36,7 +36,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${puppycrawl.checkstyle.version}</version>
<version>${com.puppycrawl.tools}</version>
<exclusions>
<!-- Excluding com.sun:tools since it causes errors when importing this module into an IDE on Windows (HSEARCH-1374) -->
<exclusion>
Expand Down
58 changes: 20 additions & 38 deletions jsr352/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,33 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hsearch-jsr352-parent</artifactId>
<version>5.5.4.Final</version>
<version>1.0</version>
</parent>

<artifactId>hsearch-jsr352-core</artifactId>
<name>GSoC JSR352 - Core</name>
<description>New implementation of mass-indexer using JSR 352</description>

<properties>
<org.jboss.byteman>3.0.6</org.jboss.byteman>
<org.mockito>1.10.19</org.mockito>
<org.powermock>1.6.4</org.powermock>
<byteman.version>3.0.6</byteman.version>
</properties>

<dependencies>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${org.hibernate}</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search-orm</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.batch</groupId>
<artifactId>jboss-batch-api_1.0_spec</artifactId>
Expand Down Expand Up @@ -56,31 +65,13 @@
<version>${org.mockito}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
<version>${org.powermock}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>${org.powermock}</version>
<scope>test</scope>
</dependency>
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- below dependencies are moved from Java SE integration test -->
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
<version>${org.hibernate}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${org.hibernate}</version>
</dependency>

<!-- JBeret minimal application dependencies -->
<!-- https://jberet.gitbooks.io/jberet-user-guide/content/set_up_jberet/#minimal-application-dependencies -->
<dependency>
Expand All @@ -101,11 +92,6 @@
<version>1.4.11.Final</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.3.0.Final</version>
</dependency>
<dependency>
<groupId>org.jboss.weld</groupId>
<artifactId>weld-core</artifactId>
Expand All @@ -124,6 +110,7 @@
<version>19.0</version>
<scope>test</scope>
</dependency>

<!-- Additional dependencies for Java SE batch applications -->
<!-- https://jberet.gitbooks.io/jberet-user-guide/content/set_up_jberet/#additional-dependencies-for-java-se-batch-applications -->
<dependency>
Expand All @@ -138,39 +125,37 @@
<version>2.3.4.Final</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${com.h2database}</version>
<scope>test</scope>
</dependency>
<!-- above dependencies are moved from Java SE integration test -->
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<!-- bytemen -->

<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman</artifactId>
<version>${org.jboss.byteman}</version>
<scope>test</scope>
<version>${byteman.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-submit</artifactId>
<version>${org.jboss.byteman}</version>
<scope>test</scope>
<version>${byteman.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-install</artifactId>
<version>${org.jboss.byteman}</version>
<scope>test</scope>
<version>${byteman.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.byteman</groupId>
<artifactId>byteman-bmunit</artifactId>
<version>${org.jboss.byteman}</version>
<scope>test</scope>
<version>${byteman.version}</version>
</dependency>
</dependencies>

Expand All @@ -180,9 +165,6 @@
<testResource>
<filtering>true</filtering>
<directory>src/test/resources</directory>
<includes>
<include>META-INF/persistence.xml</include>
</includes>
</testResource>
</testResources>
<plugins>
Expand Down Expand Up @@ -230,4 +212,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Loading

0 comments on commit 09616af

Please sign in to comment.