Skip to content

Feature/http client tests code quilty #30

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.

Sign up for GitHub

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
OyaAIProd merged 3 commits into from
Nov 26, 2016
Merged

Feature/http client tests code quilty #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
790355e
code style fixed
OyaAIProd Nov 26, 2016
8ed5c2c
#29 #26
OyaAIProd Nov 26, 2016
3d66d10
merge with develop
OyaAIProd Nov 26, 2016
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
38 changes: 26 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<mock.version>1.10.19</mock.version>
<powermock.version>1.6.6</powermock.version>
<log4j.version>2.0-alpha2</log4j.version>
<jetty.version>9.4.0.RC2</jetty.version>

<!-- plugins -->
<mvn.plugin.java.compiler.version>3.6.0</mvn.plugin.java.compiler.version>
Expand All @@ -59,7 +60,7 @@
<mvn.plugin.javadoc.version>2.10.4</mvn.plugin.javadoc.version>
<mvn.plugin.gpg.version>1.6</mvn.plugin.gpg.version>
<mvn.plugin.coveralls.version>4.3.0</mvn.plugin.coveralls.version>
<mvn.plugin.jacoco.version>0.7.7.201606060606</mvn.plugin.jacoco.version>
<mvn.plugin.cobertura.version>2.7</mvn.plugin.cobertura.version>

</properties>

Expand Down Expand Up @@ -169,6 +170,21 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>


</dependencies>

<distributionManagement>
Expand Down Expand Up @@ -203,17 +219,15 @@
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>${mvn.plugin.jacoco.version}</version>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
</executions>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<version>${mvn.plugin.cobertura.version}</version>
<configuration>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
</configuration>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/github/rhkiswani/javaff/exceptions/SmartException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ public SmartException(Throwable cause) {
@Override
public String getMessage() {
if (!ArraysUtils.isEmpty(errorMsgParams)){
return LocaleUtil.getString(super.getMessage(), errorMsgParams);
return LocaleUtil.getString(super.getMessage(), SmartException.class, errorMsgParams);
} else {
return LocaleUtil.getString(super.getMessage());
return LocaleUtil.getString(super.getMessage(), SmartException.class, null);
}
}
}
5 changes: 3 additions & 2 deletions src/main/java/io/github/rhkiswani/javaff/httpclient/ApacheHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* @since 0.0.20
*
*/
class ApacheHttpClient implements HttpClient{
public class ApacheHttpClient implements HttpClient{

@Override
public String postJson(String url, String json, Map<String, String> headers) throws HttpClientException {
Expand Down Expand Up @@ -94,7 +94,8 @@ private CloseableHttpClient prepareRequest(HttpRequestBase method, Map<String, S
if(params != null){
List<NameValuePair> urlParameters = new ArrayList<>();
for (String key : params.keySet()) {
urlParameters.add(new BasicNameValuePair(key, params.get(key)));

urlParameters.add(new BasicNameValuePair(key, params.get(key)));
}
if (method instanceof HttpEntityEnclosingRequestBase){
((HttpEntityEnclosingRequestBase) method).setEntity(new UrlEncodedFormEntity(urlParameters));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/rhkiswani/javaff/httpclient/HttpClientWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public String post(String url, Map<String, String> params, Map<String, String> h

@Override
public String put(String url, Map<String, String> params, Map<String, String> headers) throws HttpClientException {
return httpClient.post(url, params, headers);
return httpClient.put(url, params, headers);
}

@Override
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/rhkiswani/javaff/json/exceptions/JsonException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ public class JsonException extends SmartException{
public JsonException(String errorMsg, Object... errorMsgParams) {
super(errorMsg, errorMsgParams);
}

}
5 changes: 0 additions & 5 deletions src/main/java/io/github/rhkiswani/javaff/lang/utils/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
package io.github.rhkiswani.javaff.lang.utils;

import io.github.rhkiswani.javaff.lang.ToStringHelper;
import io.github.rhkiswani.javaff.security.escape.EscapeersFactory;

/**
* @author Mohamed Kiswani
Expand All @@ -29,10 +28,6 @@ public static String toString(Object obj) {
return new ToStringHelper().toString(obj);
}

public static String escape(String input) {
return (String) EscapeersFactory.getEscapeer(String.class).escape(input);
}

public static boolean isEmpty(String input){
return input == null || input.isEmpty();
}
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/io/github/rhkiswani/javaff/locale/LocaleUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ private LocaleUtil(){
DEFAULT_MSGS.put(SmartException.NO_IMPLEMENTATION_FOUND, "No implementation found for {0} you need to set implementation through {1}.instance().add or add {2} to your classpath");
}

public static String getString(String key, Object... params){
@Deprecated
/**
* use public static String getString(String key, Class targetClass, Object[] params) instead
*/
public static String getString(String key, Object[] params){
Class targetClass = ReflectionUtil.getCallerClass(1);
return getString(key, targetClass, params);
}

public static String getString(String key, Class targetClass, Object[] params) {
LocaleWorker worker = LocaleWorkersFactory.getLocalWorker(targetClass);
String label = worker.getString(key, params);
if (!StringUtils.isEmpty(label) && label.equals(key) && DEFAULT_MSGS.get(key) != null){
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/io/github/rhkiswani/javaff/log/LogWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,26 +33,26 @@ public LogWrapper(Log log) {

@Override
public void debug(String message, Object... params) {
log.debug(LocaleUtil.getString(message, params));
log.debug(LocaleUtil.getString(message, LogWrapper.class, params));
}

@Override
public void info(String message, Object... params) {
log.info(LocaleUtil.getString(message, params));
log.info(LocaleUtil.getString(message, LogWrapper.class, params));
}

@Override
public void warn(String message, Object... params) {
log.warn(LocaleUtil.getString(message, params));
log.warn(LocaleUtil.getString(message, LogWrapper.class, params));
}

@Override
public void error(String message, Object... params) {
log.error(LocaleUtil.getString(message, params));
log.error(LocaleUtil.getString(message, LogWrapper.class, params));
}

@Override
public void error(String message, Exception e, Object... params) {
log.error(LocaleUtil.getString(message, params), e);
log.error(LocaleUtil.getString(message, LogWrapper.class, params), e);
}
}
28 changes: 19 additions & 9 deletions src/main/java/io/github/rhkiswani/javaff/reflection/DefaultReflectionHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.github.rhkiswani.javaff.reflection.exception.ReflectionException;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;

Expand All @@ -29,7 +30,13 @@
* @see io.github.rhkiswani.javaff.reflection.ReflectionHelper
*/
public class DefaultReflectionHelper<T> implements ReflectionHelper<T>{
private static final ArrayList<String> IGNORE_NAMES = new ArrayList<>();

static {
IGNORE_NAMES.add("$jacocoData");
IGNORE_NAMES.add("__cobertura_counters");
IGNORE_NAMES.add("this$");
}
@Override
public List<Field> scanFieldsByAnnotation(Class clazz, Class... annotations) throws ReflectionException {
if (clazz == null){
Expand All @@ -43,8 +50,7 @@ public List<Field> scanFieldsByAnnotation(Class clazz, Class... annotations) thr
for (Field field : fields) {
for (Class aClass : annotations) {
if (field.isAnnotationPresent(aClass)){
if (field != null && field.getName().contains("$jacocoData")){
// ignore jacoco:report added fields
if (isIgnored(field)){
continue;
}
list.add(field);
Expand Down Expand Up @@ -80,8 +86,7 @@ public Field getField(Class clazz, String fieldName) throws ReflectionException
}
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
if (field != null && field.getName().contains("$jacocoData")){
// ignore jacoco:report added fields
if (isIgnored(field)){
continue;
}
if (field.getName().equals(fieldName)){
Expand Down Expand Up @@ -112,11 +117,7 @@ public List<Field> getFields(Class clazz) {
LinkedList<Field> list = new LinkedList<Field>();
Field[] fields = clazz.getDeclaredFields();
for (Field field : fields) {
if (field.getName().contains("this$")){
continue;
}
if (field != null && field.getName().contains("$jacocoData")){
// ignore jacoco:report added fields
if (isIgnored(field)){
continue;
}
field.setAccessible(true);
Expand All @@ -128,6 +129,15 @@ public List<Field> getFields(Class clazz) {
return list;
}

private boolean isIgnored(Field field) {
for (String ignoreName : IGNORE_NAMES) {
if (field != null && field.getName().contains(ignoreName)){
return true;
}
}
return false;
}

public <V> V getFieldValue(T obj, String fieldName) throws ReflectionException {
try {
return (V) getField(obj.getClass(), fieldName).get(obj);
Expand Down
47 changes: 0 additions & 47 deletions src/main/java/io/github/rhkiswani/javaff/security/escape/DefaultEscapeHandler.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/main/java/io/github/rhkiswani/javaff/security/escape/EscapeHandler.java
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions src/main/java/io/github/rhkiswani/javaff/security/escape/EscapeUtil.java
View file
Open in desktop

This file was deleted.

Loading