forked from spring-attic/spring-cloud-dataflow
-
Notifications
You must be signed in to change notification settings - Fork 5
Version filter #113
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
Draft
siddhantsorann
wants to merge
8
commits into
master
Choose a base branch
from
version-filter
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Version filter #113
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
1cbe627
Added new dao to handle predicates
siddhantsorann 1533d30
fixing test cases
siddhantsorann c474ed2
fixing test cases
siddhantsorann b6a9c15
fixing test cases
siddhantsorann e4aed27
Merge branch 'master' of https://github.com/miqdigital/spring-cloud-d…
siddhantsorann c9f718a
resolving pr issues
siddhantsorann 7040e18
added test case for filter by version
siddhantsorann f33fb5d
fixed failing test cases
siddhantsorann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
.../main/java/org/springframework/cloud/dataflow/registry/repository/AppRegistrationDao.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright 2021 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.springframework.cloud.dataflow.registry.repository; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import javax.persistence.EntityManager; | ||
| import javax.persistence.TypedQuery; | ||
| import javax.persistence.criteria.CriteriaBuilder; | ||
| import javax.persistence.criteria.CriteriaQuery; | ||
| import javax.persistence.criteria.Predicate; | ||
| import javax.persistence.criteria.Root; | ||
|
|
||
| import org.springframework.cloud.dataflow.core.AppRegistration; | ||
| import org.springframework.cloud.dataflow.core.ApplicationType; | ||
| import org.springframework.data.domain.Page; | ||
| import org.springframework.data.domain.PageImpl; | ||
| import org.springframework.data.domain.Pageable; | ||
| import org.springframework.data.jpa.repository.query.QueryUtils; | ||
| import org.springframework.stereotype.Component; | ||
| import org.springframework.util.Assert; | ||
| import org.springframework.util.StringUtils; | ||
|
|
||
| @Component | ||
| public class AppRegistrationDao { | ||
|
|
||
| private final EntityManager entityManager; | ||
|
|
||
| public AppRegistrationDao(EntityManager entityManager) { | ||
| Assert.notNull(entityManager, "Entity manager cannot be null"); | ||
| this.entityManager = entityManager; | ||
| } | ||
|
|
||
| public Page<AppRegistration> findAllByTypeAndNameIsLikeAndVersionAndDefaultVersion(ApplicationType type, | ||
| String name, String version, boolean defaultVersion, Pageable pageable) { | ||
| CriteriaBuilder cb = entityManager.getCriteriaBuilder(); | ||
| CriteriaQuery<AppRegistration> cq = cb.createQuery(AppRegistration.class); | ||
| Root<AppRegistration> appRegistrationRoot = cq.from(AppRegistration.class); | ||
| final List<Predicate> predicates = new ArrayList<>(); | ||
| if (type != null) { | ||
| predicates.add(cb.equal(appRegistrationRoot.get("type"), type)); | ||
| } | ||
| if (StringUtils.hasText(name)) { | ||
| predicates.add(cb.like(cb.lower(appRegistrationRoot.get("name")), name.toLowerCase())); | ||
| } | ||
| if (StringUtils.hasText(version)) { | ||
| predicates.add(cb.equal(cb.lower(appRegistrationRoot.get("version")), version.toLowerCase())); | ||
| } | ||
| if (defaultVersion) { | ||
| predicates.add(cb.isTrue(appRegistrationRoot.get("defaultVersion"))); | ||
| } | ||
| cq.where(predicates.toArray(new Predicate[0])); | ||
| cq.orderBy(QueryUtils.toOrders(pageable.getSort(), appRegistrationRoot, cb)); | ||
| TypedQuery<AppRegistration> query = entityManager.createQuery(cq); | ||
| query.setFirstResult((int) pageable.getOffset()); | ||
| query.setMaxResults(pageable.getPageSize()); | ||
| final List<AppRegistration> resultList = query.getResultList(); | ||
| return new PageImpl<>(resultList, pageable, getTotalCount(cb, predicates.toArray(new Predicate[0]))); | ||
| } | ||
|
|
||
| private Long getTotalCount(CriteriaBuilder criteriaBuilder, Predicate[] predicateArray) { | ||
| CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class); | ||
| Root<AppRegistration> root = criteriaQuery.from(AppRegistration.class); | ||
|
|
||
| criteriaQuery.select(criteriaBuilder.count(root)); | ||
| criteriaQuery.where(predicateArray); | ||
|
|
||
| return entityManager.createQuery(criteriaQuery).getSingleResult(); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this is the default server, then why would this not have a
ComponentScanbefore?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There is another class that has other annotations but when I ran the app it failed to start, adding this here made it work. Still checking this.