Code Review
/
aai
/
aai-common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reduce the number of problems in aai-common by removing unused imports
[aai/aai-common.git]
/
aai-core
/
src
/
main
/
java
/
org
/
onap
/
aai
/
serialization
/
queryformats
/
FormatFactory.java
diff --git
a/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
b/aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
index
50aa8dd
..
e102f1f
100644
(file)
--- a/
aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
+++ b/
aai-core/src/main/java/org/onap/aai/serialization/queryformats/FormatFactory.java
@@
-20,6
+20,9
@@
package org.onap.aai.serialization.queryformats;
package org.onap.aai.serialization.queryformats;
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.MultivaluedMap;
+
import org.onap.aai.exceptions.AAIException;
import org.onap.aai.introspection.Loader;
import org.onap.aai.serialization.db.DBSerializer;
import org.onap.aai.exceptions.AAIException;
import org.onap.aai.introspection.Loader;
import org.onap.aai.serialization.db.DBSerializer;
@@
-28,9
+31,6
@@
import org.onap.aai.serialization.queryformats.utils.QueryParamInjector;
import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
import org.onap.aai.setup.SchemaVersions;
import org.onap.aai.serialization.queryformats.utils.UrlBuilder;
import org.onap.aai.setup.SchemaVersions;
-import javax.ws.rs.core.MultivaluedHashMap;
-import javax.ws.rs.core.MultivaluedMap;
-
public class FormatFactory {
private final Loader loader;
public class FormatFactory {
private final Loader loader;
@@
-46,8
+46,8
@@
public class FormatFactory {
this.injector = QueryParamInjector.getInstance();
}
this.injector = QueryParamInjector.getInstance();
}
- public FormatFactory(Loader loader, DBSerializer serializer, SchemaVersions schemaVersions, String basePath,
String serverBase)
- throws AAIException {
+ public FormatFactory(Loader loader, DBSerializer serializer, SchemaVersions schemaVersions, String basePath,
+
String serverBase)
throws AAIException {
this.loader = loader;
this.serializer = serializer;
this.urlBuilder = new UrlBuilder(loader.getVersion(), serializer, serverBase, schemaVersions, basePath);
this.loader = loader;
this.serializer = serializer;
this.urlBuilder = new UrlBuilder(loader.getVersion(), serializer, serverBase, schemaVersions, basePath);
@@
-67,34
+67,43
@@
public class FormatFactory {
formatter = new Formatter(inject(new GraphSON(), params));
break;
case pathed:
formatter = new Formatter(inject(new GraphSON(), params));
break;
case pathed:
- formatter = new Formatter(inject(new PathedURL.Builder(loader, serializer, urlBuilder), params).build(), params);
+ formatter = new Formatter(inject(new PathedURL.Builder(loader, serializer, urlBuilder), params).build(),
+ params);
break;
case pathed_resourceversion:
break;
case pathed_resourceversion:
- formatter = new Formatter(inject(new PathedURL.Builder(loader, serializer, urlBuilder).includeUrl(), params).build(), params);
+ formatter = new Formatter(
+ inject(new PathedURL.Builder(loader, serializer, urlBuilder).includeUrl(), params).build(),
+ params);
break;
case id:
break;
case id:
- formatter = new Formatter(inject(new IdURL.Builder(loader, serializer, urlBuilder), params).build(), params);
+ formatter = new Formatter(inject(new IdURL.Builder(loader, serializer, urlBuilder), params).build(),
+ params);
break;
case resource:
break;
case resource:
- formatter = new Formatter(inject(new Resource.Builder(loader, serializer, urlBuilder, params), params).build(), params);
+ formatter = new Formatter(
+ inject(new Resource.Builder(loader, serializer, urlBuilder, params), params).build(), params);
break;
case resource_and_url:
formatter = new Formatter(
break;
case resource_and_url:
formatter = new Formatter(
- inject(new Resource.Builder(loader, serializer, urlBuilder, params).includeUrl(), params).build(), params);
+ inject(new Resource.Builder(loader, serializer, urlBuilder, params).includeUrl(), params)
+ .build(),
+ params);
break;
case raw:
break;
case raw:
- formatter =
-
new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder), params).build(),
params);
+ formatter =
new Formatter(inject(new RawFormat.Builder(loader, serializer, urlBuilder), params).build(),
+ params);
break;
case simple:
formatter = new Formatter(
inject(new RawFormat.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params)
break;
case simple:
formatter = new Formatter(
inject(new RawFormat.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params)
- .build(), params);
+ .build(),
+ params);
break;
case aggregate:
formatter = new Formatter(
break;
case aggregate:
formatter = new Formatter(
- inject(new Aggregate.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params)
- .build(), params);
+ inject(new Aggregate.Builder(loader, serializer, urlBuilder).depth(0).modelDriven(), params)
+ .build(),
+ params);
break;
case console:
formatter = new Formatter(inject(new Console(), params));
break;
case console:
formatter = new Formatter(inject(new Console(), params));
@@
-107,20
+116,19
@@
public class FormatFactory {
inject(new ResourceWithSoT.Builder(loader, serializer, urlBuilder), params).build(), params);
break;
case changes:
inject(new ResourceWithSoT.Builder(loader, serializer, urlBuilder), params).build(), params);
break;
case changes:
- formatter =
- new Formatter(inject(new ChangesFormat(), params));
+ formatter = new Formatter(inject(new ChangesFormat(), params));
break;
case state:
break;
case state:
- formatter =
-
new Formatter(
inject(new StateFormat.Builder(loader, serializer, urlBuilder), params).build(format));
+ formatter =
new Formatter(
+
inject(new StateFormat.Builder(loader, serializer, urlBuilder), params).build(format));
break;
case lifecycle:
break;
case lifecycle:
- formatter =
-
new Formatter(
inject(new LifecycleFormat.Builder(loader, serializer, urlBuilder), params).build(format));
+ formatter =
new Formatter(
+
inject(new LifecycleFormat.Builder(loader, serializer, urlBuilder), params).build(format));
break;
case tree:
break;
case tree:
- formatter =
new Formatter(
- inject(new TreeFormat.Builder(loader, serializer, urlBuilder), params).build());
+ formatter =
+
new Formatter(
inject(new TreeFormat.Builder(loader, serializer, urlBuilder), params).build());
break;
default:
break;
break;
default:
break;