httpsgithu
diff --git a/‎etc/source/jooby-style.xml‎
Lines changed: 3 additions & 1 deletion b/‎etc/source/jooby-style.xml‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎jooby/src/main/java/io/jooby/AttributeMap.java‎
Lines changed: 0 additions & 115 deletions b/‎jooby/src/main/java/io/jooby/AttributeMap.java‎
Lines changed: 0 additions & 115 deletions
diff --git a/‎jooby/src/main/java/io/jooby/Context.java‎
Lines changed: 29 additions & 1 deletion b/‎jooby/src/main/java/io/jooby/Context.java‎
Lines changed: 29 additions & 1 deletion
diff --git a/‎jooby/src/main/java/io/jooby/Environment.java‎
Lines changed: 16 additions & 6 deletions b/‎jooby/src/main/java/io/jooby/Environment.java‎
Lines changed: 16 additions & 6 deletions
@@ -164,7 +164,9 @@
     <!-- <module name="HiddenField"/> -->
     <module name="IllegalInstantiation"/>
     <module name="InnerAssignment"/>
-    <module name="MagicNumber"/>
+    <module name="MagicNumber">
+      <property name="ignoreNumbers" value="-1, 0, 1, 2, 3, 4, 5" />
+    </module>
     <module name="MissingSwitchDefault"/>
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>
 
@@ -74,7 +74,35 @@ public interface Context {
    *
    * @return Context attributes.
    */
-  @Nonnull AttributeMap getAttributes();
+  @Nonnull Map<String, Object> getAttributes();
+
+  /**
+   * Get an attribute by his key. This is just an utility method around {@link #getAttributes()}.
+   * This method look first in current context and fallback to application attributes.
+   *
+   * @param key Attribute key.
+   * @param <T> Attribute type.
+   * @return Attribute value.
+   */
+  @Nonnull default <T> T attribute(@Nonnull String key) {
+    T attribute = (T) getAttributes().get(key);
+    if (attribute == null) {
+      attribute = getRouter().attribute(key);
+    }
+    return attribute;
+  }
+
+  /**
+   * Set an application attribute.
+   *
+   * @param key Attribute key.
+   * @param value Attribute value.
+   * @return This router.
+   */
+  @Nonnull default Context attribute(@Nonnull String key, Object value) {
+    getAttributes().put(key, value);
+    return this;
+  }
 
   /**
    * Get the HTTP router (usually this represent an instance of {@link Jooby}.
 
@@ -59,7 +59,17 @@ public class Environment {
    * @param actives Active environment names.
    */
   public Environment(@Nonnull Config conf, @Nonnull String... actives) {
-    this.actives = Stream.of(actives)
+    this(conf, Arrays.asList(actives));
+  }
+
+  /**
+   * Creates a new environment.
+   *
+   * @param conf Application configuration.
+   * @param actives Active environment names.
+   */
+  public Environment(@Nonnull Config conf, @Nonnull List<String> actives) {
+    this.actives = actives.stream()
         .map(String::trim)
         .map(String::toLowerCase)
         .collect(Collectors.toList());
@@ -172,7 +182,7 @@ private String configTree(final String[] sources, final int i) {
     Config sys = systemProperties()
         .withFallback(systemEnv());
 
-    String[] actives = options.getActiveNames();
+    List<String> actives = options.getActiveNames();
     String filename = options.getFilename();
     String extension;
     int ext = filename.lastIndexOf('.');
@@ -186,11 +196,11 @@ private String configTree(final String[] sources, final int i) {
     Path userdir = Paths.get(System.getProperty("user.dir"));
     /** Application file: */
     Config application = ConfigFactory.empty();
-    String[] names = new String[actives.length + 1];
-    for (int i = 0; i < actives.length; i++) {
-      names[i] = filename + "." + actives[i].trim().toLowerCase() + extension;
+    String[] names = new String[actives.size() + 1];
+    for (int i = 0; i < actives.size(); i++) {
+      names[i] = filename + "." + actives.get(i).trim().toLowerCase() + extension;
     }
-    names[actives.length] = filename + extension;
+    names[actives.size()] = filename + extension;
     Path fsroot = Paths.get(basedir).toAbsolutePath();
     String[] cproot = basedir.split("/");
     for (String name : names) {