diff --git a/.classpath b/.classpath index 5e8a55f..4559ca0 100644 --- a/.classpath +++ b/.classpath @@ -13,7 +13,7 @@ - + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 2f5cc74..29fe717 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,11 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=11 diff --git a/pom.xml b/pom.xml index 0a09344..f4b8aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,17 @@ 4.0.0 org.gcube.common.core legacy-is-publisher-connector - 1.0.0 + 1.0.1-SNAPSHOT Legacy is publisher scm:git:https://code-repo.d4science.org/gCubeSystem/legacy-is-publisher-connector scm:git:https://code-repo.d4science.org/gCubeSystem/legacy-is-publisher-connector https://code-repo.d4science.org/gCubeSystem/legacy-is-publisher-connector + + 11 + 11 + maven-parent org.gcube.tools diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/Registry.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/Registry.java index 9377ba8..287e91d 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/Registry.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/Registry.java @@ -27,7 +27,7 @@ public class Registry { public List getEndPoints(){ - String scope=SecretManagerProvider.instance.get().getContext(); + String scope=SecretManagerProvider.get().getContext(); endpoints=(List)cache.get(scope); if(endpoints==null){ diff --git a/src/main/java/org/gcube/common/core/publisher/is/legacy/container/ContainerProfileBuilder.java b/src/main/java/org/gcube/common/core/publisher/is/legacy/container/ContainerProfileBuilder.java index 87bdecb..e4e1443 100644 --- a/src/main/java/org/gcube/common/core/publisher/is/legacy/container/ContainerProfileBuilder.java +++ b/src/main/java/org/gcube/common/core/publisher/is/legacy/container/ContainerProfileBuilder.java @@ -79,13 +79,17 @@ public class ContainerProfileBuilder { Group processors = node.profile().description().processors(); - for (HashMap map : info) - - processors.add().bogomips(new BigDecimal(map.get("bogomips"))) - .clockSpeedMhz(new BigDecimal(map.get("cpu_MHz"))).family(map.get("cpu_family")) - .modelName(map.get("model_name")).model(map.get("model")).vendor(map.get("vendor_id")) - .cacheL1(Integer.parseInt(map.get("cache_size"))).cacheL1D(0).cacheL1I(0).cacheL2(0); + for (HashMap map : info) { + Processor processor = processors.add(); + if (map.get("bogomips") != null) processor.bogomips(new BigDecimal(map.get("bogomips"))); + if (map.get("cpu_MHz") != null) processor.clockSpeedMhz(new BigDecimal(map.get("cpu_MHz"))); + processor.family(map.get("cpu_family")).modelName(map.get("model_name")).model(map.get("model")).vendor(map.get("vendor_id")); + if(map.get("cache_size") != null) processor.cacheL1(Integer.parseInt(map.get("cache_size"))); + else processor.cacheL1(0); + processor.cacheL1D(0).cacheL1I(0).cacheL2(0); + } + addVariablesTo(node); update(node);