Merge pull request #1180 from matsim-org/sortGuiceExamples

re-organize guice examples
matsim-org · Nov 4, 2024 · c4b0726 · c4b0726
2 parents d296d3c + 429d35d
commit c4b0726
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 20 deletions.
diff --git a/...m/ConventionalInjectionByConstructor.java → ...I/ConventionalInjectionByConstructor.java b/...m/ConventionalInjectionByConstructor.java → ...I/ConventionalInjectionByConstructor.java
@@ -1,11 +1,11 @@
-package org.matsim.codeexamples.guicewithoutmatsim;
+package org.matsim.codeexamples.guicewithoutmatsim.aaConventionalConstructorDI;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 class ConventionalInjectionByConstructor{
 
-	private static final Logger log = LogManager.getLogger( BasicInjection.class ) ;
+	private static final Logger log = LogManager.getLogger( ConventionalInjectionByConstructor.class ) ;
 
 	public static void main(String[] args){
 		Helper helper = new MyHelper1();

diff --git a/...es/guicewithoutmatsim/BasicInjection.java → ...matsim/bbBasicGuiceDI/BasicInjection.java b/...es/guicewithoutmatsim/BasicInjection.java → ...matsim/bbBasicGuiceDI/BasicInjection.java
@@ -1,9 +1,10 @@
-package org.matsim.codeexamples.guicewithoutmatsim;
+package org.matsim.codeexamples.guicewithoutmatsim.bbBasicGuiceDI;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
+import com.google.inject.multibindings.MapBinder;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
@@ -15,21 +16,12 @@ public static void main(String[] args){
 			@Override protected void configure(){
 				bind(Simulation.class).to( MySimulation1.class ) ;
 				bind( Helper.class ).to( MyHelper1.class ) ;
-//				MapBinder<String,TravelTime>.newMapBinder( this, "car",   )
 			}
 		} );
 		Simulation sim = injector.getInstance(Simulation.class);
 		sim.run() ;
 	}
 
-	interface Simulation {
-		void run() ;
-	}
-
-	interface Helper {
-		Object getAccessToSomething() ;
-	}
-
 	static class MySimulation1 implements Simulation {
 		// arguments that would normally be in the constructor can now be obtained via @Inject !
 		@Inject Helper helper ;
@@ -58,4 +50,13 @@ static class MyHelper2 implements Helper {
 			return null ;
 		}
 	}
+
+	interface Simulation {
+		void run() ;
+	}
+
+	interface Helper {
+		Object getAccessToSomething() ;
+	}
+
 }
diff --git a/...atsim/MapBinderWithAnnotationExample.java → ...inder/MapBinderWithAnnotationExample.java b/...atsim/MapBinderWithAnnotationExample.java → ...inder/MapBinderWithAnnotationExample.java
@@ -1,4 +1,4 @@
-package org.matsim.codeexamples.guicewithoutmatsim;
+package org.matsim.codeexamples.guicewithoutmatsim.ccMapBinder;
 
 import com.google.inject.*;
 import com.google.inject.multibindings.MapBinder;

diff --git a/...outmatsim/MapBinderWithStringExample.java → ...MapBinder/MapBinderWithStringExample.java b/...outmatsim/MapBinderWithStringExample.java → ...MapBinder/MapBinderWithStringExample.java
@@ -1,9 +1,10 @@
-package org.matsim.codeexamples.guicewithoutmatsim;
+package org.matsim.codeexamples.guicewithoutmatsim.ccMapBinder;
 
 import com.google.inject.*;
 import com.google.inject.multibindings.MapBinder;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.poi.ss.formula.functions.T;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,12 +46,18 @@ protected void configure(){
 		}
 		log.info("") ;
 
-		Map<String, Provider<MyInterface>> map = injector.getInstance( Key.get( new TypeLiteral<Map<String, Provider<MyInterface>>>(){} ) );;
-		Provider<MyInterface> provider = map.get( "abc" );;
+		{
+			Map<String, MyInterface> map = injector.getInstance( Key.get( new TypeLiteral<Map<String, MyInterface>>(){
+			} ) );
+			MyInterface result = map.get( "abc" );
+		}
+		{
+			Map<String, Provider<MyInterface>> map = injector.getInstance( Key.get( new TypeLiteral<Map<String, Provider<MyInterface>>>(){
+
+			} ) );
+			Provider<MyInterface> provider = map.get( "abc" );
+		}
 
-//		for( Provider<MyInterface> provider : set ){
-			provider.get() ;
-//		}
 
 	}
 

diff --git a/...uicewithoutmatsim/MultiBinderExample.java → ...sim/ddMultiBinder/MultiBinderExample.java b/...uicewithoutmatsim/MultiBinderExample.java → ...sim/ddMultiBinder/MultiBinderExample.java
@@ -1,4 +1,4 @@
-package org.matsim.codeexamples.guicewithoutmatsim;
+package org.matsim.codeexamples.guicewithoutmatsim.ddMultiBinder;
 
 import java.util.ArrayList;
 import java.util.Collection;