Skip to content

Commit 0994b10

Browse files
authored
Develop (#43)
* #26 #25 * code style fixed (#28) * Feature/http client tests code quilty (#30) * code style fixed * #29 #26 * code-quilty * code-quilty (#32) * code style fixs * release 0.0.23 updated * release 0.0.23 updated * #23 * #25 * #25 (#35) * improve coverage * improve coverage * improve coverage * improve coverage * Feature/imporve coverage (#37) * #25 * improve coverage * improve coverage * improve coverage * improve coverage * #39 (#40) * Feature/validation coverage (#42) * #39 * #41
1 parent cd38e4d commit 0994b10

38 files changed

+678
-101
lines changed

pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<java.version>1.7</java.version>
2828

2929
<gson.version>2.8.0</gson.version>
30+
<javax.validation.api.version>1.0.0.GA</javax.validation.api.version>
3031
<jackson.version>2.8.5</jackson.version>
3132
<commons.lang.version>3.5</commons.lang.version>
3233
<slf4.version>1.7.21</slf4.version>
@@ -81,6 +82,12 @@
8182
<version>${commons.lang.version}</version>
8283
</dependency>
8384

85+
<dependency>
86+
<groupId>javax.validation</groupId>
87+
<artifactId>validation-api</artifactId>
88+
<version>${javax.validation.api.version}</version>
89+
</dependency>
90+
8491
<dependency>
8592
<groupId>org.apache.httpcomponents</groupId>
8693
<artifactId>httpclient</artifactId>

src/main/java/io/github/rhkiswani/javaff/detector/ApiDetectorUtil.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public class ApiDetectorUtil {
3535
private static final Boolean isApacheHttpClientAvailable = ApiDetectorFactory.getDetector().isAvailable(APACHE_HTTPCLIENT_API_METADATA);
3636

3737

38-
private ApiDetectorUtil(){}
39-
4038
public static Boolean isJPAAvailable() {
4139
return isJPAAvailable;
4240
}

src/main/java/io/github/rhkiswani/javaff/exceptions/ExceptionUtil.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
*/
2525
public class ExceptionUtil {
2626

27-
private ExceptionUtil(){}
28-
2927
public static void handle(Throwable t){
3028
if (t == null){
3129
throw new IllegalParamException(SmartException.NULL_VAL, "Exception");

src/main/java/io/github/rhkiswani/javaff/exceptions/SmartException.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public class SmartException extends RuntimeException{
3535
public static final String NEGATIVE_VAL = "NEGATIVE_VAL";
3636
public static final String HTTP_ERROR = "HTTP_ERROR";
3737
public static final String NO_IMPLEMENTATION_FOUND = "NO_IMPLEMENTATION_FOUND";
38+
public static final String NO_IMPLEMENTATION_FOUND_WITH_NO_LINK = "NO_IMPLEMENTATION_FOUND_WITH_NO_LINK";
3839

3940
private Object[] errorMsgParams = null;
4041

src/main/java/io/github/rhkiswani/javaff/factory/AbstractFactory.java

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import io.github.rhkiswani.javaff.exceptions.SmartException;
1919
import io.github.rhkiswani.javaff.factory.exceptions.NoImplementationFoundException;
2020
import io.github.rhkiswani.javaff.lang.exceptions.IllegalParamException;
21+
import io.github.rhkiswani.javaff.lang.utils.ObjectUtils;
22+
import io.github.rhkiswani.javaff.lang.utils.StringUtils;
2123

2224
import java.util.Collection;
2325
import java.util.LinkedHashMap;
@@ -39,24 +41,37 @@ public void add(Class targetClass, T t){
3941
if (map.get(targetClass) != null){
4042
throw new IllegalParamException(SmartException.ALREADY_EXIST, targetClass, "please use overrideImp method instated");
4143
}
44+
if (targetClass.isPrimitive()){
45+
targetClass = ObjectUtils.primitiveToWrapper(targetClass);
46+
}
4247
map.put(targetClass, t);
4348
}
4449

4550
public void overrideImp(Class targetClass, T t){
51+
if (targetClass.isPrimitive()){
52+
targetClass = ObjectUtils.primitiveToWrapper(targetClass);
53+
}
4654
map.put(targetClass, t);
4755
}
4856

4957
public T remove(Class targetClass){
58+
if (targetClass.isPrimitive()){
59+
targetClass = ObjectUtils.primitiveToWrapper(targetClass);
60+
}
5061
return map.remove(targetClass);
5162
}
5263

53-
protected T create(Class targetClass){
54-
if (targetClass == null){
64+
protected T create(Class clazz){
65+
if (clazz == null){
5566
throw new IllegalParamException(SmartException.NULL_VAL, "Target Class");
5667
}
5768
if (userDefaultImpl != null){
5869
return userDefaultImpl;
5970
}
71+
Class targetClass = clazz;
72+
if (targetClass.isPrimitive()){
73+
targetClass = ObjectUtils.primitiveToWrapper(targetClass);
74+
}
6075
Set<Class> classSet = map.keySet();
6176
Class[] keys = classSet.toArray(new Class[classSet.size()]);
6277
for (int i = keys.length - 1 ; i >=0 ; i--){
@@ -77,10 +92,14 @@ public void setDefault(T userDefaultImpl) {
7792
}
7893

7994
protected T getDefault(Class targetClazz) {
80-
throw new NoImplementationFoundException(SmartException.NO_IMPLEMENTATION_FOUND, this.getClass().getSimpleName(), this.getClass().getSimpleName(), getDefaultImplementationUrl());
95+
if (StringUtils.isNotEmpty(getDefaultImplementationUrl())){
96+
throw new NoImplementationFoundException(SmartException.NO_IMPLEMENTATION_FOUND, targetClazz, this.getClass().getSimpleName(), getDefaultImplementationUrl());
97+
} else {
98+
throw new NoImplementationFoundException(SmartException.NO_IMPLEMENTATION_FOUND_WITH_NO_LINK, targetClazz, this.getClass().getSimpleName());
99+
}
81100
}
82101

83102
protected String getDefaultImplementationUrl(){
84-
return "https://mvnrepository.com";
103+
return "";
85104
}
86105
}

src/main/java/io/github/rhkiswani/javaff/format/DefaultFormatter.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,8 @@ protected O format(I i, Object[] params) throws FormatException {
3333
return null;
3434
}
3535
if (!ArraysUtils.isEmpty(params)){
36-
try {
37-
ArraysUtils.replace(params, null, "");
38-
return formatVal(i, params);
39-
} catch (FormatException e){
40-
throw e;
41-
} catch (Throwable t ){
42-
throw new FormatException(t.getMessage());
43-
}
44-
36+
ArraysUtils.replace(params, null, "");
37+
return formatVal(i, params);
4538
}
4639
return formatVal(i, new Object[]{});
4740
}

src/main/java/io/github/rhkiswani/javaff/format/FormatFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected Formatter getDefault(Class targetClazz){
4343
return new StringFormatter();
4444
}
4545

46-
public static Formatter getFormatter(Class aClass) {
46+
public static <I, O> Formatter<I, O> getFormatter(Class aClass) {
4747
return instance.create(aClass);
4848
}
4949
}

src/main/java/io/github/rhkiswani/javaff/format/FormatUtil.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
*/
2323
public class FormatUtil {
2424

25-
private FormatUtil(){}
26-
2725
public static String formatString(String str, Object... params){
2826
return format(str, params);
2927
}

src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public Map<String, String> head(String url, Map<String, String> params, Map<Stri
139139
HttpHead method = new HttpHead(url);
140140
CloseableHttpClient client = prepareRequest(method, params);
141141
setHeaders(method, headers);
142-
HttpResponse response= client.execute(method);
142+
HttpResponse response = client.execute(method);
143143
Header[] s = response.getAllHeaders();
144144
Map<String, String> returnedHeaders = new HashMap<>();
145145
for (Header header : s) {
@@ -162,10 +162,6 @@ public Map<String, String> options(String url, Map<String, String> params, Map<S
162162
return head(url, params, headers);
163163
}
164164

165-
@Override
166-
public String patch(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException {
167-
return doRequest(new HttpPatch(url), params, headers);
168-
}
169165

170166
@Override
171167
public String patchJson(String url, String json, Map<String, String> headers) throws HttpClientException {

src/main/java/io/github/rhkiswani/javaff/httpclient/HttpClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,5 @@ public interface HttpClient {
4242

4343
Map<String, String> options(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException;
4444

45-
String patch(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException;
46-
4745
String patchJson(String url, String json, Map<String, String> headers) throws HttpClientException;
4846
}

0 commit comments

Comments
 (0)