add missing @id annotation in data models

Author: reimer-atb

context-extraction/src/main/java/de/atb/context/extraction/ContextContainerWrapper.java

@@ -2,11 +2,11 @@
  * @(#)ContextContainerWrapper.java
  *
  * $Id: ContextContainerWrapper.java 647 2016-10-20 15:13:20Z scholze $
- * 
+ *
  * $Rev:: 647                  $ 	last change revision
  * $Date:: 2016-10-20 17:13:20#$	last change date
  * $Author:: scholze             $	last change author
- * 
+ *
  * Copyright 2011-15 Sebastian Scholze (ATB). All rights reserved.
  *
  */
@@ -43,16 +43,17 @@
 
 /**
  * ContextContainerWrapper
- * 
+ *
  * @author scholze
  * @version $LastChangedRevision: 647 $
- * 
+ *
  */
 @Setter
 @Getter
 public class ContextContainerWrapper {
 
-	protected ApplicationScenario applicationScenario = ApplicationScenario.getInstance(BusinessCase.getInstance("dummy",BusinessCase.NS_DUMMY_URL));
+	protected ApplicationScenario applicationScenario =
+        ApplicationScenario.getInstance(BusinessCase.getInstance(BusinessCase.NS_DUMMY_ID, BusinessCase.NS_DUMMY_URL));
 	protected Boolean useReasoner = Boolean.FALSE;
 	protected String identifier;
 	protected String monitoringDataId;

context-monitoring/src/main/java/de/atb/context/monitoring/monitors/AbstractMonitor.java

@@ -9,7 +9,7 @@
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
+ * 
  * SPDX-License-Identifier: EPL-2.0
  * #L%
  */

context-monitoring/src/test/java/de/atb/context/monitoring/models/DummyMonitoringDataModel.java

@@ -2,11 +2,11 @@
  * @(#)DummyMonitoringDataModel.java
  *
  * $Id: DummyMonitoringDataModel.java 686 2016-12-02 15:53:40Z scholze $
- * 
+ *
  * $Rev:: 692                  $ 	last change revision
  * $Date:: 2012-07-09 09:58:45#$	last change date
  * $Author:: scholze             $	last change author
- * 
+ *
  * Copyright 2011-15 Sebastian Scholze (ATB). All rights reserved.
  *
  */
@@ -21,9 +21,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -42,6 +42,7 @@
 import de.atb.context.persistence.ModelOutputLanguage;
 import lombok.Getter;
 import lombok.Setter;
+import thewebsemantic.Id;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 
@@ -51,10 +52,10 @@
 
 /**
  * DummyMonitoringDataModel
- * 
+ *
  * @author scholze
  * @version $LastChangedRevision: 692 $
- * 
+ *
  */
 @RdfType("DummyMonitoringDataModel")
 @Namespace("http://www.atb-bremen.de/")
@@ -74,6 +75,7 @@ public class DummyMonitoringDataModel implements IMonitoringDataModel<DummyMonit
 
     private String dummyName = "myDummyName";
     private String dummyValue = "myDummyVaLuE!";
+    @Id
     private String identifier;
 
     public DummyMonitoringDataModel() {
@@ -82,7 +84,7 @@ public DummyMonitoringDataModel() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * IMonitoringData#fromRdfModel(java.lang
 	 * .String)
@@ -94,7 +96,7 @@ public final DummyMonitoringDataModel fromRdfModel(final String rdfModel) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * IMonitoringData#fromRdfModel(com.hp.hpl
 	 * .jena.rdf.model.Model)
@@ -106,7 +108,7 @@ public final DummyMonitoringDataModel fromRdfModel(final Model model) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see IMonitoringData#toRdfString()
 	 */
 	@Override
@@ -116,7 +118,7 @@ public final String toRdfString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see IMonitoringData#toRdfModel()
 	 */
 	@Override
@@ -126,7 +128,7 @@ public final Model toRdfModel() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * IMonitoringDataModel#getBusinessCase
 	 * ()
@@ -138,7 +140,7 @@ public final BusinessCase getBusinessCase() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see IMonitoringDataModel#
 	 * triggersContextChange()
 	 */
@@ -149,7 +151,7 @@ public final boolean triggersContextChange() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see IMonitoringDataModel#
 	 * getApplicationScenario()
 	 */
@@ -160,7 +162,7 @@ public final ApplicationScenario getApplicationScenario() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see IMonitoringDataModel#
 	 * getContextIdentifierClassName()
 	 */
@@ -171,7 +173,7 @@ public final String getContextIdentifierClassName() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * IMonitoringDataModel#initialize()
 	 */

context-monitoring/src/test/java/de/atb/context/monitoring/models/TankRefillingMonitoringData.java

@@ -9,7 +9,7 @@
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- * 
+ *
  * SPDX-License-Identifier: EPL-2.0
  * #L%
  */
@@ -27,6 +27,7 @@
 import lombok.Setter;
 import org.simpleframework.xml.Root;
 
+import thewebsemantic.Id;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 import thewebsemantic.Transient;
@@ -35,10 +36,10 @@
 
 /**
  * A TankRefillingMonitoringData describes
- * 
+ *
  * @author scholze
  * @version $LastChangedRevision: 881 $
- * 
+ *
  */
 @RdfType("TankRefilling")
 @Namespace(BusinessCase.NS_DUMMY_URL)
@@ -56,6 +57,7 @@ public class TankRefillingMonitoringData implements IMonitoringDataModel<TankRef
     private Date monitoredAt;
     private FileSystemDataSource dataSource;
     private String monitoringDataVersion = Version.MONITORING_DATA.getVersionString();
+    @Id
     private String identifier;
 
 	@Transient
@@ -76,7 +78,7 @@ public TankRefillingMonitoringData() {
 
 	/**
 	 * Adds another monitored Tank to the list of monitored tanks.
-	 * 
+	 *
 	 * @param tank
 	 *            The monitored Tank to be added to the list of monitored tanks.
 	 */
@@ -86,7 +88,7 @@ public void addTank(Tank tank) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * de.atb.proseco.monitoring.IMonitoringData#fromRDFModel(com.hp.hpl
 	 * .jena.rdf.model.Model)
@@ -98,7 +100,7 @@ public TankRefillingMonitoringData fromRdfModel(Model model) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * de.atb.proseco.monitoring.IMonitoringData#fromXMPString(java.lang
 	 * .String)
@@ -110,7 +112,7 @@ public TankRefillingMonitoringData fromRdfModel(String rdfString) {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * de.atb.proseco.monitoring.models.IMonitoringDataModel#getBusinessCase
 	 * ()
@@ -122,7 +124,7 @@ public BusinessCase getBusinessCase() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see de.atb.proseco.monitoring.IMonitoringData#toRDFModel()
 	 */
 	@Override
@@ -132,7 +134,7 @@ public Model toRdfModel() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see de.atb.proseco.monitoring.IMonitoringData#toXMPString()
 	 */
 	@Override
@@ -142,7 +144,7 @@ public String toRdfString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see java.lang.Object#toString()
 	 */
 	@Override
@@ -155,7 +157,7 @@ public String toString() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see de.atb.proseco.monitoring.models.IMonitoringDataModel#
 	 * triggersContextChange()
 	 */
@@ -166,7 +168,7 @@ public boolean triggersContextChange() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see de.atb.proseco.monitoring.models.IMonitoringDataModel#
 	 * getApplicationScenario()
 	 */
@@ -177,7 +179,7 @@ public ApplicationScenario getApplicationScenario() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see de.atb.proseco.monitoring.models.IMonitoringDataModel#
 	 * getContextIdentifierClassName()
 	 */
@@ -188,7 +190,7 @@ public String getContextIdentifierClassName() {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * de.atb.proseco.monitoring.models.IMonitoringDataModel#initialize()
 	 */

smartclide-monitoring/src/main/java/de/atb/context/monitoring/analyser/GitAnalyser.java

@@ -9,7 +9,7 @@
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
+ * 
  * SPDX-License-Identifier: EPL-2.0
  * #L%
  */

smartclide-monitoring/src/main/java/de/atb/context/monitoring/models/CustomFileBasedDataModel.java

@@ -27,6 +27,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.simpleframework.xml.Root;
+import thewebsemantic.Id;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 
@@ -40,6 +41,7 @@ public class CustomFileBasedDataModel implements IMonitoringDataModel<CustomFile
     private Date monitoredAt;
     private String documentIndexId = "index/file";
     private String documentUri;
+    @Id
     private String identifier;
     private FileSystemDataSource dataSource;
     private String implementingClassName = CustomFileBasedDataModel.class.getName();

smartclide-monitoring/src/main/java/de/atb/context/monitoring/models/GitDataModel.java

@@ -29,6 +29,7 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.simpleframework.xml.Root;
+import thewebsemantic.Id;
 import thewebsemantic.Namespace;
 import thewebsemantic.RdfType;
 
@@ -41,6 +42,7 @@ public class GitDataModel implements IMonitoringDataModel<GitDataModel, MessageB
     private Date monitoredAt;
     private String documentIndexId = "index/broker";
     private String documentUri;
+    @Id
     private String identifier;
     private MessageBrokerDataSource dataSource;
     private String implementingClassName = GitDataModel.class.getName();

smartclide-monitoring/src/main/java/de/atb/context/monitoring/models/GitMessage.java

@@ -9,7 +9,7 @@
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
+ * 
  * SPDX-License-Identifier: EPL-2.0
  * #L%
  */

smartclide-monitoring/src/main/java/eu/smartclide/contexthandling/dle/model/CommitMessage.java

@@ -9,7 +9,7 @@
  * This program and the accompanying materials are made
  * available under the terms of the Eclipse Public License 2.0
  * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
+ * 
  * SPDX-License-Identifier: EPL-2.0
  * #L%
  */

smartclide-monitoring/src/main/java/eu/smartclide/contexthandling/dle/model/DleMessage.java

@@ -1,5 +1,19 @@
 package eu.smartclide.contexthandling.dle.model;
 
+/*-
+ * #%L
+ * SmartCLIDE Monitoring
+ * %%
+ * Copyright (C) 2015 - 2021 ATB – Institut für angewandte Systemtechnik Bremen GmbH
+ * %%
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ * #L%
+ */
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;