From 5cca043c2f466b347813e89e552e1ea5e1a4f8af Mon Sep 17 00:00:00 2001
From: ulrich
Date: Mon, 24 Nov 2025 17:26:46 +0000
Subject: [PATCH] Reste von neuer Lib neon-ws entfernt
---
src/de/uhilger/neon/Factory.java | 127 ++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 43 deletions(-)
diff --git a/src/de/uhilger/neon/Factory.java b/src/de/uhilger/neon/Factory.java
index ddbb717..9f8c1fb 100644
--- a/src/de/uhilger/neon/Factory.java
+++ b/src/de/uhilger/neon/Factory.java
@@ -17,6 +17,7 @@
*/
package de.uhilger.neon;
+import de.uhilger.neon.entity.ActorDescriptor;
import com.google.gson.Gson;
import com.sun.net.httpserver.Authenticator;
import com.sun.net.httpserver.Filter;
@@ -35,9 +36,6 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -66,9 +64,12 @@
* @version 1, 6.2.2024
*/
public class Factory implements ScannerListener {
+
+ private Map<String, List<ActorDescriptor>> actorMap;
public Factory() {
listeners = new ArrayList<>();
+ actorMap = new HashMap<>();
}
/**
@@ -128,50 +129,66 @@
IllegalAccessException, IllegalArgumentException, InvocationTargetException, IOException {
Logger.getLogger(Factory.class.getName()).log(Level.FINER, System.getProperty("java.class.path"));
-
- List serverList = d.server;
- Iterator<ServerDescriptor> serverIterator = serverList.iterator();
- while (serverIterator.hasNext()) {
- ServerDescriptor sd = serverIterator.next();
+
+ List<ServerDescriptor> serverList = d.server;
+ for (ServerDescriptor sd : serverList) {
HttpServer server = HttpServer.create(new InetSocketAddress(sd.port), 0);
fireServerCreated(server);
if (packageNames == null) {
packageNames = d.actorPackages;
}
- addContexts(new Scanner(starter, Actor.class), d, server, sd.contexts, packageNames, sdp);
+
+ Scanner scn = new Scanner(starter, Actor.class);
+ for (String packageName : packageNames) {
+ scn.process(this, packageName, new Object[]{});
+ // ctx.getAttributes().put("serverDataProviderList", sdp);
+ }
+
+ addContexts(d, server, sd.contexts, sdp);
server.setExecutor(Executors.newFixedThreadPool(10));
server.start();
}
- fireInstanceStarted();
+
+ fireInstanceStarted();
}
private Authenticator createAuthenticator(NeonDescriptor d) {
+ Logger.getLogger(Factory.class.getName()).log(
+ Level.FINER, "{0} ", new Object[]{"creating Authenticator"});
Authenticator auth = null;
if (d.authenticator != null) {
try {
+ Logger.getLogger(Factory.class.getName()).log(
+ Level.FINER, "Authenticator className {0} ", new Object[]{d.authenticator.className});
Object authObj = Class.forName(d.authenticator.className)
.getDeclaredConstructor().newInstance();
if (authObj instanceof Authenticator) {
auth = (Authenticator) authObj;
+ Logger.getLogger(Factory.class.getName()).log(
+ Level.FINER, "Authenticator className {0} created", new Object[]{d.authenticator.className});
return auth;
}
} catch (ClassNotFoundException | NoSuchMethodException | SecurityException
| InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException ex) {
// Klasse nicht gefunden. Muss das geloggt oder sonstwie behandel werden?
+ Logger.getLogger(Factory.class.getName()).log(
+ Level.FINER, "Authenticator className {0} not created, error {1}",
+ new Object[]{d.authenticator.className, ex.getLocalizedMessage()});
+
return null;
}
}
return auth;
}
- private void addContexts(Scanner scn, NeonDescriptor d, HttpServer server, List contextList, List<String> packageNames,
+ private void addContexts(NeonDescriptor d, HttpServer server, List<ContextDescriptor> contextList,
List<DataProvider> sdp)
throws ClassNotFoundException, NoSuchMethodException, InstantiationException,
IllegalAccessException, IllegalArgumentException, InvocationTargetException, IOException {
- Map<String, HttpHandler> sharedHandlers = new HashMap();
+ Map<String, HttpHandler> sharedHandlers = new HashMap<>();
Iterator<ContextDescriptor> contextIterator = contextList.iterator();
Authenticator auth = null;
while (contextIterator.hasNext()) {
@@ -182,14 +199,12 @@
Map<String, Object> ctxAttrs = ctx.getAttributes();
/*
Achtung: Wenn verschiedene Elemente dasselbe Attribut
- deklarieren, ueberschreiben sie sich die Attribute gegenseitig.
+ deklarieren, ueberschreiben sich die Attribute gegenseitig.
*/
ctxAttrs.putAll(cd.attributes);
+ ctxAttrs.put("serverDataProviderList", sdp);
if (h instanceof Handler) {
- for (String packageName : packageNames) {
- scn.process(this, packageName, (Handler) h, cd.attributes.get("contextName"));
- ctx.getAttributes().put("serverDataProviderList", sdp);
- }
+ wire((Handler) h, cd.attributes.get("contextName"));
}
if (cd.authenticator instanceof String) {
if (!(auth instanceof Authenticator)) {
@@ -200,23 +215,14 @@
ctx.getAttributes().putAll(d.authenticator.attributes);
fireAuthenticatorCreated(ctx, auth); // event umbenennen in etwas wie authAdded oder so
}
-
}
-
- //Authenticator auth = createAuthenticator(d);
- //if (auth instanceof Authenticator && cd.authenticator instanceof String) {
- // ctx.setAuthenticator(auth);
- // ctx.getAttributes().putAll(d.authenticator.attributes);
- // fireAuthenticatorCreated(ctx, auth);
- //}
if (cd.filter != null) {
for (String filterClassName : cd.filter) {
//
Object filterObj = Class.forName(filterClassName)
.getDeclaredConstructor().newInstance();
if (filterObj instanceof Filter) {
- Filter filter = (Filter) filterObj;
- ctx.getFilters().add(filter);
+ ctx.getFilters().add((Filter) filterObj);
}
}
}
@@ -330,22 +336,35 @@
Kontextpfades ausgefuehrt werden soll, muss die Action
als Route '/' angeben.
*/
+
+ /*
+ Tradeoff:
+ Es muss bei Initialisierung die Actor-Klasse ganz durchlaufen werden, um alle Methoden
+ zu finden, die eine Action-Annotation haben. Der Handler 'merkt' sich lediglich den Namen der
+ Actor-Klassen. Daher muessen bei jedem Aufruf eines Actors ueber den Handler abermals
+ alle Methoden dieses Actors durchsucht werden, um diejenige Methode zu finden, die mit
+ der zur Route des Requests passenden Action annotiert ist.
+
+ Dieser Tradeoff bewirkt, dass nicht grosse Geflechte aus Klassen- und Methodenobjekten
+ fuer die gesamten Actors einer Anwendung im Speicher gehalten werden muessen
+ sondern dynamisch zur Laufzeit instanziiert werden.
+ */
+
/**
- *
+ * Actor-Klassen dem Handler hinzufuegen
+ *
* @param h Handler, dem der Actor hinzugefuegt wird, falls der Kontext uebereinstimmt
- * @param c hinzuzufuegende Actor-Klasse
- * @param contextName Name des Kontext, dem der Actor hinzugefuegt wird
+ * @param contextName Name des Kontext, dem der Handler zugeordnet ist
*/
- private void wire(Handler h, Class c, String contextName) {
- Method[] methods = c.getMethods();
- for (Method method : methods) {
- Action action = method.getAnnotation(Action.class);
- if (action != null) {
- List actionHandlers = Arrays.asList(action.handler());
- if (actionHandlers.contains(contextName)) {
- h.setActor(action.type(), action.route(), c.getName());
- }
- }
+ private void wire(Handler h, String contextName) {
+ List<ActorDescriptor> actorList = actorMap.get(contextName);
+ Iterator<ActorDescriptor> i = actorList.iterator();
+ while(i.hasNext()) {
+ ActorDescriptor actor = i.next();
+ Logger.getLogger(Factory.class.getName()).log(
+ Level.FINER, "actorClassName {0} route {1}",
+ new Object[]{actor.getActorClassName(), actor.getRoute()});
+ h.setActor(actor.getHttpMethod(), actor.getRoute(), actor.getActorClassName());
}
}
@@ -363,6 +382,8 @@
public void destroy() {
this.listeners.clear();
this.listeners = null;
+ this.actorMap.clear();
+ this.actorMap = null;
}
private void fireServerCreated(HttpServer server) {
@@ -370,7 +391,7 @@
l.serverCreated(server);
}
}
-
+
private void fireHandlerCreated(HttpContext ctx, HttpHandler h) {
for (FactoryListener l : listeners) {
l.handlerCreated(ctx, h);
@@ -397,7 +418,27 @@
/* -------------- ScannerListener Implementierung --------------- */
@Override
- public void annotationFound(Class foundClass, Handler h, String contextName) {
- wire(h, foundClass, contextName);
+ public void annotationFound(Class foundClass, Object[] params) {
+ Method[] methods = foundClass.getMethods();
+ for (Method method : methods) {
+ Action action = method.getAnnotation(Action.class);
+ if (action != null) {
+ List<String> actionHandlers = Arrays.asList(action.handler());
+ for (String contextName : actionHandlers) {
+ ActorDescriptor tempActor = new ActorDescriptor();
+ tempActor.setContextName(contextName);
+ tempActor.setHttpMethod(action.type());
+ tempActor.setRoute(action.route());
+ tempActor.setActorClassName(foundClass.getName());
+
+ List<ActorDescriptor> actorList = actorMap.get(contextName);
+ if(actorList == null) {
+ actorList = new ArrayList<>();
+ }
+ actorList.add(tempActor);
+ actorMap.put(contextName, actorList);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3