Skip to content

Commit

Permalink
[tracee#50] Code Refactoring in Core Project
Browse files Browse the repository at this point in the history
  • Loading branch information
Tobias Gindler committed Aug 17, 2015
1 parent b30a128 commit e25dac9
Show file tree
Hide file tree
Showing 20 changed files with 606 additions and 700 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/io/tracee/contextlogger/AbstractToStringBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.tracee.contextlogger;

import io.tracee.contextlogger.api.ToStringBuilder;
import io.tracee.contextlogger.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.outputgenerator.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.api.WrappedContextLoggerOutput;
import io.tracee.contextlogger.api.internal.ContextLoggerBuilderAccessible;
import io.tracee.contextlogger.impl.ContextLoggerConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/tracee/contextlogger/TraceeContextLogger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import io.tracee.contextlogger.api.ConfigBuilder;
import io.tracee.contextlogger.api.ContextLogger;
import io.tracee.contextlogger.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.outputgenerator.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.connector.ConnectorOutputProvider;
import io.tracee.contextlogger.connector.LogConnectorOutputProvider;
import io.tracee.contextlogger.impl.ConfigBuilderImpl;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/tracee/contextlogger/api/internal/ContextLoggerBuilderAccessible.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.tracee.contextlogger.api.internal;

import io.tracee.contextlogger.api.ContextLogger;
import io.tracee.contextlogger.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.outputgenerator.api.TraceeContextStringRepresentationBuilder;
import io.tracee.contextlogger.impl.ContextLoggerConfiguration;

/**
Expand Down
243 changes: 121 additions & 122 deletions core/src/main/java/io/tracee/contextlogger/impl/ConfigBuilderImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
package io.tracee.contextlogger.impl;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import io.tracee.contextlogger.api.ConfigBuilder;
import io.tracee.contextlogger.api.ToStringBuilder;
import io.tracee.contextlogger.api.internal.Configuration;
Expand All @@ -14,131 +9,135 @@
import io.tracee.contextlogger.outputgenerator.writer.BasicOutputWriterConfiguration;
import io.tracee.contextlogger.outputgenerator.writer.OutputWriterConfiguration;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Implementation class to create a configuration by using the fluent api.
*/
public class ConfigBuilderImpl<T extends ToStringBuilder> implements Configuration<T> {

private final ContextLoggerBuilderAccessible contextLogger;
private final ContextLoggerConfiguration contextLoggerConfiguration;
private final ContextLoggerBuilderAccessible contextLogger;
private final ContextLoggerConfiguration contextLoggerConfiguration;

private Profile profile = null;
private Profile profile = null;

private boolean enforceOrder = false;
private boolean enforceOrder = false;

private Map<String, Boolean> manualContextOverrides = new HashMap<String, Boolean>();
private Map<String, Boolean> manualContextOverrides = new HashMap<String, Boolean>();

private OutputWriterConfiguration outputWriterConfiguration = BasicOutputWriterConfiguration.JSON_INTENDED;

public ConfigBuilderImpl(ContextLoggerBuilderAccessible traceeContextLoggerBuilderAccessible) {
private OutputWriterConfiguration outputWriterConfiguration = BasicOutputWriterConfiguration.JSON_INTENDED;

public ConfigBuilderImpl(ContextLoggerBuilderAccessible traceeContextLoggerBuilderAccessible) {

this.contextLogger = traceeContextLoggerBuilderAccessible;
this.contextLoggerConfiguration = traceeContextLoggerBuilderAccessible.getContextLoggerConfiguration();

}

@Override
public final ConfigBuilderImpl enforceProfile(Profile profile) {
this.profile = profile;
return this;
}

@Override
public ConfigBuilder<T> enable(String... contexts) {
fillManualContextOverrideMap(contexts, true);
return this;
}

@Override
public ConfigBuilder<T> disableTypes(final Class... types) {
List<String> classNames = new ArrayList<String>();
if (types != null) {

for (Class type : types) {
if (type != null) {
this.manualContextOverrides.put(type.getCanonicalName(), Boolean.FALSE);
}
}

}
return this;
}

@Override
public ConfigBuilder<T> disable(String... contexts) {
fillManualContextOverrideMap(contexts, false);
return this;
}

@Override
public ConfigBuilder<T> enforceOrder() {
this.enforceOrder = true;
return this;
}

@Override
public ConfigBuilder<T> enforceOutputWriterConfiguration(final BasicOutputWriterConfiguration outputWriterConfiguration) {
this.outputWriterConfiguration = outputWriterConfiguration;
return this;
}

@Override
public T apply() {
contextLogger.setStringRepresentationBuilder(createContextStringRepresentationLogBuilder());
return (T)contextLogger;
}

public Map<String, Boolean> getManualContextOverrides() {
return manualContextOverrides;
}

public Profile getProfile() {
return profile;
}

public boolean getEnforceOrder() {
return enforceOrder;
}

@Override
public OutputWriterConfiguration getOutputWriterConfiguration() {
return this.outputWriterConfiguration;
}

/**
* Adds passed contexts value pairs to manualContextOverrides.
*
* @param contexts The property name of the context data.
* @param value the value which should be set.
*/
private void fillManualContextOverrideMap(final String[] contexts, final boolean value) {
if (contexts != null) {

for (String context : contexts) {

if (!context.isEmpty()) {
this.manualContextOverrides.put(context, value);
}

}

}
}

/**
* Creates a TraceeGsonContextStringRepresentationBuilder instance which can be used for creating the createStringRepresentation message.
*
* @return An instance of TraceeGsonContextStringRepresentationBuilder
*/
private TraceeContextStringRepresentationBuilderImpl createContextStringRepresentationLogBuilder() {

TraceeContextStringRepresentationBuilderImpl traceeContextStringRepresentationBuilderImpl = new TraceeContextStringRepresentationBuilderImpl();
traceeContextStringRepresentationBuilderImpl.setWrapperClasses(contextLoggerConfiguration.getWrapperClasses());
traceeContextStringRepresentationBuilderImpl.setManualContextOverrides(this.getManualContextOverrides());
traceeContextStringRepresentationBuilderImpl.setProfile(this.getProfile());
traceeContextStringRepresentationBuilderImpl.setEnforceOrder(this.getEnforceOrder());
traceeContextStringRepresentationBuilderImpl.setOutputWriterConfiguration(this.getOutputWriterConfiguration());

return traceeContextStringRepresentationBuilderImpl;
}
this.contextLogger = traceeContextLoggerBuilderAccessible;
this.contextLoggerConfiguration = traceeContextLoggerBuilderAccessible.getContextLoggerConfiguration();

}

@Override
public final ConfigBuilderImpl enforceProfile(Profile profile) {
this.profile = profile;
return this;
}

@Override
public ConfigBuilder<T> enable(String... contexts) {
fillManualContextOverrideMap(contexts, true);
return this;
}

@Override
public ConfigBuilder<T> disableTypes(final Class... types) {
List<String> classNames = new ArrayList<String>();
if (types != null) {

for (Class type : types) {
if (type != null) {
this.manualContextOverrides.put(type.getCanonicalName(), Boolean.FALSE);
}
}

}
return this;
}

@Override
public ConfigBuilder<T> disable(String... contexts) {
fillManualContextOverrideMap(contexts, false);
return this;
}

@Override
public ConfigBuilder<T> enforceOrder() {
this.enforceOrder = true;
return this;
}

@Override
public ConfigBuilder<T> enforceOutputWriterConfiguration(final BasicOutputWriterConfiguration outputWriterConfiguration) {
this.outputWriterConfiguration = outputWriterConfiguration;
return this;
}

@Override
public T apply() {
contextLogger.setStringRepresentationBuilder(createContextStringRepresentationLogBuilder());
return (T) contextLogger;
}

public Map<String, Boolean> getManualContextOverrides() {
return manualContextOverrides;
}

public Profile getProfile() {
return profile;
}

public boolean getEnforceOrder() {
return enforceOrder;
}

@Override
public OutputWriterConfiguration getOutputWriterConfiguration() {
return this.outputWriterConfiguration;
}

/**
* Adds passed contexts value pairs to manualContextOverrides.
*
* @param contexts The property name of the context data.
* @param value the value which should be set.
*/
private void fillManualContextOverrideMap(final String[] contexts, final boolean value) {
if (contexts != null) {

for (String context : contexts) {

if (!context.isEmpty()) {
this.manualContextOverrides.put(context, value);
}

}

}
}

/**
* Creates a TraceeGsonContextStringRepresentationBuilder instance which can be used for creating the createStringRepresentation message.
*
* @return An instance of TraceeGsonContextStringRepresentationBuilder
*/
private TraceeContextStringRepresentationBuilderImpl createContextStringRepresentationLogBuilder() {

TraceeContextStringRepresentationBuilderImpl traceeContextStringRepresentationBuilderImpl = new TraceeContextStringRepresentationBuilderImpl();
traceeContextStringRepresentationBuilderImpl.setManualContextOverrides(this.getManualContextOverrides());
traceeContextStringRepresentationBuilderImpl.setProfile(this.getProfile());
traceeContextStringRepresentationBuilderImpl.setEnforceOrder(this.getEnforceOrder());
traceeContextStringRepresentationBuilderImpl.setOutputWriterConfiguration(this.getOutputWriterConfiguration());

return traceeContextStringRepresentationBuilderImpl;
}
}
Loading

0 comments on commit e25dac9

Please sign in to comment.