Fixes FunctionProperty code cache invalidation.

structr · Jun 6, 2024 · 2cc6121 · 2cc6121
1 parent f9aebc8
commit 2cc6121
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 0 deletions.
diff --git a/structr-base/src/main/java/org/structr/schema/action/Actions.java b/structr-base/src/main/java/org/structr/schema/action/Actions.java
@@ -39,6 +39,7 @@
 import org.structr.core.entity.AbstractSchemaNode;
 import org.structr.core.entity.SchemaMethod;
 import org.structr.core.graph.ModificationQueue;
+import org.structr.core.property.FunctionProperty;
 import org.structr.core.property.PropertyMap;
 import org.structr.core.script.Scripting;
 
@@ -203,6 +204,7 @@ public static Object callWithSecurityContext(final String key, final SecurityCon
 	}
 
 	public static void clearCache() {
+		FunctionProperty.clearCache();
 		Methods.clearMethodCache();
 		methodCache.clear();
 	}

diff --git a/structr-rest/src/test/java/org/structr/test/rest/test/property/FunctionPropertyTest.java b/structr-rest/src/test/java/org/structr/test/rest/test/property/FunctionPropertyTest.java
@@ -27,6 +27,7 @@
 import org.structr.core.app.StructrApp;
 import org.structr.core.entity.AbstractNode;
 import org.structr.core.graph.NodeAttribute;
+import org.structr.core.graph.NodeInterface;
 import org.structr.core.graph.Tx;
 import org.structr.core.property.PropertyKey;
 import org.structr.schema.export.StructrSchema;
@@ -181,4 +182,92 @@ private void testSearchWithType(final String typeName, final String readFunction
 		.when()
 			.get("/TestType/all?test" + typeName + "=" + value);
 	}
+
+	@Test
+	public void testFunctionPropertyCacheInvalidation() {
+
+
+		// schema setup
+		try (final Tx tx = app.tx()) {
+
+			final JsonSchema schema = StructrSchema.createEmptySchema();
+			final JsonType type     = schema.addType("TestType");
+
+			type.addFunctionProperty("test").setReadFunction("{ return 'value1'; }").setTypeHint("String");
+
+			type.addViewProperty("public", "test");
+
+			StructrSchema.extendDatabaseSchema(app, schema);
+
+			tx.success();
+
+		} catch (Throwable t) {
+			t.printStackTrace();
+			fail("Unexpected exception.");
+		}
+
+		final Class type = StructrApp.getConfiguration().getNodeEntityClass("TestType");
+
+		// data setup
+		try (final Tx tx = app.tx()) {
+
+			app.create(type, new NodeAttribute<>(AbstractNode.name, "test"));
+
+			tx.success();
+
+		} catch (Throwable t) {
+			t.printStackTrace();
+			fail("Unexpected exception.");
+		}
+
+		// check via REST
+		RestAssured.given()
+			.contentType("application/json; charset=UTF-8")
+			.filter(ResponseLoggingFilter.logResponseIfStatusCodeIs(200))
+			.expect()
+			.statusCode(200)
+			.body("result[0].type",  equalTo("TestType"))
+			.body("result[0].name",  equalTo("test"))
+			.body("result[0].test",       equalTo("value1"))
+			.body("result",                    hasSize(1))
+			.when()
+			.get("/TestType");
+
+		// fetch UUID of test property
+		final String functionPropertyId = RestAssured.given()
+			.contentType("application/json; charset=UTF-8")
+			.filter(ResponseLoggingFilter.logResponseIfStatusCodeIs(200))
+			.expect()
+			.statusCode(200)
+			.when()
+			.get("/SchemaProperty?name=test")
+			.andReturn()
+			.body()
+			.jsonPath()
+			.getString("result[0].id");
+
+
+		// change read function
+		RestAssured.given()
+			.contentType("application/json; charset=UTF-8")
+			.filter(ResponseLoggingFilter.logResponseIfStatusCodeIs(200))
+			.body("{ readFunction: '{ return \"changed\"; }' }")
+			.expect()
+			.statusCode(200)
+			.when()
+			.put("/SchemaProperty/" + functionPropertyId);
+
+		// check via REST
+		RestAssured.given()
+			.contentType("application/json; charset=UTF-8")
+			.filter(ResponseLoggingFilter.logResponseIfStatusCodeIs(200))
+			.expect()
+			.statusCode(200)
+			.body("result[0].type",  equalTo("TestType"))
+			.body("result[0].name",  equalTo("test"))
+			.body("result[0].test",       equalTo("changed"))
+			.body("result",                    hasSize(1))
+			.when()
+			.get("/TestType");
+	}
 }