diff --git a/NOTICE b/NOTICE index 8c51f50..36fb517 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/NOTICE b/apitrary-api-client/NOTICE index 8c51f50..36fb517 100644 --- a/apitrary-api-client/NOTICE +++ b/apitrary-api-client/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryApi.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryApi.java index b35b074..4ed5fb0 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryApi.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryApi.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryClient.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryClient.java index 3c64076..dd73230 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryClient.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/ApitraryClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/common/HttpStatus.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/common/HttpStatus.java index d63254b..15f9a50 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/common/HttpStatus.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/common/HttpStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/common/Timer.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/common/Timer.java index f8a3e14..4409c45 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/common/Timer.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/common/Timer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ClientException.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ClientException.java index be72533..d08d10f 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ClientException.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ClientException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/CommunicationErrorException.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/CommunicationErrorException.java index bd12ee2..7a00c32 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/CommunicationErrorException.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/CommunicationErrorException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/SerializationException.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/SerializationException.java index 728cf21..c4ce619 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/SerializationException.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/SerializationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ValidationConstraintViolationException.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ValidationConstraintViolationException.java index 52b35f3..104ac29 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ValidationConstraintViolationException.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/exception/ValidationConstraintViolationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/support/AbstractApitraryClient.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/support/AbstractApitraryClient.java index 4802b27..32f683d 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/support/AbstractApitraryClient.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/support/AbstractApitraryClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,19 +43,19 @@ public abstract class AbstractApitraryClient { /** Constant apitraryUrl="api.apitrary.com" */ protected static final String apitraryUrl = "api.apitrary.com"; - + /** Constant protocol="http://" */ - protected static final String protocol = "https://"; - + protected static final String protocol = "http://"; + /** Constant apiAuthHeaderKey="X-Api-Key" */ protected static final String apiAuthHeaderKey = "X-Api-Key"; - + /** Constant contentType="application/json" */ protected static final String contentType = "application/json"; /** Constant DEFAULTCONNECTIONTIMEOUT=60000 */ protected static final int DEFAULTCONNECTIONTIMEOUT = 60000; - + /** Constant DEFAULTRECEIVETIMEOUT=60000 */ protected static final int DEFAULTRECEIVETIMEOUT = 60000; diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ArrayUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ArrayUtil.java index dee9ef9..8e3ffaa 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ArrayUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ArrayUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ClassUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ClassUtil.java index 526cffb..8f48034 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ClassUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/ClassUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public static T getClassAnnotationValue(Class source, Class annotation, Stri try { value = (T) instance.annotationType().getMethod(attributeName).invoke(instance); } catch (Exception ex) { - log.warning(ex.getClass().getSimpleName()+": "+ex.getMessage()); + log.warning(ex.getClass().getSimpleName() + ": " + ex.getMessage()); } } return value; @@ -198,7 +198,7 @@ public static T getValueOf(Field field, Object reference, Class reference } return (T) toReturn; } catch (Exception e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); return null; } } @@ -231,7 +231,7 @@ public static T getValueOf(String fieldName, Object reference, Class refe T toReturn = (T) field.get(reference); return toReturn; } catch (Exception e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); return null; } } @@ -253,9 +253,9 @@ public static Object getValueOfField(Field field, Object ref) { try { value = field.get(ref); } catch (IllegalArgumentException e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); } catch (IllegalAccessException e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); } return value; } diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/HttpMethodUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/HttpMethodUtil.java index 04ab471..1621257 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/HttpMethodUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/HttpMethodUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/NormalizationUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/NormalizationUtil.java index 4106182..fde89b4 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/NormalizationUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/NormalizationUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,9 +51,9 @@ public static Normalizer getNormalizer(Response response) { try { normalizer = normalizerClazz.newInstance(); } catch (InstantiationException e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); } catch (IllegalAccessException e) { - log.warning(e.getClass().getSimpleName()+": "+e.getMessage()); + log.warning(e.getClass().getSimpleName() + ": " + e.getMessage()); } } return normalizer; diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/PathUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/PathUtil.java index cc42e87..931c972 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/PathUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/PathUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/RequestUtil.java b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/RequestUtil.java index 181533f..a68bc5f 100644 --- a/apitrary-api-client/src/main/java/com/apitrary/api/client/util/RequestUtil.java +++ b/apitrary-api-client/src/main/java/com/apitrary/api/client/util/RequestUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/NOTICE b/apitrary-api/NOTICE index 8c51f50..36fb517 100644 --- a/apitrary-api/NOTICE +++ b/apitrary-api/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Body.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Body.java index c9ce10f..bdb5ca6 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Body.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Body.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Default.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Default.java index b5b2d5e..9ee1374 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Default.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Default.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Method.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Method.java index 168ee23..6bcb064 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Method.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Method.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Normalized.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Normalized.java index fea0f42..6ffac54 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Normalized.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Normalized.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Path.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Path.java index 4ccb65d..bf0d998 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Path.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Path.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/PathVariable.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/PathVariable.java index cfcd8dc..e9fe233 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/PathVariable.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/PathVariable.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Query.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Query.java index ed21558..adbbda2 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Query.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Query.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/annotation/Required.java b/apitrary-api/src/main/java/com/apitrary/api/annotation/Required.java index 21d7f7b..83572f6 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/annotation/Required.java +++ b/apitrary-api/src/main/java/com/apitrary/api/annotation/Required.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/common/HttpMethod.java b/apitrary-api/src/main/java/com/apitrary/api/common/HttpMethod.java index 270a434..e0dffad 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/common/HttpMethod.java +++ b/apitrary-api/src/main/java/com/apitrary/api/common/HttpMethod.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/common/status/API.java b/apitrary-api/src/main/java/com/apitrary/api/common/status/API.java index 2ea403d..5cc5038 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/common/status/API.java +++ b/apitrary-api/src/main/java/com/apitrary/api/common/status/API.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/common/status/APIState.java b/apitrary-api/src/main/java/com/apitrary/api/common/status/APIState.java index ecefa05..bca2a7c 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/common/status/APIState.java +++ b/apitrary-api/src/main/java/com/apitrary/api/common/status/APIState.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/common/status/Info.java b/apitrary-api/src/main/java/com/apitrary/api/common/status/Info.java index ebbe573..fe7dc8e 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/common/status/Info.java +++ b/apitrary-api/src/main/java/com/apitrary/api/common/status/Info.java @@ -4,7 +4,7 @@ package com.apitrary.api.common.status; /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/common/status/Status.java b/apitrary-api/src/main/java/com/apitrary/api/common/status/Status.java index 06aaee3..b5409e0 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/common/status/Status.java +++ b/apitrary-api/src/main/java/com/apitrary/api/common/status/Status.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/APIStateRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/APIStateRequest.java index e999844..1e35191 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/APIStateRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/APIStateRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ */ @Method(HttpMethod.GET) @Path("/") -public class APIStateRequest extends Request implements Serializable{ +public class APIStateRequest extends Request implements Serializable { private static final long serialVersionUID = -2599282917840158769L; /** diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/DeleteRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/DeleteRequest.java index f81cbc9..f63bfac 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/DeleteRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/DeleteRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ */ @Method(HttpMethod.DELETE) @Path("/${entity}/${id}") -public class DeleteRequest extends Request implements Serializable{ +public class DeleteRequest extends Request implements Serializable { private static final long serialVersionUID = -8265792383976749317L; @Required diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/GetRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/GetRequest.java index ee24726..8bef8d4 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/GetRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/GetRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ */ @Method(HttpMethod.GET) @Path("/${entity}/${id}") -public class GetRequest extends Request implements Serializable{ +public class GetRequest extends Request implements Serializable { private static final long serialVersionUID = 626610613858401470L; @Required diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/PostRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/PostRequest.java index 6b40e6a..08080a3 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/PostRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/PostRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ */ @Method(HttpMethod.POST) @Path("/${entity}") -public class PostRequest extends Request implements Serializable{ +public class PostRequest extends Request implements Serializable { private static final long serialVersionUID = 7454490450438849781L; @Required diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/PutRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/PutRequest.java index 70420a9..8133c36 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/PutRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/PutRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,7 +35,7 @@ */ @Method(HttpMethod.PUT) @Path("/${entity}/${id}") -public class PutRequest extends Request implements Serializable{ +public class PutRequest extends Request implements Serializable { private static final long serialVersionUID = 7880320624981198826L; @Required diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/QueriedGetRequest.java b/apitrary-api/src/main/java/com/apitrary/api/request/QueriedGetRequest.java index b79904b..c45824a 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/QueriedGetRequest.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/QueriedGetRequest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ @Method(HttpMethod.GET) @Path("/${entity}") /* a/id || a?q= */ -public class QueriedGetRequest extends Request implements Serializable{ +public class QueriedGetRequest extends Request implements Serializable { private static final long serialVersionUID = 7586680719718414828L; @Required diff --git a/apitrary-api/src/main/java/com/apitrary/api/request/Request.java b/apitrary-api/src/main/java/com/apitrary/api/request/Request.java index 15abb9d..4c89247 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/request/Request.java +++ b/apitrary-api/src/main/java/com/apitrary/api/request/Request.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/APIStateResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/APIStateResponse.java index 0d8329e..b80ea3b 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/APIStateResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/APIStateResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/DeleteResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/DeleteResponse.java index 3d66eb9..c9e219e 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/DeleteResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/DeleteResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/GetResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/GetResponse.java index b578278..aab3b44 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/GetResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/GetResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/PostResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/PostResponse.java index e0b264f..5a9c0af 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/PostResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/PostResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/PutResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/PutResponse.java index a3c0beb..2a30bd7 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/PutResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/PutResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/QueriedGetResponse.java b/apitrary-api/src/main/java/com/apitrary/api/response/QueriedGetResponse.java index e970d3d..306e121 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/QueriedGetResponse.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/QueriedGetResponse.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/Response.java b/apitrary-api/src/main/java/com/apitrary/api/response/Response.java index 53761b6..5973212 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/Response.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/Response.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,9 +25,9 @@ * @author Denis Neuling (denisneuling@gmail.com) * */ -public abstract class Response implements Serializable{ +public abstract class Response implements Serializable { private static final long serialVersionUID = 5050233742143155805L; - + protected String result; protected String statusMessage; protected int statusCode; diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/DeleteNormalizer.java b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/DeleteNormalizer.java index 11be449..74d9d94 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/DeleteNormalizer.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/DeleteNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/GetNormalizer.java b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/GetNormalizer.java index ed51cc2..b02ad82 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/GetNormalizer.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/GetNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/Normalizer.java b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/Normalizer.java index fe1ae4d..049889c 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/Normalizer.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/Normalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PostNormalizer.java b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PostNormalizer.java index 791535a..965e535 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PostNormalizer.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PostNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PutNormalizer.java b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PutNormalizer.java index 348aaa5..24fb104 100644 --- a/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PutNormalizer.java +++ b/apitrary-api/src/main/java/com/apitrary/api/response/normalized/PutNormalizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-api/src/test/java/com/apitrary/api/common/status/GeneralCommonStatusTest.java b/apitrary-api/src/test/java/com/apitrary/api/common/status/GeneralCommonStatusTest.java index b10661c..51e429a 100644 --- a/apitrary-api/src/test/java/com/apitrary/api/common/status/GeneralCommonStatusTest.java +++ b/apitrary-api/src/test/java/com/apitrary/api/common/status/GeneralCommonStatusTest.java @@ -23,12 +23,12 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ public class GeneralCommonStatusTest { @Test - public void test_isSerializable(){ + public void test_isSerializable() { Assert.assertTrue(Serializable.class.isAssignableFrom(API.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(APIState.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(Info.class)); diff --git a/apitrary-api/src/test/java/com/apitrary/api/request/GeneralRequestTest.java b/apitrary-api/src/test/java/com/apitrary/api/request/GeneralRequestTest.java index 74bed49..eb8e4ea 100644 --- a/apitrary-api/src/test/java/com/apitrary/api/request/GeneralRequestTest.java +++ b/apitrary-api/src/test/java/com/apitrary/api/request/GeneralRequestTest.java @@ -23,12 +23,12 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ public class GeneralRequestTest { - + @Test - public void test_isSerializable(){ + public void test_isSerializable() { Assert.assertTrue(Serializable.class.isAssignableFrom(APIStateRequest.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(GetRequest.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(DeleteRequest.class)); diff --git a/apitrary-api/src/test/java/com/apitrary/api/response/GeneralResponseTest.java b/apitrary-api/src/test/java/com/apitrary/api/response/GeneralResponseTest.java index e9357a0..9c8ed55 100644 --- a/apitrary-api/src/test/java/com/apitrary/api/response/GeneralResponseTest.java +++ b/apitrary-api/src/test/java/com/apitrary/api/response/GeneralResponseTest.java @@ -23,12 +23,12 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ public class GeneralResponseTest { - + @Test - public void test_isSerializable(){ + public void test_isSerializable() { Assert.assertTrue(Serializable.class.isAssignableFrom(APIStateResponse.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(GetResponse.class)); Assert.assertTrue(Serializable.class.isAssignableFrom(DeleteResponse.class)); diff --git a/apitrary-orm/NOTICE b/apitrary-orm/NOTICE index 8c51f50..36fb517 100644 --- a/apitrary-orm/NOTICE +++ b/apitrary-orm/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-codec/NOTICE b/apitrary-orm/apitrary-orm-codec/NOTICE index 8c51f50..36fb517 100644 --- a/apitrary-orm/apitrary-orm-codec/NOTICE +++ b/apitrary-orm/apitrary-orm-codec/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-codec/pom.xml b/apitrary-orm/apitrary-orm-codec/pom.xml index bd5afe7..01a390d 100644 --- a/apitrary-orm/apitrary-orm-codec/pom.xml +++ b/apitrary-orm/apitrary-orm-codec/pom.xml @@ -47,7 +47,7 @@ com.apitrary apitrary-orm-core - 0.1 + 0.1.1-SNAPSHOT diff --git a/apitrary-orm/apitrary-orm-core/NOTICE b/apitrary-orm/apitrary-orm-core/NOTICE index 8c51f50..36fb517 100644 --- a/apitrary-orm/apitrary-orm-core/NOTICE +++ b/apitrary-orm/apitrary-orm-core/NOTICE @@ -1,4 +1,4 @@ -Copyright 2012 Denis Neuling +Copyright 2012-2013 Denis Neuling Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/ApitraryDaoSupport.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/ApitraryDaoSupport.java index f5c8197..1ffa47b 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/ApitraryDaoSupport.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/ApitraryDaoSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Codec.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Codec.java index 0810989..43844ca 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Codec.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Codec.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Column.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Column.java index c4cd58c..54c3e1b 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Column.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Column.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Entity.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Entity.java index b7cf053..11e2f88 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Entity.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Entity.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Id.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Id.java index 40e4db3..7199f40 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Id.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Id.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Reference.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Reference.java index 5208a1f..87cf42b 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Reference.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/annotations/Reference.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/codec/Codec.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/codec/Codec.java index c9323d2..5988a7b 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/codec/Codec.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/codec/Codec.java @@ -25,9 +25,9 @@ */ public abstract class Codec { - public Codec(){ + public Codec() { } - + /** *

* decode. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmDeleteException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmDeleteException.java index 25a9c1f..3cdd0bd 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmDeleteException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmDeleteException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmException.java index 08323d3..a6eb1a2 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmIdException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmIdException.java index 37b419c..49d6110 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmIdException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmIdException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmUpdateException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmUpdateException.java index 618a7d1..44c0ed8 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmUpdateException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/ApitraryOrmUpdateException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/DaoSupportUninitializedException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/DaoSupportUninitializedException.java index b5d7e88..ceb8a8f 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/DaoSupportUninitializedException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/DaoSupportUninitializedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/MappingException.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/MappingException.java index a838a31..80ed663 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/MappingException.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/exception/MappingException.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/conf/ApitraryOrmConfiguration.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/conf/ApitraryOrmConfiguration.java index ece1df1..02b557a 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/conf/ApitraryOrmConfiguration.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/conf/ApitraryOrmConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/proxy/LazyLoadingInterceptor.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/proxy/LazyLoadingInterceptor.java index 1e605b8..9618649 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/proxy/LazyLoadingInterceptor.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/internal/proxy/LazyLoadingInterceptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/json/filter/PropertyFilterMixIn.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/json/filter/PropertyFilterMixIn.java index 385ed77..f78c28d 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/json/filter/PropertyFilterMixIn.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/json/filter/PropertyFilterMixIn.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/marshalling/PayloadMarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/marshalling/PayloadMarshaller.java index fddce05..d9707ca 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/marshalling/PayloadMarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/marshalling/PayloadMarshaller.java @@ -82,18 +82,19 @@ public String marshall(T entity) { * Collect all column fields */ List allFields = ClassUtil.getAnnotatedFields(entity, Column.class); - + /* * Prepare property filter... */ List fields = new LinkedList(); - for(java.lang.reflect.Field field : allFields){ - if(!field.isAnnotationPresent(com.apitrary.orm.core.annotations.Codec.class)){ + for (java.lang.reflect.Field field : allFields) { + if (!field.isAnnotationPresent(com.apitrary.orm.core.annotations.Codec.class)) { fields.add(field); } } /* - * ... and filter out all properties not referencing types or demand custom encoding + * ... and filter out all properties not referencing types or demand + * custom encoding */ String[] targetedFieldNames = new String[fields.size()]; for (int i = 0; i < fields.size(); i++) { @@ -108,15 +109,15 @@ public String marshall(T entity) { */ List customEncodedProperties = ClassUtil.getAnnotatedFields(entity, com.apitrary.orm.core.annotations.Codec.class); for (java.lang.reflect.Field field : customEncodedProperties) { - + Class codecClazz = ClassUtil.getFieldAnnotationValue("value", field, com.apitrary.orm.core.annotations.Codec.class, Class.class); Codec codec = (Codec) ClassUtil.newInstance(codecClazz); - + Object value = ClassUtil.getValueOfField(field, entity); String stringValue = codec.encode(value); json = addNode(json, field.getName(), stringValue); } - + /* * Perform entity refs */ diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/DeleteResponseUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/DeleteResponseUnmarshaller.java index 9cc0c53..222cba5 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/DeleteResponseUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/DeleteResponseUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshaller.java index 027179e..f153651 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -160,13 +160,13 @@ protected void onString(String text, String fieldName, JsonParser jp) { if (field.isAnnotationPresent(Reference.class)) { ClassUtil.setSilent(entity, fieldName, ProxyUtil.createLazyProxy(field.getType(), daoSupport, text)); } else if (field.isAnnotationPresent(Column.class)) { - if(field.isAnnotationPresent(Codec.class)){ + if (field.isAnnotationPresent(Codec.class)) { Class codecClazz = ClassUtil.getFieldAnnotationValue("value", field, Codec.class, Class.class); com.apitrary.orm.core.codec.Codec codec = (com.apitrary.orm.core.codec.Codec) ClassUtil.newInstance(codecClazz); Object value = codec.decode(text); - + ClassUtil.setSilent(entity, fieldName, value); - }else{ + } else { ClassUtil.setSilent(entity, fieldName, text); } } diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/JsonResponseConsumer.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/JsonResponseConsumer.java index cf39357..49e19df 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/JsonResponseConsumer.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/JsonResponseConsumer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PostResponseUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PostResponseUnmarshaller.java index 43993a1..3b95367 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PostResponseUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PostResponseUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PutResponseUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PutResponseUnmarshaller.java index d467ab9..8a69e03 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PutResponseUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/PutResponseUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/QueriedGetResponseUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/QueriedGetResponseUnmarshaller.java index 109f951..b6d3594 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/QueriedGetResponseUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/QueriedGetResponseUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -175,14 +175,14 @@ protected void onString(String text, String fieldName, JsonParser jp) { if (field.isAnnotationPresent(Reference.class)) { ClassUtil.setSilent(getEntityInstance(), fieldName, ProxyUtil.createLazyProxy(field.getType(), daoSupport, text)); } else if (field.isAnnotationPresent(Column.class)) { - if(field.isAnnotationPresent(Codec.class)){ + if (field.isAnnotationPresent(Codec.class)) { Class codecClazz = ClassUtil.getFieldAnnotationValue("value", field, Codec.class, Class.class); com.apitrary.orm.core.codec.Codec codec = (com.apitrary.orm.core.codec.Codec) ClassUtil.newInstance(codecClazz); Object value = codec.decode(text); - + ClassUtil.setSilent(getEntityInstance(), fieldName, value); - }else{ - ClassUtil.setSilent(getEntityInstance(), fieldName, text); + } else { + ClassUtil.setSilent(getEntityInstance(), fieldName, text); } } } diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/ListUnmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/ListUnmarshaller.java index e08cf44..84558c8 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/ListUnmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/ListUnmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/Unmarshaller.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/Unmarshaller.java index dbc35e2..71de8a0 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/Unmarshaller.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/unmarshalling/api/Unmarshaller.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/StringUtil.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/StringUtil.java index 354137e..1b1873d 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/StringUtil.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/StringUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/TypeUtil.java b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/TypeUtil.java index 675eaea..c2603ba 100644 --- a/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/TypeUtil.java +++ b/apitrary-orm/apitrary-orm-core/src/main/java/com/apitrary/orm/core/util/TypeUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 Denis Neuling + * Copyright 2012-2013 Denis Neuling * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/PayloadMarshallerTest.java b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/PayloadMarshallerTest.java index 2fdab99..0911e29 100644 --- a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/PayloadMarshallerTest.java +++ b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/PayloadMarshallerTest.java @@ -34,15 +34,15 @@ public class PayloadMarshallerTest { private PayloadMarshaller payloadMarshaller; private DumbEntity entity; - + private String intialBValue = "asdasdasdwdqwqdwqd"; - + @Before - public void setUp(){ + public void setUp() { payloadMarshaller = new PayloadMarshaller(null); entity = new DumbEntity("a", intialBValue); } - + @Test public void test_marshall() { String val = payloadMarshaller.marshall(entity); diff --git a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbCodec.java b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbCodec.java index 7c1c2ae..192ec83 100644 --- a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbCodec.java +++ b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbCodec.java @@ -17,9 +17,9 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ -public class DumbCodec extends com.apitrary.orm.core.codec.Codec{ +public class DumbCodec extends com.apitrary.orm.core.codec.Codec { @Override public String decode(String value) { diff --git a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbEntity.java b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbEntity.java index 59c32ef..2d4bbba 100644 --- a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbEntity.java +++ b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/marshalling/dumb/DumbEntity.java @@ -22,25 +22,25 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ @Entity -public class DumbEntity{ - +public class DumbEntity { + @Id private String id; - + @Column private String a; - + @Column @Codec(DumbCodec.class) private String b; - - public DumbEntity(){ + + public DumbEntity() { } - - public DumbEntity(String a, String b){ + + public DumbEntity(String a, String b) { this.a = a; this.b = b; } diff --git a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshallerTest.java b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshallerTest.java index e7eafe4..d63ac3d 100644 --- a/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshallerTest.java +++ b/apitrary-orm/apitrary-orm-core/src/test/java/com/apitrary/orm/core/unmarshalling/GetResponseUnmarshallerTest.java @@ -26,33 +26,26 @@ /** * @author Denis Neuling (denisneuling@gmail.com) - * + * */ public class GetResponseUnmarshallerTest { private GetResponseUnmarshaller getResponseUnmarshaller; private ApitraryDaoSupport apitraryDaoSupport; - - private String result = - "{" + - "\"result\": {" + - "\"a\":\"a\",\"b\":\"encoded\"" + - "}," + - "\"statusMessage\": \"OK\"," + - "\"statusCode\": 200" + - "}"; - + + private String result = "{" + "\"result\": {" + "\"a\":\"a\",\"b\":\"encoded\"" + "}," + "\"statusMessage\": \"OK\"," + "\"statusCode\": 200" + "}"; + @Before - public void setUp(){ + public void setUp() { getResponseUnmarshaller = new GetResponseUnmarshaller(apitraryDaoSupport); } - + @Test - public void test_unMarshall(){ + public void test_unMarshall() { GetResponse getResponse = new GetResponse(); getResponse.setResult(result); - - DumbEntity dumbEntity = (DumbEntity)getResponseUnmarshaller.unMarshall(getResponse, DumbEntity.class); + + DumbEntity dumbEntity = (DumbEntity) getResponseUnmarshaller.unMarshall(getResponse, DumbEntity.class); Assert.assertEquals("decoded", dumbEntity.getB()); } }