[israfil-micro commit] r76 - remove some cruft, fix some formatting so that the micro version is as close to the foundat...

[codesite...@google.com]

Author: christianedwardgruber
Date: Fri Apr 24 09:46:30 2009
New Revision: 76

Modified:

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/AutoWiringAdaptableContainer.java

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/DefaultAutoWiringAdaptableContainer.java

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/ComponentAlreadyRegisteredError.java

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CouldNotCreateComponentError.java

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CyclicalDependencyError.java

trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/UnsatisfiedDependencyError.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/ContainerTest.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/DefaultContainerTest.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/LifecycleTest.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/MultiThreadedAutoWiringContainerTest.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/adapters/AdaptersTest.java

trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/util/CyclicalDependencyDetectionTest.java

Log:
remove some cruft, fix some formatting so that the micro version is as
close to the foundation version as possible.

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/AutoWiringAdaptableContainer.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/AutoWiringAdaptableContainer.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/AutoWiringAdaptableContainer.java
Fri Apr 24 09:46:30 2009
@@ -59,6 +59,6 @@
* criteria should be used in this method.
*
*/
- public void registerType(Object key, Class componentAdapter);
+ public void registerType(Object key, Class implementation);

}

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/DefaultAutoWiringAdaptableContainer.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/DefaultAutoWiringAdaptableContainer.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/DefaultAutoWiringAdaptableContainer.java
Fri Apr 24 09:46:30 2009
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2008 Israfil Consulting Services Corporation
- * Copyright (c) 2008 Christian Edward Gruber
+ * Copyright (c) 2008-2009 Israfil Consulting Services Corporation
+ * Copyright (c) 2008-2009 Christian Edward Gruber
* All Rights Reserved
*
* This software is licensed under the Berkeley Standard Distribution
license,

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/ComponentAlreadyRegisteredError.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/ComponentAlreadyRegisteredError.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/ComponentAlreadyRegisteredError.java
Fri Apr 24 09:46:30 2009
@@ -35,6 +35,8 @@

public class ComponentAlreadyRegisteredError extends RuntimeException {

+ private static final long serialVersionUID = 7557424125890830358L;
+
public ComponentAlreadyRegisteredError() {
super();
}

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CouldNotCreateComponentError.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CouldNotCreateComponentError.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CouldNotCreateComponentError.java
Fri Apr 24 09:46:30 2009
@@ -36,17 +36,23 @@
import net.israfil.micro.util.CausedRuntimeException;

-public class CouldNotCreateComponentError extends CausedRuntimeException {
-
+public class CouldNotCreateComponentError
+ extends CausedRuntimeException {
+
+ private static final long serialVersionUID = 398473685547742652L;
+
public CouldNotCreateComponentError() {
super();
}
+
public CouldNotCreateComponentError(Throwable t) {
super(t);
}
+
public CouldNotCreateComponentError(String message) {
super(message);
}
+
public CouldNotCreateComponentError(String message, Throwable t) {
super(message,t);
}

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CyclicalDependencyError.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CyclicalDependencyError.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/CyclicalDependencyError.java
Fri Apr 24 09:46:30 2009
@@ -35,6 +35,8 @@

public class CyclicalDependencyError extends RuntimeException {

+ private static final long serialVersionUID = 2260997982445143566L;
+
public CyclicalDependencyError() {
super();
}

Modified:
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/UnsatisfiedDependencyError.java
==============================================================================
---
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/UnsatisfiedDependencyError.java
(original)
+++
trunk/israfil-micro-container/src/main/java/net/israfil/micro/container/error/UnsatisfiedDependencyError.java
Fri Apr 24 09:46:30 2009
@@ -35,6 +35,8 @@

public class UnsatisfiedDependencyError extends RuntimeException {

+ private static final long serialVersionUID = 502309807798988770L;
+
public UnsatisfiedDependencyError() {
super();
}

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/ContainerTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/ContainerTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/ContainerTest.java
Fri Apr 24 09:46:30 2009
@@ -65,6 +65,7 @@
container.store(FakeComponent.class, component);
Assert.assertSame(container.getComponent(FakeComponent.class),
component);
}
+
/** @testng.test */
public void testContainerWithMultipleComponents() {
FakeComponent component = new FakeComponent1();

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/DefaultContainerTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/DefaultContainerTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/DefaultContainerTest.java
Fri Apr 24 09:46:30 2009
@@ -42,15 +42,6 @@
public class DefaultContainerTest {


- /** @testng.before-method alwaysRun = "true" */
- public void setUp() {
-
- }
-
- /** @testng.after-method alwaysRun = "true" */
- public void tearDown() {
- }
-
public DefaultContainer createContainer() { return new
DefaultContainer(); }
public DefaultContainer createContainer(boolean tf) { return new
DefaultContainer(tf); }
public DefaultContainer createContainer(Container c) { return new
DefaultContainer(c); }

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/LifecycleTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/LifecycleTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/LifecycleTest.java
Fri Apr 24 09:46:30 2009
@@ -40,18 +40,6 @@

public class LifecycleTest {
-
- DefaultContainer container = null;
-
- /** @testng.before-method alwaysRun = "true" */
- public void setUp() {
-
- }
-
- /** @testng.after-method alwaysRun = "true" */
- public void tearDown() {
- container = null;
- }

/** @testng.test */
public void testAbstractStartable() {

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/MultiThreadedAutoWiringContainerTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/MultiThreadedAutoWiringContainerTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/MultiThreadedAutoWiringContainerTest.java
Fri Apr 24 09:46:30 2009
@@ -40,19 +40,6 @@

public class MultiThreadedAutoWiringContainerTest {

- TestableAutoWiringAdaptableContainer container = null;
-
- /** @testng.before-method alwaysRun = "true" */
- public void setUp() {
-
- }
-
- /** @testng.after-method alwaysRun = "true" */
- public void tearDown() {
- container = null;
- }
-
-
/** @testng.test */
public void testMissingDependenciesWiringEarly() {
AutoWiringAdaptableContainer container = new DefaultContainer(true);

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/adapters/AdaptersTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/adapters/AdaptersTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/adapters/AdaptersTest.java
Fri Apr 24 09:46:30 2009
@@ -44,7 +44,6 @@
*/
public class AdaptersTest {

-
/** @testng.test
@testng.expected-exceptions
value = "java.lang.IllegalArgumentException" */

Modified:
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/util/CyclicalDependencyDetectionTest.java
==============================================================================
---
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/util/CyclicalDependencyDetectionTest.java
(original)
+++
trunk/israfil-micro-container/src/test/java/net/israfil/micro/container/util/CyclicalDependencyDetectionTest.java
Fri Apr 24 09:46:30 2009
@@ -72,7 +72,7 @@
@testng.expected-exceptions
value = "net.israfil.micro.container.error.CyclicalDependencyError" */
public void testCircularDependencyCheckWithCyclicalGraph() {
- // setup non-circular graph.
+ // setup circular graph.
Hashtable registry = new Hashtable();
registry.put("a", new FakeAutoWireAdapter(new Object[]{"b","e","d"}));
registry.put("b", new FakeAutoWireAdapter(new Object[]{"f","c"}));
@@ -95,7 +95,7 @@
public FakeAutoWireAdapter(Object[] dependencies) {
super(Object.class, dependencies);
}
- public Object create(Object[] param) throws IllegalAccessException,
InstantiationException {
+ public Object create(Object[] parameters) throws IllegalAccessException,
InstantiationException {
return null;
}
}