Skip to content

Commit

Permalink
Shade commons into runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
@minborg
minborg committed Aug 22, 2016
1 parent bead58c commit 40b131d
Show file tree
Hide file tree
Showing 72 changed files with 171 additions and 164 deletions.
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/TranslatorManager.java
View file
Expand Up @@ -18,7 +18,7 @@

import com.speedment.common.codegen.Meta;
import com.speedment.common.codegen.model.File;
import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import com.speedment.runtime.annotation.Api;
import com.speedment.runtime.config.Project;

Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/TranslatorSupport.java
View file
Expand Up @@ -34,8 +34,8 @@
import static com.speedment.common.codegen.internal.util.Formatting.shortName;
import static com.speedment.common.codegen.internal.util.Formatting.ucfirst;
import com.speedment.common.codegen.constant.SimpleType;
import com.speedment.common.injector.Injector;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.Injector;
import static com.speedment.runtime.config.Project.DEFAULT_PACKAGE_NAME;
import com.speedment.runtime.config.trait.HasPackageName;
import com.speedment.runtime.exception.SpeedmentException;
Expand Down
3 changes: 2 additions & 1 deletion generator/src/main/java/com/speedment/generator/component/CodeGenerationComponent.java
View file
Expand Up @@ -17,17 +17,18 @@
package com.speedment.generator.component;

import com.speedment.common.codegen.model.ClassOrInterface;
import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.generator.Translator;
import com.speedment.generator.TranslatorConstructor;
import com.speedment.generator.TranslatorDecorator;
import com.speedment.generator.TranslatorKey;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import com.speedment.runtime.annotation.Api;
import com.speedment.runtime.component.Component;
import com.speedment.runtime.config.trait.HasMainInterface;
import com.speedment.runtime.config.trait.HasName;
import com.speedment.runtime.exception.SpeedmentException;


import java.util.stream.Stream;

/**
Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/component/EventComponent.java
View file
Expand Up @@ -16,9 +16,9 @@
*/
package com.speedment.generator.component;

import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.generator.event.DefaultEvent;
import com.speedment.generator.event.Event;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import com.speedment.runtime.annotation.Api;
import com.speedment.runtime.component.Component;

Expand Down
6 changes: 3 additions & 3 deletions generator/src/main/java/com/speedment/generator/component/TypeMapperComponent.java
View file
Expand Up @@ -16,7 +16,7 @@
*/
package com.speedment.generator.component;

import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import com.speedment.runtime.annotation.Api;
import com.speedment.runtime.component.Component;
import com.speedment.runtime.config.Column;
Expand Down Expand Up @@ -66,7 +66,7 @@ default Class<TypeMapperComponent> getComponentClass() {
Stream<TypeMapper<?, ?>> stream();

/**
* Retreive and return the type mapper with the specified absolute class
* Retrieve and return the type mapper with the specified absolute class
* name. If it is not installed, return an empty optional.
*
* @param absoluteClassName the name as returned by {@code Class.getName()}
Expand All @@ -80,7 +80,7 @@ default Class<TypeMapperComponent> getComponentClass() {
* specified, then an {@link IdentityTypeMapper} will be created
* and returned.
*
* @param column the column to retreive the type mapper for
* @param column the column to retrieve the type mapper for
* @return the mapper class
*/
TypeMapper<?, ?> get(Column column);
Expand Down
6 changes: 3 additions & 3 deletions generator/src/main/java/com/speedment/generator/internal/DefaultJavaClassTranslator.java
View file
Expand Up @@ -28,8 +28,6 @@
import com.speedment.common.codegen.model.File;
import com.speedment.common.codegen.model.Interface;
import com.speedment.common.codegen.model.Javadoc;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.mapstream.MapStream;
import com.speedment.generator.JavaClassTranslator;
import com.speedment.generator.Translator;
import com.speedment.generator.TranslatorSupport;
Expand Down Expand Up @@ -69,8 +67,10 @@
import static com.speedment.common.codegen.constant.DefaultAnnotationUsage.GENERATED;
import static com.speedment.common.codegen.constant.DefaultJavadocTag.AUTHOR;
import static com.speedment.common.codegen.internal.util.NullUtil.requireNonNulls;
import com.speedment.common.injector.Injector;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.mapstream.MapStream;
import java.lang.reflect.Type;
import static java.util.Objects.requireNonNull;

Expand Down
4 changes: 2 additions & 2 deletions generator/src/main/java/com/speedment/generator/internal/EntityAndManagerTranslator.java
View file
Expand Up @@ -19,9 +19,9 @@
import com.speedment.common.codegen.constant.DefaultType;
import com.speedment.common.codegen.constant.SimpleParameterizedType;
import com.speedment.common.codegen.model.ClassOrInterface;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.tuple.Tuple1;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.tuple.Tuple1;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.Table;
import com.speedment.runtime.exception.SpeedmentException;
Expand Down
6 changes: 3 additions & 3 deletions generator/src/main/java/com/speedment/generator/internal/TranslatorManagerImpl.java
View file
Expand Up @@ -21,9 +21,6 @@
import com.speedment.common.codegen.internal.java.JavaGenerator;
import com.speedment.common.codegen.internal.util.Formatting;
import com.speedment.common.codegen.model.File;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.logger.Logger;
import com.speedment.common.logger.LoggerManager;
import com.speedment.generator.Translator;
import com.speedment.generator.TranslatorManager;
import com.speedment.generator.component.CodeGenerationComponent;
Expand Down Expand Up @@ -53,6 +50,9 @@
import java.nio.file.DirectoryStream;
import java.util.stream.Stream;
import static com.speedment.common.codegen.internal.util.NullUtil.requireNonNulls;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.logger.Logger;
import com.speedment.internal.common.logger.LoggerManager;
import static com.speedment.runtime.internal.util.document.DocumentDbUtil.traverseOver;
import static java.util.Objects.requireNonNull;

Expand Down
13 changes: 7 additions & 6 deletions ...src/main/java/com/speedment/generator/internal/component/CodeGenerationComponentImpl.java
View file
Expand Up @@ -18,11 +18,6 @@

import com.speedment.common.codegen.internal.java.JavaGenerator;
import com.speedment.common.codegen.model.ClassOrInterface;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.ExecuteBefore;
import com.speedment.common.injector.annotation.IncludeInjectable;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.mapstream.MapStream;
import com.speedment.generator.JavaClassTranslator;
import com.speedment.generator.Translator;
import com.speedment.generator.TranslatorConstructor;
Expand Down Expand Up @@ -61,8 +56,14 @@
import java.util.function.Supplier;
import java.util.stream.Stream;

import static com.speedment.common.injector.State.RESOLVED;

import static com.speedment.generator.StandardTranslatorKey.*;
import com.speedment.internal.common.injector.Injector;
import static com.speedment.internal.common.injector.State.RESOLVED;
import com.speedment.internal.common.injector.annotation.ExecuteBefore;
import com.speedment.internal.common.injector.annotation.IncludeInjectable;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.mapstream.MapStream;
import static java.util.Objects.requireNonNull;

@IncludeInjectable({
Expand Down
4 changes: 2 additions & 2 deletions ...tor/src/main/java/com/speedment/generator/internal/component/TypeMapperComponentImpl.java
View file
Expand Up @@ -16,9 +16,9 @@
*/
package com.speedment.generator.internal.component;

import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.mapper.TypeMapper;
import com.speedment.runtime.config.mapper.bigdecimal.BigDecimalToDouble;
Expand Down
4 changes: 2 additions & 2 deletions .../src/main/java/com/speedment/generator/internal/entity/GeneratedEntityImplTranslator.java
View file
Expand Up @@ -39,15 +39,15 @@
import static com.speedment.common.codegen.internal.util.Formatting.tab;
import com.speedment.common.codegen.constant.SimpleParameterizedType;
import static com.speedment.common.codegen.internal.util.Formatting.block;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.component.TypeMapperComponent;
import static com.speedment.generator.internal.entity.GeneratedEntityTranslator.getterReturnType;
import static com.speedment.generator.internal.util.ColumnUtil.optionalGetterName;
import static com.speedment.generator.internal.util.ColumnUtil.usesOptional;
import com.speedment.generator.internal.util.EntityTranslatorSupport;
import com.speedment.generator.internal.util.FkHolder;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.runtime.manager.Manager;
import java.lang.reflect.Type;
import static java.util.Objects.requireNonNull;
Expand Down
4 changes: 2 additions & 2 deletions ...ator/src/main/java/com/speedment/generator/internal/entity/GeneratedEntityTranslator.java
View file
Expand Up @@ -27,8 +27,6 @@
import com.speedment.common.codegen.model.Interface;
import com.speedment.common.codegen.model.Javadoc;
import com.speedment.common.codegen.model.Method;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.internal.EntityAndManagerTranslator;
import com.speedment.generator.internal.util.EntityTranslatorSupport;
Expand All @@ -48,6 +46,8 @@
import static com.speedment.common.codegen.internal.util.Formatting.shortName;
import com.speedment.generator.component.TypeMapperComponent;
import static com.speedment.generator.internal.util.ColumnUtil.usesOptional;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.mapper.TypeMapper;
import com.speedment.runtime.config.mapper.primitive.PrimitiveTypeMapper;
Expand Down
6 changes: 3 additions & 3 deletions ...ava/com/speedment/generator/internal/lifecycle/GeneratedApplicationBuilderTranslator.java
View file
Expand Up @@ -24,9 +24,6 @@
import com.speedment.common.codegen.model.Import;
import com.speedment.common.codegen.model.Javadoc;
import com.speedment.common.codegen.model.Method;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.mapstream.MapStream;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.internal.DefaultJavaClassTranslator;
import com.speedment.runtime.component.InfoComponent;
Expand All @@ -48,6 +45,9 @@
import static com.speedment.common.codegen.internal.util.Formatting.nl;
import static com.speedment.common.codegen.internal.util.Formatting.shortName;
import static com.speedment.generator.internal.lifecycle.GeneratedMetadataTranslator.METADATA;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.mapstream.MapStream;
import static com.speedment.runtime.internal.util.document.DocumentDbUtil.traverseOver;
import java.lang.reflect.Type;
import static java.util.Objects.requireNonNull;
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/speedment/generator/internal/lifecycle/GeneratedMetadataTranslator.java
View file
Expand Up @@ -25,7 +25,6 @@
import com.speedment.common.codegen.model.Import;
import com.speedment.common.codegen.model.Javadoc;
import com.speedment.common.codegen.model.Method;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.generator.internal.DefaultJavaClassTranslator;
import com.speedment.runtime.ApplicationMetadata;
import com.speedment.runtime.component.InfoComponent;
Expand All @@ -40,6 +39,7 @@
import static com.speedment.common.codegen.constant.DefaultAnnotationUsage.OVERRIDE;
import static com.speedment.common.codegen.constant.DefaultJavadocTag.AUTHOR;
import static com.speedment.common.codegen.internal.util.Formatting.indent;
import com.speedment.internal.common.injector.annotation.Inject;
import static java.util.Objects.requireNonNull;
import static java.util.stream.Collectors.toList;

Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/com/speedment/generator/internal/manager/GeneratedManagerImplTranslator.java
View file
Expand Up @@ -25,9 +25,6 @@
import com.speedment.common.codegen.model.File;
import com.speedment.common.codegen.model.Import;
import com.speedment.common.codegen.model.Method;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.tuple.Tuples;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.internal.EntityAndManagerTranslator;
import com.speedment.generator.internal.util.EntityTranslatorSupport;
Expand Down Expand Up @@ -69,6 +66,9 @@
import com.speedment.generator.component.TypeMapperComponent;
import static com.speedment.generator.internal.util.ColumnUtil.optionalGetterName;
import static com.speedment.generator.internal.util.ColumnUtil.usesOptional;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.tuple.Tuples;
import static com.speedment.runtime.internal.util.document.DocumentUtil.relativeName;
import java.lang.reflect.Type;
import java.util.Optional;
Expand Down
4 changes: 2 additions & 2 deletions ...or/src/main/java/com/speedment/generator/internal/manager/GeneratedManagerTranslator.java
View file
Expand Up @@ -22,8 +22,6 @@
import com.speedment.common.codegen.model.Interface;
import com.speedment.common.codegen.model.Javadoc;
import com.speedment.common.codegen.model.Method;
import com.speedment.common.injector.Injector;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.internal.EntityAndManagerTranslator;
import com.speedment.generator.internal.util.EntityTranslatorSupport;
Expand All @@ -46,6 +44,8 @@
import com.speedment.common.codegen.constant.DefaultType;
import com.speedment.common.codegen.constant.SimpleParameterizedType;
import static com.speedment.generator.internal.util.ColumnUtil.usesOptional;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import java.lang.reflect.Type;

/**
Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/internal/util/EntityTranslatorSupport.java
View file
Expand Up @@ -40,9 +40,9 @@
import java.util.Optional;
import java.util.function.Consumer;
import static com.speedment.common.codegen.internal.util.StaticClassUtil.instanceNotAllowed;
import com.speedment.common.injector.Injector;
import com.speedment.generator.TranslatorSupport;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.Injector;
import com.speedment.runtime.field.BooleanField;
import com.speedment.runtime.field.ByteField;
import com.speedment.runtime.field.ByteForeignKeyField;
Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/internal/util/FkHolder.java
View file
Expand Up @@ -17,10 +17,10 @@
package com.speedment.generator.internal.util;

import com.speedment.common.codegen.model.Interface;
import com.speedment.common.injector.Injector;
import com.speedment.generator.JavaClassTranslator;
import com.speedment.generator.StandardTranslatorKey;
import com.speedment.generator.component.CodeGenerationComponent;
import com.speedment.internal.common.injector.Injector;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.ForeignKey;
import com.speedment.runtime.config.ForeignKeyColumn;
Expand Down
2 changes: 1 addition & 1 deletion generator/src/main/java/com/speedment/generator/util/JavaLanguageNamer.java
View file
Expand Up @@ -16,7 +16,6 @@
*/
package com.speedment.generator.util;

import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.runtime.annotation.Api;

import java.math.BigDecimal;
Expand All @@ -28,6 +27,7 @@
import java.util.stream.Stream;

import static com.speedment.common.codegen.internal.util.Formatting.ucfirst;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import static com.speedment.runtime.internal.util.sql.SqlUtil.unQuote;
import static com.speedment.runtime.util.CollectorUtil.toUnmodifiableSet;
import static com.speedment.runtime.util.CollectorUtil.unmodifiableSetOf;
Expand Down
2 changes: 1 addition & 1 deletion generator/src/test/java/com/speedment/generator/TranslatorSupportTest.java
View file
Expand Up @@ -21,8 +21,8 @@
*/
package com.speedment.generator;

import com.speedment.common.injector.Injector;
import com.speedment.generator.util.JavaLanguageNamer;
import com.speedment.internal.common.injector.Injector;
import com.speedment.runtime.config.Table;
import org.junit.After;
import org.junit.AfterClass;
Expand Down
2 changes: 1 addition & 1 deletion maven-plugin/src/main/java/com/speedment/maven/ToolMojo.java
View file
Expand Up @@ -18,7 +18,7 @@


import com.speedment.maven.typemapper.Mapping;
import com.speedment.common.injector.Injector;
import com.speedment.internal.common.injector.Injector;
import com.speedment.runtime.Speedment;
import com.speedment.tool.MainApp;
import org.apache.maven.plugin.MojoExecutionException;
Expand Down
15 changes: 8 additions & 7 deletions plugins/enum-generator/src/main/java/com/speedment/plugins/enums/EnumGeneratorComponent.java
View file
Expand Up @@ -16,18 +16,19 @@
*/
package com.speedment.plugins.enums;

import com.speedment.common.injector.Injector;

import com.speedment.plugins.enums.internal.GeneratedEntityDecorator;
import static com.speedment.common.injector.State.INITIALIZED;
import static com.speedment.common.injector.State.RESOLVED;
import com.speedment.common.injector.annotation.ExecuteBefore;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.injector.annotation.InjectorKey;
import com.speedment.common.injector.annotation.WithState;
import com.speedment.generator.StandardTranslatorKey;
import com.speedment.generator.component.CodeGenerationComponent;
import com.speedment.generator.component.EventComponent;
import com.speedment.generator.component.TypeMapperComponent;
import com.speedment.internal.common.injector.Injector;
import static com.speedment.internal.common.injector.State.INITIALIZED;
import static com.speedment.internal.common.injector.State.RESOLVED;
import com.speedment.internal.common.injector.annotation.ExecuteBefore;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.injector.annotation.InjectorKey;
import com.speedment.internal.common.injector.annotation.WithState;
import com.speedment.plugins.enums.internal.ui.CommaSeparatedStringEditor;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.Table;
Expand Down
6 changes: 3 additions & 3 deletions plugins/enum-generator/src/main/java/com/speedment/plugins/enums/StringToEnumTypeMapper.java
View file
Expand Up @@ -16,11 +16,11 @@
*/
package com.speedment.plugins.enums;

import com.speedment.common.injector.Injector;
import com.speedment.plugins.enums.internal.GeneratedEnumType;
import com.speedment.common.injector.annotation.Inject;
import com.speedment.common.lazy.specialized.LazyClass;
import com.speedment.generator.internal.TranslatorManagerImpl;
import com.speedment.internal.common.injector.Injector;
import com.speedment.internal.common.injector.annotation.Inject;
import com.speedment.internal.common.lazy.specialized.LazyClass;
import static com.speedment.plugins.enums.internal.GeneratedEntityDecorator.FROM_DATABASE_METHOD;
import com.speedment.plugins.enums.internal.EnumGeneratorUtil;
import com.speedment.runtime.config.Column;
Expand Down
2 changes: 1 addition & 1 deletion .../enum-generator/src/main/java/com/speedment/plugins/enums/internal/EnumGeneratorUtil.java
View file
Expand Up @@ -16,8 +16,8 @@
*/
package com.speedment.plugins.enums.internal;

import com.speedment.common.injector.Injector;
import com.speedment.generator.TranslatorSupport;
import com.speedment.internal.common.injector.Injector;
import com.speedment.runtime.config.Column;
import com.speedment.runtime.config.Table;
import com.speedment.runtime.exception.SpeedmentException;
Expand Down

0 comments on commit 40b131d

Please sign in to comment.