Skip to content

v1.0.8 #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 77 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3feccd2
Update dependency org.apache.maven.plugins:maven-checkstyle-plugin to…
xdev-renovate Jun 6, 2024
543132b
Merge pull request #66 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 10, 2024
544753b
Fix rev-parse not working
AB-xdev Jun 11, 2024
a042b63
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
49f82a1
Fix problem with fetch depth of 0
AB-xdev Jun 11, 2024
e73d714
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
1b8b6b2
Fully unshallow every as ls-remote also fails
AB-xdev Jun 11, 2024
de9071b
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
538caf1
Revert "Fully unshallow every as ls-remote also fails"
AB-xdev Jun 11, 2024
ca909f1
Revert "Fix problem with fetch depth of 0"
AB-xdev Jun 11, 2024
38e37eb
Revert "Fix rev-parse not working"
AB-xdev Jun 11, 2024
56ef08a
Correct if
AB-xdev Jun 11, 2024
f9d8378
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 11, 2024
2fee73a
Merge pull request #91 from xdev-software/master
JohannesRabauer Jun 14, 2024
03dd571
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jun 17, 2024
9613cc5
Merge branch 'develop' into update-from-template-merged
xdev-gh-bot Jun 17, 2024
7e57677
Fill in template
xdev-gh-bot Jun 17, 2024
306f86e
Merge pull request #94 from xdev-software/update-from-template-merged
JohannesRabauer Jun 17, 2024
8446899
Merge pull request #71 from xdev-software/renovate/org.apache.maven.p…
AB-xdev Jun 17, 2024
7313ce9
Update dependency maven to v3.9.8
xdev-renovate Jun 18, 2024
5854083
Merge pull request #72 from xdev-software/renovate/maven-3.x
AB-xdev Jun 18, 2024
3e41f58
Add default PMD ruleset
AB-xdev Jun 18, 2024
f697749
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 18, 2024
43ddc48
Attach demo to parent
AB-xdev Jun 18, 2024
3bc085a
Reconfigure root and add pmd
AB-xdev Jun 18, 2024
f5240c0
Add pmd to published module
AB-xdev Jun 18, 2024
11c6f7e
Add pmd to check-build workflow
AB-xdev Jun 18, 2024
a22d20d
Merge pull request #74 from xdev-software/pmd
AB-xdev Jun 19, 2024
d979ab9
PMD: printFailingErrors
AB-xdev Jun 19, 2024
eed3d8a
Update ruleset.xml
AB-xdev Jun 19, 2024
2b01eda
Merge branch 'master' into update-from-template-merged
xdev-gh-bot Jun 19, 2024
17a7371
Removed broken link
JohannesRabauer Jun 19, 2024
fb7a583
Merge branch 'develop' of https://github.com/xdev-software/spring-dat…
JohannesRabauer Jun 19, 2024
baeabdd
Update dependency maven to v3.9.8
xdev-renovate Jun 19, 2024
6eb1baa
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jun 19, 2024
eaf1d96
Update dependency org.apache.maven.plugins:maven-surefire-plugin to v…
xdev-renovate Jun 19, 2024
6a258c7
Remove duplicate in .gitignore
AB-xdev Jun 20, 2024
b8fa58a
Update org.springframework.boot.version to v3.3.1
xdev-renovate Jun 21, 2024
f2290e6
Ignore project internal depenedencies
AB-xdev Jun 24, 2024
568c2fd
Merge pull request #96 from xdev-software/renovate/org.springframewor…
JohannesRabauer Jun 25, 2024
3f6c9b1
Merge pull request #95 from xdev-software/renovate/maven-3.x
JohannesRabauer Jun 25, 2024
8f5f677
Merge pull request #93 from xdev-software/renovate/org.apache.maven.p…
JohannesRabauer Jun 25, 2024
231671d
Merge pull request #92 from xdev-software/renovate/org.apache.maven.p…
JohannesRabauer Jun 25, 2024
19615ba
Update README.md
JohannesRabauer Jun 25, 2024
0e794a0
Merge branch 'develop' of https://github.com/xdev-software/spring-dat…
JohannesRabauer Jun 25, 2024
a33787c
Merge remote-tracking branch 'origin/update-from-template' into develop
AB-xdev Jun 25, 2024
baca58c
Fill in template
AB-xdev Jun 25, 2024
4cb2fdc
Handle other demos like demo project
AB-xdev Jun 25, 2024
b66dde8
Fix conflict in parent pom
AB-xdev Jun 25, 2024
c9bc5c5
Fix format
AB-xdev Jun 25, 2024
93a7f4e
Fix PMD
AB-xdev Jun 25, 2024
3fcb13a
Ignore auto generated classes
AB-xdev Jun 25, 2024
8c68d3e
Update dependency @antora/cli to v3.1.8
xdev-renovate Jun 26, 2024
16dc703
Update dependency @antora/site-generator to v3.1.8
xdev-renovate Jun 26, 2024
ebf6be8
Fix hashcode
JohannesRabauer Jun 26, 2024
43440d8
Make equals hashcode niceer
AB-xdev Jun 26, 2024
3a5e87a
Compact ``createPredicateForStringMatcher``
AB-xdev Jun 26, 2024
c5d095c
Refactored ID tests to be isolated
JohannesRabauer Jun 26, 2024
27af367
Implemented Tests for ID Replacement behavior
JohannesRabauer Jun 26, 2024
7c6869e
Fix CPD
AB-xdev Jun 26, 2024
170d934
Sync
AB-xdev Jun 26, 2024
55aa939
Fixed some ID issues
JohannesRabauer Jun 26, 2024
829d540
Merge pull request #98 from xdev-software/update-from-template-fix
JohannesRabauer Jun 26, 2024
4f88ecf
Merge pull request #100 from xdev-software/renovate/antora-site-gener…
JohannesRabauer Jun 26, 2024
78719aa
Merge branch 'develop' into renovate/antora-cli-3.x
JohannesRabauer Jun 26, 2024
a37537e
Merge pull request #99 from xdev-software/renovate/antora-cli-3.x
JohannesRabauer Jun 26, 2024
4564958
Merge branch 'develop' into replace-entities-with-same-id
JohannesRabauer Jun 26, 2024
fc316c8
Update dependency org.apache.maven.plugins:maven-project-info-reports…
xdev-renovate Jun 27, 2024
5769df9
Entities with same IDs are now replaced
JohannesRabauer Jun 27, 2024
f4e19cb
Merge pull request #101 from xdev-software/renovate/org.apache.maven.…
JohannesRabauer Jun 27, 2024
05ab514
Merge branch 'develop' into replace-entities-with-same-id
JohannesRabauer Jun 27, 2024
90c81e2
Refactoring
JohannesRabauer Jun 27, 2024
5424324
Update pom.xml
JohannesRabauer Jun 27, 2024
bffa74c
Update pom.xml
JohannesRabauer Jun 27, 2024
b92fd2b
Update pom.xml
JohannesRabauer Jun 27, 2024
1b02d3d
Merge pull request #102 from xdev-software/replace-entities-with-same-id
JohannesRabauer Jun 27, 2024
28239f8
Update CHANGELOG.md
JohannesRabauer Jun 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 152 additions & 0 deletions .config/pmd/ruleset.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset name="Default"
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0 https://pmd.sourceforge.io/ruleset_2_0_0.xsd">

<description>
This ruleset checks the code for discouraged programming constructs.
</description>

<!-- Only rules that don't overlap with CheckStyle! -->

<rule ref="category/java/bestpractices.xml/AvoidUsingHardCodedIP"/>
<rule ref="category/java/bestpractices.xml/PreserveStackTrace"/>
<rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty"/>
<rule ref="category/java/bestpractices.xml/UseStandardCharsets"/>

<!-- Native code is platform dependent; Loading external native libs might pose a security threat -->
<rule ref="category/java/codestyle.xml/AvoidUsingNativeCode"/>
<rule ref="category/java/codestyle.xml/IdenticalCatchBranches"/>
<rule ref="category/java/codestyle.xml/NoPackage"/>
<rule ref="category/java/codestyle.xml/PrematureDeclaration"/>

<rule ref="category/java/design.xml">
<!-- Sometimes abstract classes have just fields -->
<exclude name="AbstractClassWithoutAnyMethod"/>

<!-- Using RuntimeExceptions is ok -->
<exclude name="AvoidCatchingGenericException"/>
<exclude name="AvoidThrowingRawExceptionTypes"/>

<!-- Limit too low -->
<exclude name="AvoidDeeplyNestedIfStmts"/>

<!-- Limit too low -->
<exclude name="CouplingBetweenObjects"/>

<!-- Limit too low -->
<exclude name="CyclomaticComplexity"/>

<!-- Makes entity classes impossible -->
<exclude name="DataClass"/>

<!-- Used commonly particular in bigger methods with upstream throws -->
<exclude name="ExceptionAsFlowControl"/>

<!-- Limit too low -->
<exclude name="ExcessiveImports"/>

<!-- Handled by TooManyFields/TooManyMethods -->
<exclude name="ExcessivePublicCount"/>

<!-- Prohibits accessing members using multiple depths -->
<exclude name="LawOfDemeter"/>

<!-- No effect -->
<exclude name="LoosePackageCoupling"/>

<!-- Prohibits singleton pattern -->
<exclude name="MutableStaticState"/>

<!-- Some override methods or Junit require this -->
<exclude name="SignatureDeclareThrowsException"/>

<!-- Reports FP for equals methods -->
<exclude name="SimplifyBooleanReturns"/>

<!-- Limit too low -->
<exclude name="TooManyFields"/>

<!-- Limit too low -->
<exclude name="TooManyMethods"/>

<!-- Limit too low -->
<exclude name="UseObjectForClearerAPI"/>

<!-- Handled by checkstyle -->
<exclude name="UseUtilityClass"/>
</rule>

<rule ref="category/java/design.xml/AvoidDeeplyNestedIfStmts">
<properties>
<property name="problemDepth" value="4"/>
</properties>
</rule>
<rule ref="category/java/design.xml/CouplingBetweenObjects">
<properties>
<property name="threshold" value="100"/>
</properties>
</rule>
<rule ref="category/java/design.xml/CyclomaticComplexity">
<properties>
<property name="classReportLevel" value="150"/>
<property name="methodReportLevel" value="25"/>
<property name="cycloOptions" value=""/>
</properties>
</rule>
<rule ref="category/java/design.xml/ExcessiveImports">
<properties>
<property name="minimum" value="200"/>
</properties>
</rule>
<rule ref="category/java/design.xml/TooManyFields">
<properties>
<property name="maxfields" value="50"/>
</properties>
</rule>
<rule ref="category/java/design.xml/TooManyMethods">
<properties>
<property name="maxmethods" value="100"/>
</properties>
</rule>

<rule ref="category/java/errorprone.xml/AvoidUsingOctalValues"/>
<rule ref="category/java/errorprone.xml/BrokenNullCheck"/>
<rule ref="category/java/errorprone.xml/ComparisonWithNaN"/>
<rule ref="category/java/errorprone.xml/DoNotCallGarbageCollectionExplicitly"/>
<rule ref="category/java/errorprone.xml/DontImportSun"/>
<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
<rule ref="category/java/errorprone.xml/UnnecessaryCaseChange"/>


<rule ref="category/java/multithreading.xml">
<!-- Just bloats code -->
<exclude name="AvoidSynchronizedAtMethodLevel"/>

<!-- NOPE -->
<exclude name="DoNotUseThreads"/>

<!-- Doesn't detect nested thread safe singleton pattern -->
<exclude name="NonThreadSafeSingleton"/>

<!-- Should relevant for fields that use multithreading which is rare -->
<exclude name="UseConcurrentHashMap"/>
</rule>

<rule ref="category/java/performance.xml">
<!-- This was fixed in Java 10 -->
<exclude name="AvoidFileStream"/>

<!-- Used everywhere and has neglectable performance impact -->
<exclude name="AvoidInstantiatingObjectsInLoops"/>

<!-- Handled by checkstyle -->
<exclude name="RedundantFieldInitializer"/>

<!-- Nowadays optimized by compiler; No code bloating needed -->
<exclude name="UseStringBufferForStringAppends"/>
</rule>

<rule ref="category/java/security.xml"/>
</ruleset>
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ body:
attributes:
label: "Checklist"
options:
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/template-placeholder/releases/latest)"
- label: "I am able to reproduce the bug with the [latest version](https://github.com/xdev-software/spring-data-eclipse-store/releases/latest)"
required: true
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-data-eclipse-store/issues) or [closed](https://github.com/xdev-software/spring-data-eclipse-store/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the bug report will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: "Checklist"
options:
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-data-eclipse-store/issues) or [closed](https://github.com/xdev-software/spring-data-eclipse-store/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the feature request will be dismissed otherwise."
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/question.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ body:
attributes:
label: "Checklist"
options:
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/template-placeholder/issues) or [closed](https://github.com/xdev-software/template-placeholder/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
- label: "I made sure that there are *no existing issues* - [open](https://github.com/xdev-software/spring-data-eclipse-store/issues) or [closed](https://github.com/xdev-software/spring-data-eclipse-store/issues?q=is%3Aissue+is%3Aclosed) - which I could contribute my information to."
required: true
- label: "I have taken the time to fill in all the required details. I understand that the question will be dismissed otherwise."
required: true
Expand Down
41 changes: 39 additions & 2 deletions .github/workflows/check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
path: ${{ env.DEMO_MAVEN_MODULE }}/target/${{ env.DEMO_MAVEN_MODULE }}.jar
if-no-files-found: error

code-style:
checkstyle:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

Expand All @@ -92,6 +92,43 @@ jobs:
- name: Run Checkstyle
run: ./mvnw -B checkstyle:check -P checkstyle -T2C

pmd:
runs-on: ubuntu-latest
if: ${{ github.event_name != 'pull_request' || !startsWith(github.head_ref, 'renovate/') }}

strategy:
matrix:
java: [17]
distribution: [temurin]

steps:
- uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
distribution: ${{ matrix.distribution }}
java-version: ${{ matrix.java }}
cache: 'maven'

- name: Run PMD
run: ./mvnw -B test pmd:aggregate-pmd-no-fork pmd:check -P pmd -DskipTests -T2C

- name: Run CPD (Copy Paste Detector)
run: ./mvnw -B pmd:aggregate-cpd pmd:cpd-check -P pmd -DskipTests -T2C

- name: Upload report
if: always()
uses: actions/upload-artifact@v4
with:
name: pmd-report
if-no-files-found: ignore
path: |
target/site/*.html
target/site/css/**
target/site/images/logos/maven-feather.png
target/site/images/external.png

docs:
runs-on: ubuntu-latest

Expand All @@ -107,4 +144,4 @@ jobs:
run: npm i antora @antora/lunr-extension

- name: Generate Site
run: npx antora docs/antora-playbook.yml
run: npx antora docs/antora-playbook.yml
4 changes: 4 additions & 0 deletions .github/workflows/update-from-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ jobs:
echo "Checking if update-branch-merged exists"
git fetch
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
echo "Branch still exists; Continuing..."
else
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
exit 0
fi
Expand Down Expand Up @@ -274,6 +276,8 @@ jobs:
echo "Fetching..."
git fetch
if [[ $(git rev-parse origin/${{ env.UPDATE_BRANCH_MERGED }}) ]]; then
echo "Branch still exists; Continuing..."
else
echo "Branch origin/${{ env.UPDATE_BRANCH_MERGED }} is missing"
exit 0
fi
Expand Down
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,6 @@ buildNumber.properties
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*


# bin / compiled stuff
target/


# JRebel
**/resources/rebel.xml
**/resources/rebel-remote.xml
Expand Down
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 1.0.8

* Entities with same ID are replaced on saved and not added
* Updated Spring to version 3.3.1

# 1.0.7

* QueryByExample now possible
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ instructions** are in the documentation](https://xdev-software.github.io/spring-
|---------------------------|--------|-------------|--------------|
| ``<= 1.0.2`` | ``17`` | ``3.2.2`` | ``1.1.0`` |
| ``1.0.3/1.0.4`` | ``17`` | ``3.2.3`` | ``1.2.0`` |
| ``>= 1.0.5`` | ``17`` | ``3.2.5`` | ``1.3.2`` |
| ``1.0.5-1.0.7`` | ``17`` | ``3.2.5`` | ``1.3.2`` |
| ``>= 1.0.8`` | ``17`` | ``3.3.1`` | ``1.3.2`` |

## Demo

Expand Down Expand Up @@ -82,4 +83,5 @@ use [our support](https://xdev.software/en/services/support).
See the [contributing guide](./CONTRIBUTING.md) for detailed instructions on how to get started with our project.

## Dependencies and Licenses
View the [license of the current project](LICENSE) or the [summary including all dependencies](https://xdev-software.github.io/spring-data-eclipse-store/dependencies)

View the [license of the current project](LICENSE).
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"@antora/lunr-extension": "^1.0.0-alpha.8"
},
"devDependencies": {
"@antora/cli": "3.1.7",
"@antora/site-generator": "3.1.7"
"@antora/cli": "3.1.8",
"@antora/site-generator": "3.1.8"
}
}
Loading