Skip to content

Commit f60baf4

Browse files
allanimallanim
authored
Merge pull request #45 from allanim/master
Update Build & Serializable object
2 parents e82ef91 + 11d2191 commit f60baf4

39 files changed

Lines changed: 111 additions & 47 deletions

‎.codeclimate.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ plugins:
3333
enabled: true
3434
config:
3535
sonar.java.source: 8
36+
checks:
37+
squid:S1948:
38+
enabled: false
3639
exclude_patterns:
3740
- 'config/'
3841
- '**/dist/'

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![Javadocs](http://javadoc.io/badge/com.vogle.sbpayment/sbpayment-client.svg)](http://javadoc.io/doc/com.vogle.sbpayment/sbpayment-client)
66
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
77
[![Gitter](https://badges.gitter.im/vogle/sbpayment.svg)](https://gitter.im/vogle/sbpayment?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
8-
[![Gradle Scan](https://img.shields.io/badge/Gradle-Scan-blue.svg)](https://vogle.page.link/scan)
98

109
[![Build Status](https://travis-ci.org/vogle/sbpayment-java.svg?branch=master)](https://travis-ci.org/vogle/sbpayment-java)
1110
[![Coveralls](https://img.shields.io/coveralls/github/vogle/sbpayment-java.svg)](https://coveralls.io/github/vogle/sbpayment-java?branch=master)
@@ -165,6 +164,7 @@ You will be asked to sign a contribution agreement after creating the first one.
165164

166165
## License
167166
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
167+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvogle%2Fsbpayment-java.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvogle%2Fsbpayment-java?ref=badge_shield)
168168

169169
Copyright 2019 Vogle Labs.
170170

‎README_JA.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[![Javadocs](http://javadoc.io/badge/com.vogle.sbpayment/sbpayment-client.svg)](http://javadoc.io/doc/com.vogle.sbpayment/sbpayment-client)
66
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
77
[![Gitter](https://badges.gitter.im/vogle/sbpayment.svg)](https://gitter.im/vogle/sbpayment?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
8-
[![Gradle Scan](https://img.shields.io/badge/Gradle-Scan-blue.svg)](https://vogle.page.link/scan)
98

109
[![Build Status](https://travis-ci.org/vogle/sbpayment-java.svg?branch=master)](https://travis-ci.org/vogle/sbpayment-java)
1110
[![Coveralls](https://img.shields.io/coveralls/github/vogle/sbpayment-java.svg)](https://coveralls.io/github/vogle/sbpayment-java?branch=master)
@@ -160,6 +159,7 @@ See Interface: [PayEasyPayment](sbpayment-payeasy/src/main/java/com/vogle/sbpaym
160159

161160
## ライセンス
162161
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
162+
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fvogle%2Fsbpayment-java.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fvogle%2Fsbpayment-java?ref=badge_shield)
163163

164164
Copyright 2019 Vogle Labs.
165165

‎build.gradle‎

Lines changed: 29 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,6 @@ buildScan {
3838
}
3939
}
4040

41-
task('aa') {
42-
print("aaa")
43-
print(project.hasProperty('gitter.url'))
44-
print(project.property('gitter.url'))
45-
}
46-
4741
// Configuration to apply to all the projects
4842
allprojects {
4943

@@ -120,36 +114,6 @@ configure(javaprojects) {
120114
}
121115
}
122116

123-
// Apply sonarqube
124-
apply plugin: 'org.sonarqube'
125-
sonarqube {
126-
properties {
127-
def hasIntegTest = new File(projectDir, 'src/integTest/java').directory
128-
129-
property "sonar.sourceEncoding", "UTF-8"
130-
property "sonar.sources", "src/main/java"
131-
property "sonar.scm.disabled ", "true"
132-
133-
if (hasIntegTest) {
134-
property "sonar.tests", "src/test/java,src/integTest/java"
135-
} else {
136-
property "sonar.tests", "src/test/java"
137-
}
138-
139-
property "sonar.java.coveragePlugin", "jacoco"
140-
if (hasIntegTest) {
141-
property "sonar.jacoco.reportPaths", "build/jacoco/test.exec,build/jacoco/integrationTest.exec"
142-
property "sonar.junit.reportPaths", "build/test-results/test,build/test-results/integrationTest"
143-
} else {
144-
property "sonar.jacoco.reportPaths", "build/jacoco/test.exec"
145-
property "sonar.junit.reportPaths", "build/test-results/test"
146-
}
147-
148-
property "sonar.java.pmd.reportPaths", "build/reports/pmd/main.xml"
149-
property "sonar.java.checkstyle.reportPaths", "build/reports/checkstyle/main.xml"
150-
}
151-
}
152-
153117
}
154118

155119
// Configuration to apply to JAVA Projects
@@ -214,6 +178,35 @@ configure(publishedprojects) {
214178
}
215179
}
216180

181+
// Apply sonarqube
182+
apply plugin: 'org.sonarqube'
183+
sonarqube {
184+
properties {
185+
def hasIntegTest = new File(projectDir, 'src/integTest/java').directory
186+
187+
property "sonar.sourceEncoding", "UTF-8"
188+
property "sonar.sources", "src/main/java"
189+
property "sonar.scm.disabled ", "true"
190+
191+
if (hasIntegTest) {
192+
property "sonar.tests", "src/test/java,src/integTest/java"
193+
} else {
194+
property "sonar.tests", "src/test/java"
195+
}
196+
197+
property "sonar.java.coveragePlugin", "jacoco"
198+
if (hasIntegTest) {
199+
property "sonar.jacoco.reportPaths", "build/jacoco/test.exec,build/jacoco/integrationTest.exec"
200+
property "sonar.junit.reportPaths", "build/test-results/test,build/test-results/integrationTest"
201+
} else {
202+
property "sonar.jacoco.reportPaths", "build/jacoco/test.exec"
203+
property "sonar.junit.reportPaths", "build/test-results/test"
204+
}
205+
206+
property "sonar.java.pmd.reportPaths", "build/reports/pmd/main.xml"
207+
property "sonar.java.checkstyle.reportPaths", "build/reports/checkstyle/main.xml"
208+
}
209+
}
217210
}
218211

219212
// report tools

‎config/vogle-ruleset-6.7.x.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<rule ref="category/java/codestyle.xml/EmptyMethodInAbstractClassShouldBeAbstract"/>
9696
<rule ref="category/java/codestyle.xml/ExtendsObject"/>
9797
<rule ref="category/java/codestyle.xml/FieldDeclarationsShouldBeAtStartOfClass"/>
98-
<rule ref="category/java/codestyle.xml/FieldNamingConventions"/>
98+
<!--<rule ref="category/java/codestyle.xml/FieldNamingConventions"/>-->
9999
<rule ref="category/java/codestyle.xml/ForLoopShouldBeWhileLoop"/>
100100
<!--<rule ref="category/java/codestyle.xml/ForLoopsMustUseBraces"/>-->
101101
<rule ref="category/java/codestyle.xml/FormalParameterNamingConventions"/>
@@ -317,7 +317,7 @@
317317
<rule ref="category/java/errorprone.xml/MethodWithSameNameAsEnclosingClass"/>
318318
<rule ref="category/java/errorprone.xml/MisplacedNullCheck"/>
319319
<rule ref="category/java/errorprone.xml/MissingBreakInSwitch"/>
320-
<rule ref="category/java/errorprone.xml/MissingSerialVersionUID"/>
320+
<!-- <rule ref="category/java/errorprone.xml/MissingSerialVersionUID"/>-->
321321
<rule ref="category/java/errorprone.xml/MissingStaticMethodInNonInstantiatableClass"/>
322322
<rule ref="category/java/errorprone.xml/MoreThanOneLogger"/>
323323
<rule ref="category/java/errorprone.xml/NonCaseLabelInSwitchStatement"/>
@@ -357,7 +357,7 @@
357357
<rule ref="category/java/multithreading.xml/DontCallThreadRun"/>
358358
<rule ref="category/java/multithreading.xml/DoubleCheckedLocking"/>
359359
<rule ref="category/java/multithreading.xml/NonThreadSafeSingleton"/>
360-
<rule ref="category/java/multithreading.xml/UnsynchronizedStaticDateFormatter"/>
360+
<!-- <rule ref="category/java/multithreading.xml/UnsynchronizedStaticDateFormatter"/>-->
361361
<!--<rule ref="category/java/multithreading.xml/UseConcurrentHashMap"/>-->
362362
<rule ref="category/java/multithreading.xml/UseNotifyAllInsteadOfNotify"/>
363363

‎gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
org.gradle.parallel=true
2-
org.gradle.caching=true
32

43
group=com.vogle.sbpayment

‎sbpayment-client/src/main/java/com/vogle/sbpayment/client/SpsResult.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import lombok.Getter;
2222
import lombok.ToString;
2323

24+
import java.io.Serializable;
2425
import java.util.Map;
2526

2627
/**
@@ -29,7 +30,9 @@
2930
* @author Allan Im
3031
**/
3132
@ToString
32-
public class SpsResult<T extends SpsResponse> {
33+
public class SpsResult<T extends SpsResponse> implements Serializable {
34+
35+
private static final long serialVersionUID = 6757501412149715585L;
3336

3437
/**
3538
* HTTP Status Code

‎sbpayment-client/src/main/java/com/vogle/sbpayment/client/requests/SpsRequest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818

1919
import com.vogle.sbpayment.client.responses.SpsResponse;
2020

21+
import java.io.Serializable;
22+
2123
/**
2224
* Request interface
2325
*
2426
* @author Allan Im
2527
**/
26-
public interface SpsRequest<T extends SpsResponse> {
28+
public interface SpsRequest<T extends SpsResponse> extends Serializable {
2729

2830
/**
2931
* Gets a Features ID

‎sbpayment-client/src/main/java/com/vogle/sbpayment/client/responses/CommonElements.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
@Data
2828
public abstract class CommonElements implements SpsResponse {
2929

30+
private static final long serialVersionUID = 1550108062521728517L;
31+
3032
@JacksonXmlProperty(isAttribute = true)
3133
private String id;
3234

‎sbpayment-client/src/main/java/com/vogle/sbpayment/client/responses/SpsResponse.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616

1717
package com.vogle.sbpayment.client.responses;
1818

19+
import java.io.Serializable;
20+
1921
/**
2022
* Response interface
2123
*
2224
* @author Allan Im
2325
**/
24-
public interface SpsResponse {
26+
public interface SpsResponse extends Serializable {
2527

2628
/**
2729
* Features ID

0 commit comments

Comments
 (0)