Skip to content

Make sonar server happy without violation #38

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.

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
merged 2 commits into from
Jun 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@
<artifactId>javax.servlet-api</artifactId>
<version>3.0.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
</dependency>

</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ void register(String annotationName, FormDefinitionGenerator generator) {
}

public static FormDefinitionGeneratorFactory getInstance() {
if (INSTANCE == null) {
INSTANCE = new FormDefinitionGeneratorFactory();
if (instance == null) {
instance = new FormDefinitionGeneratorFactory();
}
return INSTANCE;
return instance;
}

private static final Map<String, FormDefinitionGenerator> GENERATORS = new ConcurrentHashMap<>();

private static FormDefinitionGeneratorFactory INSTANCE;
private static FormDefinitionGeneratorFactory instance;

private FormDefinitionGeneratorFactory() {
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ public final void contextInitialized(final ServletContextEvent sce) {

@Override
public final void contextDestroyed(final ServletContextEvent sce) {

//to implement it
}
}
19 changes: 8 additions & 11 deletions src/main/java/io/asfjava/ui/core/GeneratorFactoryLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
import org.reflections.Reflections;

import io.asfjava.ui.core.generators.FormDefinitionGenerator;
import io.asfjava.ui.core.logging.ASFUILogger;
import static io.asfjava.ui.core.logging.ErrorCode.*;

final class GeneratorFactoryLoader {
private static final String PACKAGESCAN = "io.asfjava.ui.core.generators";
private static Reflections reflections = new Reflections(PACKAGESCAN);

void load() {

Set<Class<? extends FormDefinitionGenerator>> subTypes = reflections
Expand All @@ -20,12 +21,8 @@ void load() {
formDefinitionGenerator = (FormDefinitionGenerator) Class.forName(subtype.getName()).newInstance();
FormDefinitionGeneratorFactory.getInstance().register(formDefinitionGenerator.getAnnoation(),
formDefinitionGenerator);
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
ASFUILogger.getLogger().error(ASF01, e);
}
}
}
Expand All @@ -35,12 +32,12 @@ void unload() {
}

static GeneratorFactoryLoader getInstance() {
if (INSTANCE == null)
INSTANCE = new GeneratorFactoryLoader();
return INSTANCE;
if (instance == null)
instance = new GeneratorFactoryLoader();
return instance;
}

private static GeneratorFactoryLoader INSTANCE;
private static GeneratorFactoryLoader instance;

private GeneratorFactoryLoader() {
}
Expand Down
16 changes: 8 additions & 8 deletions src/main/java/io/asfjava/ui/core/SchemaDecoratorFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

import io.asfjava.ui.schema.decorator.SchemaDecorator;
import io.asfjava.ui.core.schema.decorator.SchemaDecorator;

public final class SchemaDecoratorFactory {
public SchemaDecorator getGenerator(String annotationName) {
return GENERATORS.get(annotationName);
return decorators.get(annotationName);
}

void register(String annotationName, SchemaDecorator generator) {
GENERATORS.put(annotationName, generator);
decorators.put(annotationName, generator);
}

public static SchemaDecoratorFactory getInstance() {
if (INSTANCE == null) {
INSTANCE = new SchemaDecoratorFactory();
if (instance == null) {
instance = new SchemaDecoratorFactory();
}
return INSTANCE;
return instance;
}

private static final Map<String, SchemaDecorator> GENERATORS = new ConcurrentHashMap<>();
private static final Map<String, SchemaDecorator> decorators = new ConcurrentHashMap<>();

private static SchemaDecoratorFactory INSTANCE;
private static SchemaDecoratorFactory instance;

private SchemaDecoratorFactory() {
}
Expand Down
22 changes: 9 additions & 13 deletions src/main/java/io/asfjava/ui/core/SchemaDecoratorLoader.java
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
package io.asfjava.ui.core;

import static io.asfjava.ui.core.logging.ErrorCode.ASF02;

import java.util.Set;

import org.reflections.Reflections;

import io.asfjava.ui.schema.decorator.SchemaDecorator;


import io.asfjava.ui.core.logging.ASFUILogger;
import io.asfjava.ui.core.schema.decorator.SchemaDecorator;

final class SchemaDecoratorLoader {

private static final String PACKAGESCAN = "io.asfjava.ui.schema.decorator";
private static Reflections reflections = new Reflections(PACKAGESCAN);

void load() {

Set<Class<? extends SchemaDecorator>> subTypes = reflections
.getSubTypesOf(SchemaDecorator.class);
Set<Class<? extends SchemaDecorator>> subTypes = reflections.getSubTypesOf(SchemaDecorator.class);
for (Class<? extends SchemaDecorator> subtype : subTypes) {
SchemaDecorator schemaDecorator;
try {
schemaDecorator = (SchemaDecorator) Class.forName(subtype.getName()).newInstance();
SchemaDecoratorFactory.getInstance().register(schemaDecorator.getAnnotation(),
schemaDecorator);
} catch (InstantiationException e) {
e.printStackTrace();
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (ClassNotFoundException e) {
e.printStackTrace();
SchemaDecoratorFactory.getInstance().register(schemaDecorator.getAnnotation(), schemaDecorator);
} catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
ASFUILogger.getLogger().error(ASF02, e);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import io.asfjava.ui.core.form.CheckBox;
import io.asfjava.ui.core.form.ValuesContainer;
import io.asfjava.ui.core.logging.ASFUILogger;

public class CheckBoxGenerator implements FormDefinitionGenerator {

Expand All @@ -20,8 +21,6 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
fieldFormDefinition.put("type", "checkboxes");
fieldFormDefinition.put("multiple", annotation.multiple());
fieldFormDefinition.put("required", annotation.required());
// fieldFormDefinition.put("title", annotation.title());

ObjectMapper checkBoxMapper = new ObjectMapper();
ArrayNode titlesMap = checkBoxMapper.createArrayNode();
if (annotation.values().length > 0) {
Expand All @@ -40,7 +39,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
});
fieldFormDefinition.set("titleMap", titlesMap);
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
ASFUILogger.getLogger().error(e.getMessage());
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import io.asfjava.ui.core.form.ComboBox;
import io.asfjava.ui.core.form.ValuesContainer;
import io.asfjava.ui.core.logging.ASFUILogger;

public class ComboBoxGenerator implements FormDefinitionGenerator {

Expand All @@ -23,7 +24,6 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
fieldFormDefinition.put("multiple", annotation.multiple());
fieldFormDefinition.put("required", annotation.required());
fieldFormDefinition.put("size", annotation.size());
// fieldFormDefinition.put("title", annotation.title());

ObjectMapper comboMapper = new ObjectMapper();
ArrayNode titlesMap = comboMapper.createArrayNode();
Expand All @@ -43,7 +43,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
});
fieldFormDefinition.set("titleMap", titlesMap);
} catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace();
ASFUILogger.getLogger().error(e.getMessage());
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class PasswordGenerator implements FormDefinitionGenerator {
public void generate(ObjectNode fieldFormDefinition, Field field) {
Password annotation = field.getAnnotation(Password.class);
fieldFormDefinition.put("key", field.getName());
// fieldFormDefinition.put("title", annotation.title());
fieldFormDefinition.put("type", "password");

String description = annotation.description();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.fasterxml.jackson.databind.node.ObjectNode;

import io.asfjava.ui.core.form.RadioBox;
import io.asfjava.ui.core.logging.ASFUILogger;

public class RadioBoxGenerator implements FormDefinitionGenerator {

Expand All @@ -19,7 +20,6 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
fieldFormDefinition.put("key", field.getName());
fieldFormDefinition.put("readOnly", annotation.readOnly());
fieldFormDefinition.put("type", "radios");
// fieldFormDefinition.put("title", annotation.title());

JsonNode radioFieldFormDefinition = ((JsonNode) fieldFormDefinition);

Expand All @@ -40,8 +40,7 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {

}
} catch (InstantiationException | IllegalAccessException e) {
// TODO Log It into a Logger
e.printStackTrace();
ASFUILogger.getLogger().error(e.getMessage());
}

((ObjectNode) radioFieldFormDefinition).set("titleMap", titlesMap);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class TextAreaGenerator implements FormDefinitionGenerator {
public void generate(ObjectNode fieldFormDefinition, Field field) {
TextArea annotation = field.getAnnotation(TextArea.class);
fieldFormDefinition.put("key", field.getName());
// fieldFormDefinition.put("title", annotation.title());
fieldFormDefinition.put("type", "textarea");

String description = annotation.description();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
TextField annotation = field.getAnnotation(TextField.class);

fieldFormDefinition.put("key", field.getName());
// fieldFormDefinition.put("title", annotation.title());

String description = annotation.description();
if (!description.isEmpty()) {
fieldFormDefinition.put("description", description);
Expand Down Expand Up @@ -45,7 +43,4 @@ public void generate(ObjectNode fieldFormDefinition, Field field) {
public String getAnnoation() {
return TextField.class.getName();
}

public TextFieldGenerator() {
}
}
12 changes: 12 additions & 0 deletions src/main/java/io/asfjava/ui/core/logging/ASFUILogger.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package io.asfjava.ui.core.logging;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public final class ASFUILogger {

private final static Logger LOGGER=LoggerFactory.getLogger("ASFUILogger");
public static Logger getLogger(){
return LOGGER;
}
}
9 changes: 9 additions & 0 deletions src/main/java/io/asfjava/ui/core/logging/ErrorCode.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package io.asfjava.ui.core.logging;

public final class ErrorCode {
public final static String ASF01="Failure when trying to load Generators";
public final static String ASF02="Failure when trying to load Decorators";
private ErrorCode(){

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ class CustomStringSchema extends StringSchema {

@Override
public void enrichWithBeanProperty(BeanProperty beanProperty) {
super.enrichWithBeanProperty(beanProperty);
super.enrichWithBeanProperty(beanProperty);
Iterable<Annotation> it = beanProperty.getMember().annotations();
String anno = it.iterator().next().annotationType().getName();
SchemaDecoratorFactory.getInstance().getGenerator(anno).customizeSchema(beanProperty, this);

}

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;

import io.asfjava.ui.core.form.Password;
import io.asfjava.ui.core.form.RadioBox;

public class RadioBoxSchemaDecorator implements SchemaDecorator {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
package io.asfjava.ui.schema.decorator;
package io.asfjava.ui.core.schema.decorator;

import com.fasterxml.jackson.databind.BeanProperty;
import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
import com.fasterxml.jackson.module.jsonSchema.types.StringSchema;

import io.asfjava.ui.core.form.TextField;

public class TextFieldSchemaDecorator implements SchemaDecorator{
public class TextFieldSchemaDecorator implements SchemaDecorator {

@Override
public void customizeSchema(BeanProperty property, JsonSchema jsonschema) {
TextField annotation = property.getAnnotation(TextField.class);
if (annotation != null) {
if(annotation.title()!=null){
((StringSchema) jsonschema).setTitle(annotation.title());
if (annotation.title() != null) {
((StringSchema) jsonschema).setTitle(annotation.title());
}
if(annotation.pattern()!=null)
{
((StringSchema) jsonschema).setPattern(annotation.pattern());
if (annotation.pattern() != null) {
((StringSchema) jsonschema).setPattern(annotation.pattern());
}
}
}
Expand Down