feat: implement object memory removal method

nickchecan · nickchecan · commit e4d728568de5 · 2025-01-16T22:09:27.000-06:00
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/login/OllamaLoginWizard.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/login/OllamaLoginWizard.java
@@ -3,6 +3,7 @@
 import org.eclipse.jface.wizard.Wizard;
 import org.eclipse.swt.browser.Browser;
 
+import com.developer.nefarious.zjoule.plugin.auth.SessionManager;
 import com.developer.nefarious.zjoule.plugin.login.api.IOllamaLoginClient;
 import com.developer.nefarious.zjoule.plugin.login.api.OllamaLoginClient;
 import com.developer.nefarious.zjoule.plugin.login.api.OllamaLoginClientHelper;
@@ -35,7 +36,8 @@ public boolean performFinish() {
 		TemporaryMemoryOllamaEndpoint.getInstance().persist();
 		TemporaryMemoryOllamaModel.getInstance().persist();
 		
-//		SessionManager.login(browser);
+//		SessionManager.logout(browser, new EclipseMemory());
+		SessionManager.login(browser);
 		return true;
 	}
 
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/IMemoryObject.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/IMemoryObject.java
@@ -30,4 +30,6 @@ public interface IMemoryObject<T> {
      * @param data the object of type {@code T} to save.
      */
     void save(final T data);
+    
+    void clear();
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryAccessToken.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryAccessToken.java
@@ -100,4 +100,9 @@ public void save(final AccessToken accesstoken) {
         String serializedObject = objectSerializer.serialize(accesstoken);
         eclipseMemory.saveOnEclipsePreferences(KEY, serializedObject);
     }
+    
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryDeployment.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryDeployment.java
@@ -100,4 +100,9 @@ public void save(final Deployment deployment) {
         String serializedObject = objectSerializer.serialize(deployment);
         eclipseMemory.saveOnEclipsePreferences(KEY, serializedObject);
     }
+    
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryOllamaEndpoint.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryOllamaEndpoint.java
@@ -47,5 +47,10 @@ public String load() {
     public void save(final String ollamaEndpoint) {
         eclipseMemory.saveOnEclipsePreferences(KEY, ollamaEndpoint);
     }
+    
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
 
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryOllamaModel.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryOllamaModel.java
@@ -100,4 +100,9 @@ public void save(final OllamaModel ollamaModel) {
         String serializedObject = objectSerializer.serialize(ollamaModel);
         eclipseMemory.saveOnEclipsePreferences(KEY, serializedObject);
     }
+    
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryResourceGroup.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryResourceGroup.java
@@ -85,4 +85,9 @@ public void save(final String resourceGroup) {
         eclipseMemory.saveOnEclipsePreferences(KEY, resourceGroup);
     }
     
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
+    
 }
diff --git a/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryServiceKey.java b/com.developer.nefarious.zjoule.plugin/src/com/developer/nefarious/zjoule/plugin/memory/MemoryServiceKey.java
@@ -100,4 +100,9 @@ public void save(final ServiceKey serviceKey) {
         String serializedObject = objectSerializer.serialize(serviceKey);
         eclipseMemory.saveOnEclipsePreferences(KEY, serializedObject);
     }
+    
+    @Override
+    public void clear() {
+    	eclipseMemory.deleteFromEclipsePreferences(KEY);
+    }
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryAccessTokenTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryAccessTokenTest.java
@@ -127,5 +127,14 @@ public void shouldSaveAccessToken() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryDeploymentTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryDeploymentTest.java
@@ -127,5 +127,14 @@ public void shouldSaveDeployment() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryOllamaEndpointTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryOllamaEndpointTest.java
@@ -114,5 +114,14 @@ public void shouldSaveOllamaEndpoint() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockOllamaEndpoint);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryOllamaModelTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryOllamaModelTest.java
@@ -127,5 +127,14 @@ public void shouldSaveOllamaModel() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryResourceGroupTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryResourceGroupTest.java
@@ -114,5 +114,14 @@ public void shouldSaveResourceGroup() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockResourceGroup);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }
diff --git a/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryServiceKeyTest.java b/com.developer.nefarious.zjoule.test/src/com/developer/nefarious/zjoule/test/memory/MemoryServiceKeyTest.java
@@ -128,5 +128,14 @@ public void shouldSaveServiceKey() {
 		// Assert
 		verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);
 	}
+	
+	@Test
+	public void shouldEraseFromMemory() {
+		// Arrange
+		// Act
+		cut.clear();
+		// Assert
+		verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);
+	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,6 @@ public interface IMemoryObject<T> {`
`30`	`30`	`* @param data the object of type {@code T} to save.`
`31`	`31`	`*/`
`32`	`32`	`void save(final T data);`
	`33`	`+`
	`34`	`+ void clear();`
`33`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,4 +100,9 @@ public void save(final AccessToken accesstoken) {`
`100`	`100`	`String serializedObject = objectSerializer.serialize(accesstoken);`
`101`	`101`	`eclipseMemory.saveOnEclipsePreferences(KEY, serializedObject);`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ @Override`
	`105`	`+ public void clear() {`
	`106`	`+ eclipseMemory.deleteFromEclipsePreferences(KEY);`
	`107`	`+ }`
`103`	`108`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,10 @@ public String load() {`
`47`	`47`	`public void save(final String ollamaEndpoint) {`
`48`	`48`	`eclipseMemory.saveOnEclipsePreferences(KEY, ollamaEndpoint);`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ @Override`
	`52`	`+ public void clear() {`
	`53`	`+ eclipseMemory.deleteFromEclipsePreferences(KEY);`
	`54`	`+ }`
`50`	`55`
`51`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,9 @@ public void save(final String resourceGroup) {`
`85`	`85`	`eclipseMemory.saveOnEclipsePreferences(KEY, resourceGroup);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ @Override`
	`89`	`+ public void clear() {`
	`90`	`+ eclipseMemory.deleteFromEclipsePreferences(KEY);`
	`91`	`+ }`
	`92`	`+`
`88`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -127,5 +127,14 @@ public void shouldSaveAccessToken() {`
`127`	`127`	`// Assert`
`128`	`128`	`verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);`
`129`	`129`	`}`
	`130`	`+`
	`131`	`+ @Test`
	`132`	`+ public void shouldEraseFromMemory() {`
	`133`	`+ // Arrange`
	`134`	`+ // Act`
	`135`	`+ cut.clear();`
	`136`	`+ // Assert`
	`137`	`+ verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);`
	`138`	`+ }`
`130`	`139`
`131`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,5 +114,14 @@ public void shouldSaveOllamaEndpoint() {`
`114`	`114`	`// Assert`
`115`	`115`	`verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockOllamaEndpoint);`
`116`	`116`	`}`
	`117`	`+`
	`118`	`+ @Test`
	`119`	`+ public void shouldEraseFromMemory() {`
	`120`	`+ // Arrange`
	`121`	`+ // Act`
	`122`	`+ cut.clear();`
	`123`	`+ // Assert`
	`124`	`+ verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);`
	`125`	`+ }`
`117`	`126`
`118`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -128,5 +128,14 @@ public void shouldSaveServiceKey() {`
`128`	`128`	`// Assert`
`129`	`129`	`verify(mockEclipseMemory).saveOnEclipsePreferences(KEY, mockSerializedObject);`
`130`	`130`	`}`
	`131`	`+`
	`132`	`+ @Test`
	`133`	`+ public void shouldEraseFromMemory() {`
	`134`	`+ // Arrange`
	`135`	`+ // Act`
	`136`	`+ cut.clear();`
	`137`	`+ // Assert`
	`138`	`+ verify(mockEclipseMemory).deleteFromEclipsePreferences(KEY);`
	`139`	`+ }`
`131`	`140`
`132`	`141`	`}`