Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
competency-passbook
Commits
0bedc07e
Unverified
Commit
0bedc07e
authored
1 year ago
by
Shishir Suman
Committed by
GitHub
1 year ago
Browse files
Options
Download
Plain Diff
Merge pull request #2 from Radheshhathwar/main
Changed name
parents
26e36683
878e007f
main
No related merge requests found
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
pom.xml
+4
-4
pom.xml
src/main/java/com/sphere/compentency/CompentencyApplication.java
+4
-4
...n/java/com/sphere/compentency/CompentencyApplication.java
src/main/java/com/sphere/compentency/common/utils/AppProperties.java
+1
-1
...va/com/sphere/compentency/common/utils/AppProperties.java
src/main/java/com/sphere/compentency/common/utils/propertiesCache.java
+1
-4
.../com/sphere/compentency/common/utils/propertiesCache.java
src/main/java/com/sphere/compentency/constants/Constants.java
+2
-2
...main/java/com/sphere/compentency/constants/Constants.java
src/main/java/com/sphere/compentency/controller/Controller.java
+4
-4
...in/java/com/sphere/compentency/controller/Controller.java
src/main/java/com/sphere/compentency/exception/ErrorDetails.java
+1
-1
...n/java/com/sphere/compentency/exception/ErrorDetails.java
src/main/java/com/sphere/compentency/exception/GlobalExceptionHandler.java
+1
-1
.../sphere/compentency/exception/GlobalExceptionHandler.java
src/main/java/com/sphere/compentency/exception/ResourceNotFoundException.java
+1
-1
...here/compentency/exception/ResourceNotFoundException.java
src/main/java/com/sphere/compentency/external/service/ExternalService.java
+1
-1
.../sphere/compentency/external/service/ExternalService.java
src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
+3
-3
...ompentency/external/service/impl/ExternalServiceImpl.java
src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
+2
-2
...entency/externalservice/controller/ServiceController.java
src/main/java/com/sphere/compentency/kafka/consumer/api/Api_services.java
+2
-3
...m/sphere/compentency/kafka/consumer/api/Api_services.java
src/main/java/com/sphere/compentency/kafka/consumer/api/SearchObject.java
+1
-1
...m/sphere/compentency/kafka/consumer/api/SearchObject.java
src/main/java/com/sphere/compentency/kafka/consumer/api/kafkaConsumer.java
+2
-6
.../sphere/compentency/kafka/consumer/api/kafkaConsumer.java
src/main/java/com/sphere/compentency/model/GetPassbook.java
+1
-3
src/main/java/com/sphere/compentency/model/GetPassbook.java
src/main/java/com/sphere/compentency/model/GetPassbookBase.java
+1
-2
...in/java/com/sphere/compentency/model/GetPassbookBase.java
src/main/java/com/sphere/compentency/model/Passbook.java
+1
-1
src/main/java/com/sphere/compentency/model/Passbook.java
src/main/java/com/sphere/compentency/model/Request.java
+1
-1
src/main/java/com/sphere/compentency/model/Request.java
src/main/java/com/sphere/compentency/model/User.java
+1
-1
src/main/java/com/sphere/compentency/model/User.java
with
35 additions
and
46 deletions
+35
-46
pom.xml
+
4
−
4
View file @
0bedc07e
...
...
@@ -9,10 +9,10 @@
<relativePath/>
<!-- lookup parent from repository -->
</parent>
<groupId>
com.sphere.compentency.app
</groupId>
<artifactId>
compentency-
t
oo
l
</artifactId>
<artifactId>
compentency-
passb
oo
k
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<name>
compentency-
t
oo
l
</name>
<description>
compentency-
t
oo
l
project for Spring Boot
</description>
<name>
compentency-
passb
oo
k
</name>
<description>
compentency-
passb
oo
k
project for Spring Boot
</description>
<properties>
<java.version>
1.8
</java.version>
</properties>
...
...
@@ -81,7 +81,7 @@
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
com.sphere.compentency
tool
.kafka.consumer.api.kafkaConsumer
</mainClass>
<mainClass>
com.sphere.compentency.kafka.consumer.api.kafkaConsumer
</mainClass>
</configuration>
</plugin>
</plugins>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/Compentency
Tool
Application.java
→
src/main/java/com/sphere/compentency/CompentencyApplication.java
+
4
−
4
View file @
0bedc07e
package
com.sphere.compentency
tool
;
package
com.sphere.compentency
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
@SpringBootApplication
public
class
Compentency
Tool
Application
{
public
class
CompentencyApplication
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
Compentency
Tool
Application
.
class
,
args
);
SpringApplication
.
run
(
CompentencyApplication
.
class
,
args
);
}
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/common/utils/AppProperties.java
→
src/main/java/com/sphere/compentency/common/utils/AppProperties.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.common.utils
;
package
com.sphere.compentency.common.utils
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Component
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/common/utils/propertiesCache.java
→
src/main/java/com/sphere/compentency/common/utils/propertiesCache.java
+
1
−
4
View file @
0bedc07e
package
com.sphere.compentencytool.common.utils
;
import
org.apache.commons.lang3.StringUtils
;
package
com.sphere.compentency.common.utils
;
public
class
propertiesCache
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/constants/Constants.java
→
src/main/java/com/sphere/compentency/constants/Constants.java
+
2
−
2
View file @
0bedc07e
package
com.sphere.compentency
tool
.constants
;
package
com.sphere.compentency.constants
;
import
com.sphere.compentency
tool
.common.utils.AppProperties
;
import
com.sphere.compentency.common.utils.AppProperties
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/controller/Controller.java
→
src/main/java/com/sphere/compentency/controller/Controller.java
+
4
−
4
View file @
0bedc07e
package
com.sphere.compentency
tool
.controller
;
package
com.sphere.compentency.controller
;
import
com.sphere.compentency
tool
.model.GetPassbook
;
import
com.sphere.compentency
tool
.model.Passbook
;
import
com.sphere.compentency
tool
.repository.passbookRepository
;
import
com.sphere.compentency.model.GetPassbook
;
import
com.sphere.compentency.model.Passbook
;
import
com.sphere.compentency.repository.passbookRepository
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/exception/ErrorDetails.java
→
src/main/java/com/sphere/compentency/exception/ErrorDetails.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.exception
;
package
com.sphere.compentency.exception
;
import
java.util.Date
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/exception/GlobalExceptionHandler.java
→
src/main/java/com/sphere/compentency/exception/GlobalExceptionHandler.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.exception
;
package
com.sphere.compentency.exception
;
import
java.util.Date
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/exception/ResourceNotFoundException.java
→
src/main/java/com/sphere/compentency/exception/ResourceNotFoundException.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.exception
;
package
com.sphere.compentency.exception
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.web.bind.annotation.ResponseStatus
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/external/service/ExternalService.java
→
src/main/java/com/sphere/compentency/external/service/ExternalService.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.external.service
;
package
com.sphere.compentency.external.service
;
import
java.util.Map
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/external/service/impl/ExternalServiceImpl.java
→
src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
+
3
−
3
View file @
0bedc07e
package
com.sphere.compentency
tool
.external.service.impl
;
package
com.sphere.compentency.external.service.impl
;
import
java.util.Arrays
;
import
java.util.Map
;
...
...
@@ -13,8 +13,8 @@ import org.springframework.stereotype.Service;
import
org.springframework.util.MultiValueMap
;
import
org.springframework.web.client.RestTemplate
;
import
com.sphere.compentency
tool
.common.utils.AppProperties
;
import
com.sphere.compentency
tool
.external.service.ExternalService
;
import
com.sphere.compentency.common.utils.AppProperties
;
import
com.sphere.compentency.external.service.ExternalService
;
@Service
public
class
ExternalServiceImpl
implements
ExternalService
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/externalservice/controller/ServiceController.java
→
src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
+
2
−
2
View file @
0bedc07e
package
com.sphere.compentency
tool
.externalservice.controller
;
package
com.sphere.compentency.externalservice.controller
;
import
java.util.Map
;
...
...
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.sphere.compentency
tool
.external.service.ExternalService
;
import
com.sphere.compentency.external.service.ExternalService
;
@RestController
@RequestMapping
(
"/compentencytool/v1"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/kafka/consumer/api/Api_services.java
→
src/main/java/com/sphere/compentency/kafka/consumer/api/Api_services.java
+
2
−
3
View file @
0bedc07e
package
com.sphere.compentency
tool
.kafka.consumer.api
;
package
com.sphere.compentency.kafka.consumer.api
;
import
com.fasterxml.jackson.core.JsonProcessingException
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.sphere.compentency
tool
.common.utils.propertiesCache
;
import
com.sphere.compentency.common.utils.propertiesCache
;
import
org.apache.http.client.HttpClient
;
import
org.apache.http.impl.client.HttpClientBuilder
;
import
org.json.JSONArray
;
...
...
@@ -14,7 +14,6 @@ import org.springframework.web.client.RestTemplate;
import
java.util.Arrays
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.ResourceBundle
;
public
class
Api_services
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/kafka/consumer/api/SearchObject.java
→
src/main/java/com/sphere/compentency/kafka/consumer/api/SearchObject.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.kafka.consumer.api
;
package
com.sphere.compentency.kafka.consumer.api
;
import
lombok.Getter
;
import
lombok.Setter
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/kafka/consumer/api/kafkaConsumer.java
→
src/main/java/com/sphere/compentency/kafka/consumer/api/kafkaConsumer.java
+
2
−
6
View file @
0bedc07e
package
com.sphere.compentency
tool
.kafka.consumer.api
;
package
com.sphere.compentency.kafka.consumer.api
;
import
com.sphere.compentencytool.common.utils.AppProperties
;
import
com.sphere.compentencytool.common.utils.propertiesCache
;
import
com.sphere.compentency.common.utils.propertiesCache
;
import
org.apache.kafka.clients.consumer.ConsumerConfig
;
import
org.apache.kafka.clients.consumer.ConsumerRecord
;
import
org.apache.kafka.clients.consumer.ConsumerRecords
;
...
...
@@ -12,15 +11,12 @@ import org.json.JSONObject;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.context.ConfigurableApplicationContext
;
import
java.time.Duration
;
import
java.util.Arrays
;
import
java.util.Properties
;
import
java.util.ResourceBundle
;
@SpringBootApplication
public
class
kafkaConsumer
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/model/GetPassbook.java
→
src/main/java/com/sphere/compentency/model/GetPassbook.java
+
1
−
3
View file @
0bedc07e
package
com.sphere.compentency
tool
.model
;
package
com.sphere.compentency.model
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.hibernate.annotations.Type
;
import
javax.persistence.Column
;
@Getter
@Setter
public
class
GetPassbook
implements
Cloneable
{
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/model/GetPassbookBase.java
→
src/main/java/com/sphere/compentency/model/GetPassbookBase.java
+
1
−
2
View file @
0bedc07e
package
com.sphere.compentency
tool
.model
;
package
com.sphere.compentency.model
;
import
lombok.Getter
;
import
lombok.Setter
;
import
javax.persistence.Column
;
import
java.util.List
;
@Getter
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/model/Passbook.java
→
src/main/java/com/sphere/compentency/model/Passbook.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.model
;
package
com.sphere.compentency.model
;
import
com.vladmihalcea.hibernate.type.json.JsonType
;
import
lombok.Getter
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/model/Request.java
→
src/main/java/com/sphere/compentency/model/Request.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.model
;
package
com.sphere.compentency.model
;
import
lombok.Getter
;
import
lombok.Setter
;
import
org.hibernate.annotations.Type
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/sphere/compentency
tool
/model/User.java
→
src/main/java/com/sphere/compentency/model/User.java
+
1
−
1
View file @
0bedc07e
package
com.sphere.compentency
tool
.model
;
package
com.sphere.compentency.model
;
import
javax.persistence.Column
;
import
javax.persistence.Entity
;
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets